Anuken
5eb3f0f3de
Interface + base component support
2020-02-02 12:25:46 -05:00
Anuken
acb3438cc8
More entity processor features
2020-02-02 11:51:58 -05:00
DeltaNedas
a9f07f3603
formatting
2020-02-02 15:49:10 +00:00
Patrick 'Quezler' Mounier
4c369dd17c
Hide drop zone warning if you're part of the wave team ( #1492 )
2020-02-02 10:41:09 -05:00
DeltaNedas
c458c77322
cleanup
2020-02-02 13:40:53 +00:00
DeltaNedas
b93692ad41
yes
2020-02-02 13:40:38 +00:00
DeltaNedas
d84217300c
fixed error message
2020-02-02 12:58:00 +00:00
DeltaNedas
49ab7ceb77
main.js required now
2020-02-02 12:44:37 +00:00
Anuken
7ddfcbfabd
Utility method copying
2020-02-02 00:39:29 -05:00
Anuken
da2aee7d31
Entity components based on code generation - experiment
2020-02-01 23:54:41 -05:00
DeltaNedas
4c45716149
first part of what cat wants
2020-02-02 02:49:47 +00:00
Anuken
62179233ef
Bugfixes
2020-02-01 17:17:03 -05:00
DeltaNedas
51bc5c3b74
local changes
2020-02-01 18:28:25 +00:00
DeltaNedas
a45a14025d
oops
2020-02-01 18:26:38 +00:00
Anuken
eabebcefc7
Disabled data folder button due to terrible file manager support
2020-01-31 23:09:21 -05:00
DeltaNedas
e1a215ae0b
wrapper works now
2020-02-01 01:18:18 +00:00
Anuken
63d84bead3
Cleanup
2020-01-31 20:10:21 -05:00
DeltaNedas
d872656bc5
it works sorta!
2020-01-31 23:51:33 +00:00
Anuken
51b4824c92
Fixed #1484
2020-01-31 11:07:25 -05:00
Anuken
2721aa550d
Implemented #1444
2020-01-30 22:56:17 -05:00
Anuken
f92b91c17b
Switched to arc bloom
2020-01-30 17:50:35 -05:00
Anuken
221b28c153
Merge remote-tracking branch 'origin/master'
2020-01-30 17:43:48 -05:00
Anuken
7c2541afa2
Fixed bloom black screen on iOS/Android
2020-01-30 17:43:36 -05:00
DeltaNedas
9da505119b
it compiles but cant find module
...
help
2020-01-30 00:53:05 +00:00
DeltaNedas
677debd475
testing script loading stuff
...
is not allowed in console, only from `LoadedMod`s.
2020-01-30 00:38:51 +00:00
DeltaNedas
864c73f791
make it semi work maybe
...
still completely insecure
2020-01-30 00:21:50 +00:00
DeltaNedas
9ed7719464
compile dammit
2020-01-30 00:04:42 +00:00
DeltaNedas
187e1f5848
create new branch
2020-01-29 23:52:58 +00:00
Vam-Jam
36782a2454
[Fix] lastMessage doesnt change if prevented by antispam ( #1471 )
...
Fixes issue #1470
2020-01-29 11:32:41 -05:00
Patrick 'Quezler' Mounier
55932d03c9
Do ¬ bump empty conveyors
2020-01-29 10:33:39 +01:00
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
