mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 04:59:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,832 Commits 4 Branches 160 Tags 2.3 GiB
3ae8065cf1
Commit Graph

144 Commits

Author SHA1 Message Date
Anuken
3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Anuken
d6d6dc29dc More plugin customization / Renamed Rectangle 2019-12-26 22:44:15 -05:00
Anuken
6080a7e4bc Possibly fixed tests / Added support for mod icons 2019-12-26 20:53:53 -05:00
Anuken
c449302d28 Fixed tests 2019-12-26 19:57:24 -05:00
Anuken
de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken
9016c12d16 Made team a separate class 2019-12-25 19:07:04 -05:00
Anuken
1e7c83f0c9 Partial merge 2019-12-25 13:22:36 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken
32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# 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/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
 2019-12-24 12:40:23 -05:00
Anuken
1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Anuken
8fde8695d0 Fixed tests 2019-12-12 16:33:24 -05:00
Anuken
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
78f146fbcf Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# 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/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties
 2019-12-01 17:42:56 -05:00
Anuken
73b6cc73ff Fixed tests 2019-11-17 11:30:03 -05:00
Anuken
629999a1cd More unit tests / Lighting improvements 2019-11-16 23:45:31 -05:00
Anuken
94cf054312 Fixed unit tests 2019-11-16 12:40:26 -05:00
Anuken
edfe58cb38 Refactoring of tile storage, filters 2019-11-16 12:34:29 -05:00
Anuken
8798fa101a Merge 2019-11-16 00:15:45 -05:00
Anuken
30ea285ca0 Change power "satisfaction" -> "status", use efficiency() in blocks 2019-11-14 14:59:04 -05:00
Anuken
8952dd7f56 Begin work on 6.0 2019-11-10 14:05:29 -05:00
Anuken
6f19685255 Fixed #971 2019-11-01 12:48:42 -04:00
Anuken
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
Anuken
e103d62b75 Bugfixes / Rework of save discovery system 2019-10-27 14:58:26 -04:00
Anuken
d7ebbbf2b6 Better organization 2019-10-21 21:22:35 -04:00
Anuken
01f6fff823 Correct liquid boost display for turrets 2019-10-21 17:50:26 -04:00
Anuken
f17766c8ce Fixed tests 2019-10-15 08:51:48 -04:00
Anuken
3f3a03c227 ???? 2019-10-11 09:32:58 -04:00
Anuken
36cec98082 ??? 2019-10-11 09:26:49 -04:00
Anuken
21b7a0235b Attempting to fix github CI 2019-10-11 09:14:43 -04:00
Anuken
20462b91d4 Major refactoring of building input in progress 2019-10-06 16:56:31 -04:00
Anuken
a51216d7a6 Test fix 2019-10-05 16:06:36 -04:00
Anuken
89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -04:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
55e43761e9 Auto-tag Arc commits at release time 2019-09-13 13:53:15 -04:00
Anuken
bd96ae5a48 Nestable array iterators + unit tests 2019-09-12 12:17:28 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
a575284bfe Fixed unit tests 2019-08-28 14:12:11 -04:00
Anuken
9d214a77d7 Test fixes 2019-08-27 19:37:13 -04:00
Anuken
bd15287420 Better loading screen / Fixed unit tests 2019-08-27 17:44:25 -04:00
Anuken
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken
73149123b4 Fullscreen key / Bugfixes 2019-08-25 12:02:51 -04:00
Anuken
04c8ecf4af New team colors 2019-08-02 10:10:37 -04:00
Anuken
122f43ddb9 Fixed unit tests 2019-06-14 15:07:39 -04:00
Anuken
5cfab33ada Fixed unit tests / Fixed zones having incorrect waves 2019-06-12 18:42:12 -04:00
Anuken
18328320c1 Fixed black blocks/units after quit / Fixed intense wave spawn lag 2019-06-12 18:07:19 -04:00
Anuken
73c48afc99 Save loading regression tests 2019-06-12 15:52:47 -04:00
Anuken
62bd0442df Testing loading of old saves 2019-06-12 15:29:41 -04:00