Commit graph

30 commits

Author SHA1 Message Date
Anuken
fc41ad36f7 Fixed damaged building memory leak 2021-07-30 11:58:01 -04:00
Anuken
f7f2b3438c Use short filter names in JSON 2021-07-17 16:46:35 -04:00
Anuken
4ed9f10c1b Cleanup 2021-07-04 09:51:39 -04:00
Anuken
efcae883fb Experimental core-capture PvP map / Editor filter fixes 2021-06-16 11:09:18 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
ecea8eab01 Various tweaks and bugfixes 2020-11-22 21:20:33 -05:00
Anuken
cf3f540df4 New map 2020-10-23 13:31:55 -04:00
Anuken
a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
Anuken
f0d74e2705 New map / Unit stat tweaks / FileChooser keyboard input 2020-10-21 20:32:35 -04:00
Anuken
3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00
Anuken
35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
Anuken
030542890e Bugfixes 2020-09-16 16:04:11 -04:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
bbe6c5017a Removed synthetic accessors / Sector sanity tests 2020-08-19 15:13:29 -04:00
Anuken
f60afc39f1 Replaced '$' formatting with '@' 2020-08-04 10:18:01 -04:00
Anuken
c3a073fbbf Bugfixes 2020-07-30 10:51:43 -04:00
Anuken
96f41b0cf3 Cleanup 2020-06-25 22:34:38 -04:00
Anuken
126b54b981 Better built-in shuffle 2020-06-14 14:50:04 -04:00
Anuken
8ea28e1ced Seq. 2020-06-08 17:19:47 -04:00
Anuken
c225291790 a r c 2020-05-21 16:53:30 -04:00
Anuken
14e79b50d2 Removed legacy IO code 2020-05-21 16:50:49 -04:00
Anuken
530ff9761b Fixed core selection in preset sectors 2020-05-18 15:38:56 -04:00
Anuken
becc23ca42 Cleaner formatting 2020-05-03 21:18:25 -04: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
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
a4e820f907 Added default ore flags for modded ores 2020-01-23 20:20:04 -05:00
Anuken
1e7c83f0c9 Partial merge 2019-12-25 13:22:36 -05:00
Anuken
c0f14185a8 More fixes 2019-12-25 12:35:23 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Renamed from core/src/io/anuke/mindustry/maps/Maps.java (Browse further)