mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity
13126 commits 4 branches 175 tags 2.4 GiB
Commit graph

129 commits

Author SHA1 Message Date
Anuken
47f075133f Merge 2020-02-13 11:22:29 -05:00
Anuken
e798619679 Bugfixes 2020-02-12 11:25:00 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -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
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -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
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Anuken
f937cb30f0 More components, less entities 2020-02-02 23:38:16 -05:00
Anuken
621233a5b3 More optimization 2020-01-26 16:12:11 -05:00
Anuken
93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken
27d6bf067e Added prototype planet sector land system 2020-01-20 12:05:26 -05:00
Anuken
3ae8065cf1 Merge 2020-01-06 17:20:16 -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
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -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
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
8952dd7f56 Begin work on 6.0 2019-11-10 14:05:29 -05:00
Anuken
e103d62b75 Bugfixes / Rework of save discovery system 2019-10-27 14:58:26 -04:00
Anuken
f17766c8ce Fixed tests 2019-10-15 08:51:48 -04:00
Anuken
89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -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
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
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
Anuken
79a2f31056 Fixed unit tests 2019-05-13 11:32:57 -04:00
Anuken
9f4a430412 Fixed tests 2019-05-09 14:39:52 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
7dfb0a81e3 Test fixes 2019-04-07 14:53:53 -04:00
Anuken
9699d9467a New tests / Bugfixes 2019-04-07 14:09:34 -04:00
Anuken
0a8f2edb05 Block update unit tests 2019-04-01 11:57:43 -04:00
Anuken
ee06e620c6 Zone wave bugfix / New tests / More "encouragement" 2019-03-21 19:19:12 -04:00
Anuken
6c8d80777c Removed useless name mapping / Cleanup 2019-03-11 11:43:23 -04:00