Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,446 Commits 4 Branches 180 Tags
393d3a19a391414fc0d5af56bdcf57d33e20e5b7
Commit Graph

284 Commits

Author SHA1 Message Date
Anuken
393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken
259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken
c25e6b586b Allow empty maps in FileMapGenerator 2021-08-25 21:57:18 -04:00
Anuken
e5c77ef69a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-20 11:10:55 -04:00
Anuken
465afc3128 Sound fixes 2021-08-20 08:54:02 -04:00
Anuken
5ddb22ab61 Various minor tweaks 2021-08-20 00:05:08 -04:00
Anuken
f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Anuken
8e179552ec pointless casts begone 2021-08-17 21:45:13 -04:00
Anuken
0c5f781702 Sector wave spawning fixes 2021-08-16 13:15:14 -04:00
Anuken
e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Anuken
fc41ad36f7 Fixed damaged building memory leak 2021-07-30 11:58:01 -04:00
Anuken
385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
 2021-07-23 17:58:02 -04:00
Anuken
974d3498c1 Settings tooltips 2021-07-18 11:11:28 -04:00
Anuken
f7f2b3438c Use short filter names in JSON 2021-07-17 16:46:35 -04:00
Anuken
55920e6242 Cleanup 2021-07-17 15:18:51 -04:00
Anuken
820920e5f9 Redundant cast cleanup 2021-07-17 09:30:31 -04:00
Anuken
8e21c627a7 Improved Serpulo sector path generation 2021-07-17 09:22:02 -04:00
Anuken
822fe9ab7a Fixed inaccessible gaps in Serpulo generator 2021-07-16 10:05:59 -04:00
Anuken
103f24d41d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
 2021-07-15 09:13:35 -04:00
Anuken
4f98bc95a2 Better sliders 2021-07-12 12:36:45 -04:00
Anuken
42497d8627 ClassMap regen 2021-07-04 09:55:12 -04:00
Anuken
4ed9f10c1b Cleanup 2021-07-04 09:51:39 -04:00
Anuken
e7ec2da063 Asteroid variants 2021-06-23 16:21:12 -04:00
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
1630e1a7fb Asteroid gen progress 2021-06-22 14:22:31 -04:00
Anuken
afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken
ff3940865e A. 2021-06-21 19:35:00 -04:00
Anuken
4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken
448d1e2c77 Cleanup 2021-06-20 09:50:25 -04:00
Anuken
5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken
b7b9d48d1e Cleanup 2021-06-19 21:31:37 -04:00
Anuken
3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken
ca60309fde Asteroid generator progress 2021-06-19 11:17:52 -04:00
Anuken
b77b89abfb More environmental support 2021-06-17 14:34:57 -04:00
Anuken
016e5ab97e Env rules for many various blocks 2021-06-17 11:08:01 -04:00
Anuken
afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
 2021-06-17 10:44:51 -04:00
Anuken
efcae883fb Experimental core-capture PvP map / Editor filter fixes 2021-06-16 11:09:18 -04:00
Anuken
97729fd659 Stateless simplex (2) 2021-06-15 19:31:51 -04:00
Anuken
eed91eaaa0 # Conflicts: 
#	core/src/mindustry/mod/ClassMap.java
 2021-06-15 19:29:12 -04:00
Anuken
fe9ff212b2 Stateless simplex 2021-06-15 19:28:54 -04:00
Anuken
210fb349de Less editor filter state 2021-06-15 12:26:00 -04:00
Anuken
69d8af7874 Editor filter seed saving & cleanup 2021-06-15 11:58:26 -04:00
Anuken
183c922b6b Do not save MirrorFilter temporary vectors 2021-06-15 11:32:49 -04:00
Anuken
4eb0852f9f Lighting bugfixes 2021-06-12 17:22:12 -04:00
Anuken
3d76609f42 . 2021-06-12 14:09:24 -04:00
Anuken
9a8c9dff17 Red ice 2021-06-12 10:54:58 -04:00
Anuken
d710c2e8b5 Minor generation improvements 2021-06-12 10:11:37 -04:00
Anuken
31ebb1d156 Planet progress 2021-06-10 20:46:10 -04:00
Anuken
1ce6772601 Merge 2021-06-09 17:15:22 -04:00