Anuken
659bfea8cf
Cleanup
2020-02-07 23:12:39 -05:00
Anuken
c8455ddbc8
Added message for non-building units
2020-02-07 21:56:55 -05:00
Anuken
9ccf95971e
Fixed small launch items button
2020-02-07 20:51:59 -05:00
Anuken
0ffcd0b94c
Fixed #1507 / Fixed #1504
2020-02-07 20:21:45 -05:00
Anuken
5a5945cc52
Merge remote-tracking branch 'origin/master'
2020-02-07 20:09:45 -05:00
Anuken
e5fd3dec4c
Fixed #1526
2020-02-07 20:09:37 -05:00
Anuken
8a9c92227d
More movement
2020-02-07 18:55:53 -05:00
Anuken
4265d40024
Movement
2020-02-07 13:02:24 -05:00
Anuken
861b3ac3f4
Tweaks
2020-02-07 11:46:10 -05:00
Anuken
007a1bd1d2
Unit definitions
2020-02-07 11:04:58 -05:00
Anuken
b9841f9cfa
a mess
2020-02-07 10:47:58 -05:00
Anuken
33e818a757
Entity name mapping
2020-02-07 09:36:51 -05:00
扩散性百万甜面包
7b586ea043
Fix a typo ( #1528 )
...
* Fix a typo
* Update core/src/mindustry/mod/Mods.java
Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com >
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com >
2020-02-07 08:25:26 -05:00
Patrick 'Quezler' Mounier
d7e8a8e4f4
Add comment to 〃
2020-02-07 11:02:42 +01:00
Patrick 'Quezler' Mounier
b66e03d2a8
Revert "Cache upstream"
...
This reverts commit 908018b97c
2020-02-07 10:59:51 +01:00
Patrick 'Quezler' Mounier
908018b97c
Cache upstream
...
But i do ¬ like how this turned out, so reverting :(
2020-02-07 10:59:45 +01:00
Patrick 'Quezler' Mounier
9abb08152b
Prettify upsteam calculator
2020-02-07 10:51:36 +01:00
Patrick 'Quezler' Mounier
94dc220924
Finish 〃
2020-02-07 10:32:43 +01:00
Patrick 'Quezler' Mounier
3d8e83850e
Refractor inputs to upstream
2020-02-07 08:41:34 +01:00
Anuken
eeae5149a1
Basic unit rendering
2020-02-06 22:08:31 -05:00
Anuken
37a9311202
Merge remote-tracking branch 'origin/master'
2020-02-06 20:25:17 -05:00
Anuken
e9f37ea68e
Removed entity processor files
2020-02-06 20:25:10 -05:00
Anuken
f83b6728cf
?
2020-02-06 20:24:30 -05:00
Anuken
e3136e9e09
more rendering
2020-02-06 14:58:12 -05:00
MEEP of Faith
da5755b7c1
For consistancy ( #1517 )
...
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
2020-02-06 14:46:33 -05:00
Patrick 'Quezler' Mounier
4147d8a512
Cleanup 〃
2020-02-06 20:23:42 +01:00
Patrick 'Quezler' Mounier
8c7b688f78
Add layered blendbitz
2020-02-06 20:19:00 +01:00
Anuken
ddecb2d831
Actual updating and rendering
2020-02-06 13:40:07 -05:00
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater
2020-02-06 19:33:57 +01:00
Patrick 'Quezler' Mounier
c0d250560a
🐍 is kil
2020-02-06 19:33:42 +01:00
Anuken
6fe5663f79
Autogenerated render layer groups
2020-02-06 13:20:03 -05:00
Anuken
70c06b58ef
Conveyor cleanup
2020-02-06 11:38:36 -05:00
Anuken
6a99a3922e
Cleanup
2020-02-06 11:37:22 -05:00
Patrick 'Quezler' Mounier
502e8f78ce
Move some stuff around
2020-02-06 17:25:54 +01:00
Anuken
a11f6efe0a
Rudimentary rendering
2020-02-05 23:04:48 -05:00
Anuken
8172e69f8c
it launches
2020-02-05 22:08:57 -05:00
Anuken
dfecfa3964
.
2020-02-05 20:11:49 -05:00
Anuken
4a2c6c571f
Merge remote-tracking branch 'origin/master'
2020-02-05 19:02:02 -05:00
Anuken
a5fd881f8d
Full implementation of #1494
2020-02-05 19:01:53 -05:00
Patrick 'Quezler' Mounier
e06d8eabec
[formatting] add newline to file(s) ( #1508 )
...
* Trail appropriate files with a new line
* For some ironic reason it ignored itself
Probably because it wasn’t tracked/commited yet.
* Rename newlines to server executable naming pattern
2020-02-05 18:36:56 -05:00
Anuken
f6b1420103
c l e a n u p
2020-02-05 18:28:19 -05:00
Anuken
84748afc55
the errors are back
2020-02-05 15:00:35 -05:00
Anuken
eb0ea9030b
?
2020-02-05 13:08:48 -05:00
Anuken
da97aee8e4
it never ends
2020-02-05 13:03:22 -05:00
Patrick 'Quezler' Mounier
05ccdfd51b
Merge branch 'master' into crater
...
# 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/world/modules/ItemModule.java
2020-02-05 10:26:34 +01:00
Arkanic
ff06a005a0
become exist
2020-02-05 00:53:15 +00:00
Arkanic
fd500f5405
heh make branch
2020-02-05 13:27:36 +13:00
Anuken
a7b39e56bd
Cleanup continues
2020-02-04 18:00:32 -05:00
Anuken
012421afcb
Class ID mapping
2020-02-04 13:57:42 -05:00
Anuken
be50997f94
Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl
...
# 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/Vars.java
# core/src/mindustry/entities/traits/SaveTrait.java
# core/src/mindustry/maps/generators/MapGenerator.java
# core/src/mindustry/ui/dialogs/DeployDialog.java
# core/src/mindustry/world/blocks/Floor.java
# desktop/src/mindustry/desktop/DesktopLauncher.java
# gradle.properties
2020-02-04 12:25:18 -05:00
