Anuken
|
09e08a474b
|
Plastanium conveyor + bugfixes
|
2020-04-24 20:17:24 -04:00 |
|
Anuken
|
21946cafd1
|
Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater
|
2020-04-24 15:46:32 -04:00 |
|
Anuken
|
5d4ca753a7
|
Light cleanup
|
2020-04-24 11:08:02 -04:00 |
|
Patrick 'Quezler' Mounier
|
39266d23c8
|
Merge branch 'master' into crater
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites3.png
|
2020-04-23 21:10:48 +02:00 |
|
Anuken
|
fc4f8619f8
|
progress (purge)
|
2020-04-22 16:17:43 -04:00 |
|
Patrick 'Quezler' Mounier
|
561198f517
|
Fix issue with uneven dumping
|
2020-04-18 13:39:12 +02:00 |
|
Anuken
|
eeb8d5ef9c
|
Renamed key fields and table methods
|
2020-04-17 11:26:59 -04:00 |
|
Patrick 'Quezler' Mounier
|
32e32ecae2
|
Merge branch '6.0' into crater
# Conflicts:
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
|
2020-04-16 22:38:51 +02:00 |
|
Anuken
|
280f3dd428
|
Added experimental package
|
2020-04-16 16:31:43 -04:00 |
|
Patrick 'Quezler' Mounier
|
79a095faa8
|
Merge branch '6.0' into crater
|
2020-04-16 20:30:13 +02:00 |
|
Anuken
|
2f3a842f2e
|
isValid() workaround
|
2020-04-16 14:26:09 -04:00 |
|
Patrick 'Quezler' Mounier
|
361a540ed3
|
Merge branch '6.0' into crater
|
2020-04-16 19:10:10 +02:00 |
|
Patrick 'Quezler' Mounier
|
e66a1a92c3
|
Phase out the need for isSleeping
Thanks to knowledge gained from the previous commit.
|
2020-04-16 18:56:00 +02:00 |
|
Anuken
|
713dbccf74
|
Bugfixes
|
2020-04-16 11:30:42 -04:00 |
|
Patrick 'Quezler' Mounier
|
a1d4804fae
|
Merge branch '6.0' into crater
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
# core/src/mindustry/ui/fragments/PlayerListFragment.java
|
2020-04-16 17:13:18 +02:00 |
|
Anuken
|
42f227195c
|
Better payload framework
|
2020-04-16 09:44:31 -04:00 |
|
Patrick 'Quezler' Mounier
|
5c28985ee6
|
Merge branch '6.0' into crater
# Conflicts:
# 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/Blocks.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/BlockStorage.java
|
2020-04-16 12:39:52 +02:00 |
|
Anuken
|
51226d6c88
|
Arc compat
|
2020-04-14 20:29:59 -04:00 |
|
Anuken
|
a240c00ebf
|
Set cleanup
|
2020-04-12 17:42:09 -04:00 |
|
Anuken
|
3bb2b646db
|
Networked unit control / Mimic AI prototype
|
2020-04-11 10:03:47 -04:00 |
|
Anuken
|
152a987c3a
|
Experimental flow display
|
2020-03-26 17:19:18 -04:00 |
|
Anuken
|
7d5ceafff2
|
Implemented #1129 / Bugfixes
|
2020-03-24 12:02:26 -04:00 |
|
Anuken
|
0ed21a1d5f
|
Bugfixes, cleanup / Created stub processor class
|
2020-03-17 11:51:33 -04:00 |
|
Anuken
|
928812142a
|
Bugfixes & liquid unit tests
|
2020-03-16 10:41:32 -04:00 |
|
Anuken
|
cd019ab329
|
More bugfixes
|
2020-03-14 18:19:07 -04:00 |
|
Anuken
|
7e781d9ff8
|
Bugfixes
|
2020-03-14 12:29:12 -04:00 |
|
Anuken
|
ade989aecb
|
Removed Shader#end
|
2020-03-10 10:32:40 -04:00 |
|
Anuken
|
876d193379
|
Bugfixes
|
2020-03-09 11:16:57 -04:00 |
|
Anuken
|
7655b65363
|
Bugfixes / Fixed #1680
|
2020-03-06 17:06:21 -05:00 |
|
Anuken
|
f8b554aff8
|
Fixed some basic crashes
|
2020-03-06 15:30:51 -05:00 |
|
Anuken
|
73c0ebb75f
|
Fixed most errors in block package
|
2020-03-06 14:41:38 -05:00 |
|
Anuken
|
4744465986
|
More cleanup, nearing completion of block refactor
|
2020-03-06 12:19:26 -05:00 |
|
Anuken
|
1c48c1a43e
|
Cleanup
|
2020-03-05 23:23:10 -05:00 |
|
Anuken
|
2e19504b65
|
it begins
|
2020-03-05 20:27:42 -05:00 |
|
Anuken
|
5a0d079a78
|
oh no
|
2020-03-05 18:05:59 -05:00 |
|
Anuken
|
cf31293d7b
|
Many internal changes
|
2020-03-04 13:32:31 -05:00 |
|
Anuken
|
aeae286273
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
|
2020-03-04 08:38:36 -05:00 |
|
Anuken
|
e215772f30
|
Added backwards compatibility for legacy saves
|
2020-02-17 11:13:46 -05:00 |
|
Anuken
|
09c57c32d6
|
Better IO
|
2020-02-13 22:11:59 -05:00 |
|
Anuken
|
e3621f44da
|
Barely functional IO
|
2020-02-13 19:26:36 -05:00 |
|
Anuken
|
e9b066b866
|
Fires, puddles, feature reimplementations
|
2020-02-09 23:43:08 -05:00 |
|
Anuken
|
6a99a3922e
|
Cleanup
|
2020-02-06 11:37:22 -05:00 |
|