Patrick 'Quezler' Mounier
93faf128b7
Bump up the chain to update in unison
2020-01-29 10:12:18 +01:00
Patrick 'Quezler' Mounier
56b2cc2745
Fix unloading on a corner
2020-01-29 09:05:00 +01:00
Patrick 'Quezler' Mounier
d2869b976d
Fix comment in 〃
2020-01-29 09:04:46 +01:00
Patrick 'Quezler' Mounier
432b555f1b
Optimize with sleeps
...
Ehmm i meant recharge cycles, beep boop.
2020-01-29 09:02:53 +01:00
Patrick 'Quezler' Mounier
db1a2ddc64
Move start & end logic into entity snek bits
2020-01-29 08:03:53 +01:00
Patrick 'Quezler' Mounier
88282a8c0b
Prevent turns from being considered the end
2020-01-29 07:48:14 +01:00
Patrick 'Quezler' Mounier
4674e5ad68
Merge branch 'master' into crater
2020-01-28 20:06:16 +01:00
Anuken
867a642859
Fixed #1460
2020-01-28 13:44:06 -05:00
Patrick 'Quezler' Mounier
ff578c8540
Repurpose branch to be played
...
When anuke shows more interest in this branch the changes that stem from this can be reversed and squashed, but people want to play it, and keeping 2 crater related branches in sync is frankly a pain 😗
2020-01-28 14:31:32 +01:00
Patrick 'Quezler' Mounier
445126ea65
Rename Track to CraterConveyor
...
though it does not extend the conveyor class.
2020-01-28 11:41:20 +01:00
Patrick 'Quezler' Mounier
2683c74800
Avoid assigning new object?
2020-01-28 11:10:23 +01:00
Patrick 'Quezler' Mounier
61197fe974
Remove duplicate code between first & take
2020-01-28 11:08:40 +01:00
Patrick 'Quezler' Mounier
89d143af8f
Undo part of 〃
2020-01-28 11:00:08 +01:00
Patrick 'Quezler' Mounier
0f92f77b55
Draw crater unto plastanium conveyor icon
...
And remove whitespaces from the emoji one.
2020-01-28 10:57:51 +01:00
Patrick 'Quezler' Mounier
683211cb1f
Untangle conveyor entanglement
...
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
2020-01-28 10:41:30 +01:00
Patrick 'Quezler' Mounier
af83d08fb1
FIx inconsistencies in the diff
2020-01-28 07:59:11 +01:00
Patrick 'Quezler' Mounier
28765ef909
Merge branch 'master' into crater
2020-01-28 07:45:03 +01:00
Anuken
89e1c5afc0
Conveyor tweaks
2020-01-28 00:21:05 -05:00
Anuken
ad6e0bcd0f
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# Conflicts:
# android/src/mindustry/android/AndroidLauncher.java
# annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
# annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
# build.gradle
# core/assets-raw/fontgen/config.json
# core/assets/bundles/bundle_cs.properties
# core/assets/bundles/bundle_it.properties
# core/assets/fonts/font.ttf
# core/assets/fonts/icon.ttf
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/content/UnitTypes.java
# core/src/mindustry/core/NetClient.java
# core/src/mindustry/core/NetServer.java
# core/src/mindustry/entities/bullet/BulletType.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/maps/filters/FilterOption.java
# core/src/mindustry/mod/Scripts.java
# core/src/mindustry/ui/Fonts.java
# core/src/mindustry/ui/dialogs/DeployDialog.java
# core/src/mindustry/ui/fragments/HudFragment.java
# core/src/mindustry/ui/fragments/MenuFragment.java
# core/src/mindustry/world/blocks/production/Cultivator.java
# core/src/mindustry/world/blocks/units/CommandCenter.java
# gradle.properties
# tools/src/mindustry/tools/FontGenerator.java
2020-01-27 15:51:02 -05:00
Anuken
a2933e030a
More severe votekick
2020-01-27 15:43:17 -05:00
Patrick 'Quezler' Mounier
6eb6870bb6
Register crater emoji via ui folder
...
#1458
2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
038fc72d7b
Merge branch 'master' into crater
2020-01-27 19:17:22 +01:00
Anuken
5ad0193a86
Fixed reduced conveyor edge throughput
2020-01-27 13:15:12 -05:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji
2020-01-27 18:40:40 +01:00
Patrick 'Quezler' Mounier
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
Anuken
65211a6021
Fixed #1447
2020-01-27 11:01:48 -05:00
Anuken
b7e1adb8b1
Fixed 103 network compatibility
2020-01-27 10:19:18 -05:00
Anuken
b9e8694e68
Added synced server label + effect methods
2020-01-27 00:25:32 -05:00
Anuken
cd1ed97e52
Merge branch 'master' of https://github.com/Anuken/Mindustry
2020-01-27 00:11:24 -05:00
Anuken
a61234d21e
Minor tweaks
2020-01-26 21:50:55 -05:00
키에르
9499b9dfaf
Add custom text on screen ( #1448 )
2020-01-26 17:56:11 -05:00
Anuken
9baaacc8ac
Crash fix
2020-01-26 16:55:24 -05:00
Anuken
621233a5b3
More optimization
2020-01-26 16:12:11 -05:00
Anuken
9a3245c23e
Clamp
2020-01-26 15:13:55 -05:00
Anuken
6fe2697185
2x faster conveyor optimization
2020-01-26 15:04:00 -05:00
Anuken
adbfb15932
Cleanup
2020-01-26 13:13:01 -05:00
Anuken
93cada6a16
Conveyor benchmark test
2020-01-26 11:40:09 -05:00
Anuken
0d5dd146ef
Fixed #1451
2020-01-26 10:58:14 -05:00
Anuken
e14a36a97e
Fixed #1445
2020-01-25 17:50:59 -05:00
Anuken
923d576a5f
Fixed #1436 / Fixed crawlers not exploding
2020-01-24 23:21:23 -05:00
Anuken
69711151a5
Bugfixes
2020-01-24 18:48:26 -05:00
Anuken
83f44abb5a
Suppress d/c messages when necessary
2020-01-24 14:27:23 -05:00
Patrick 'Quezler' Mounier
6e970cb84d
Fix tech tree entry
2020-01-24 20:26:49 +01:00
Patrick 'Quezler' Mounier
58a79d8631
Update to v103
...
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-24 20:25:03 +01:00
Anuken
f2bc3e78d7
Fixed #1429
2020-01-24 14:00:06 -05:00
Anuken
2fe6a3525b
Added null check for attribute
2020-01-24 13:37:23 -05:00
Anuken
78fb427120
Minor fixes
2020-01-24 13:02:03 -05:00
Anuken
b9876e267b
Headless load fix
2020-01-24 12:31:34 -05:00
Anuken
4c1459c47e
Fixed page limits in /help
2020-01-24 11:50:51 -05:00
Anuken
8141361a30
Fix script whitelist
2020-01-24 11:27:47 -05:00
