Commit Graph

166 Commits

Author SHA1 Message Date
Anuken
aedd047c6f Slightly improved mod dialog 2020-04-10 11:49:22 -04:00
Anuken
a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
Anuken
7b25b09c18 Bugfixes 2020-04-07 14:08:42 -04:00
Anuken
a7b80f025c Bugfixes 2020-04-04 15:08:08 -04:00
Anuken
85e4270536 New water textures 2020-04-04 00:31:29 -04:00
Anuken
d611dd107a Bugfixes 2020-04-02 22:45:13 -04:00
Anuken
50c6b0b1bd Cleanup 2020-03-27 10:07:42 -04:00
Anuken
0573160b2f Added sorter cross (#1566) 2020-03-26 17:39:23 -04:00
Anuken
f966489298 Various tweaks 2020-03-25 23:28:20 -04:00
Anuken
4fb74d1e39 Cleanup 2020-03-25 00:18:40 -04:00
Anuken
7d5ceafff2 Implemented #1129 / Bugfixes 2020-03-24 12:02:26 -04:00
Anuken
e9994794aa Sector lock state 2020-03-19 11:29:18 -04:00
Anuken
436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
2020-03-17 20:03:12 -04:00
Anuken
12d4aab48a Tweaks 2020-03-17 20:02:38 -04:00
Anuken
0ed21a1d5f Bugfixes, cleanup / Created stub processor class 2020-03-17 11:51:33 -04:00
Anuken
08488857da Removed DoubleTurret, merged functionality 2020-03-17 11:02:10 -04:00
Anuken
2c7ff64511 Fixed some variable shadowing 2020-03-17 10:28:18 -04:00
Anuken
928812142a Bugfixes & liquid unit tests 2020-03-16 10:41:32 -04:00
ma44
ec34e27102 map setting refund (#1709) 2020-03-15 14:02:47 -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
808615a77c Bugfixes 2020-03-13 22:33:37 -04:00
Anuken
876d193379 Bugfixes 2020-03-09 11:16:57 -04:00
Anuken
863c7ae2bc Removed unit factory limit 2020-03-08 17:49:19 -04:00
Anuken
12c4395508 Added basic respawning 2020-03-07 23:24:22 -05:00
Anuken
7b144cbec6 Attribute tweaks 2020-03-07 13:56:57 -05:00
Anuken
ae0b84cef0 Increased max block size 2020-03-06 16:31:09 -05:00
Anuken
77f406e9b8 Fixed core errors 2020-03-06 15:22:13 -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
2dfbbdfd5b Beginning work on respawning 2020-03-05 12:12:03 -05:00
Anuken
39ee31d748 Fixed #1673 2020-03-05 08:45:14 -05:00
Anuken
882076030d Added back tapping 2020-03-04 19:58:48 -05:00
Anuken
c02c00cdfb Schematic tweaks and improvements 2020-03-04 19:21:40 -05:00
Anuken
3eea0ea065 Bugfixes, tweaks 2020-03-04 13:48:00 -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
2581353c5e 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-03 21:33:03 -05:00
Anuken
bac1648d4b Added support for changing cached floor/terrain 2020-03-03 17:01:09 -05:00
Anuken
a2a9cffdee Moved some methods around 2020-03-01 00:09:03 -05:00
Anuken
38ab1473f2 Backport of fixed lighting + overflow crash fix 2020-02-28 13:46:16 -05:00
Anuken
04f8282821 Better lighting 2020-02-28 13:44:03 -05:00
Anuken
dcf75222d9 Cleanup 2020-02-27 10:04:56 -05:00
Anuken
1e53ea50b0 Added support for export/import of all basic terrain as image 2020-02-26 19:37:22 -05:00
Anuken
cfbe631e66 Merge 2020-02-23 20:14:38 -05:00
Anuken
6e4b02db5a Correctly seeded sectors 2020-02-22 15:28:56 -05:00
Anuken
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05:00