mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,526 Commits 4 Branches 160 Tags 2.3 GiB
ba0892fdcb
Commit Graph

132 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
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
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken
afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken
5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken
3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken
93651939f2 stop 2021-06-12 10:55:18 -04:00
Anuken
c4b1bf3e55 Asteroid progress 2021-06-11 19:59:18 -04:00
Anuken
8c32c00e2b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-09 17:10:49 -04:00
Anuken
b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken
974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-05 11:57:14 -04:00
Anuken
9cd482d389 Minor bugfix 2021-06-03 16:01:51 -04:00
VozDuh
1cbd58820e
Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
Anuken
1c71ee2ed7 Moved bushes into correct directory 2021-06-02 11:24:15 -04:00
Anuken
e9129e6f43 Unspoiled 2021-06-02 11:15:30 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
b6c645b701 Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -05:00
Anuken
c99873c823 Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
Anuken
837a8cecb3 Wave balancing & other tweaks 2020-10-10 12:26:57 -04:00
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -04:00
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken
27e9b5aeb9 Removed cliffs / Nerfed explosion bombing 2020-09-13 12:13:42 -04:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
88e3022db0 files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
Anuken
0e61d61dd2 Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
Felix Corvus
916a00b6ff textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
Anuken
7dfd20d020 Core launch cost 2020-06-22 21:02:53 -04:00
Anuken
ce9f515543 Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
Anuken
85e4270536 New water textures 2020-04-04 00:31:29 -04:00
Anuken
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
8952dd7f56 Begin work on 6.0 2019-11-10 14:05:29 -05:00
Anuken
2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken
16f6b51857 Various tweaks, new music tracks 2019-08-09 23:23:45 -04:00
Anuken
77d4b0972d Balancing 2019-08-02 12:39:21 -04:00
Anuken
c4157d2ec8 New map / Better filters / Sand boulders 2019-07-26 18:59:33 -04:00
Anuken
c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken
3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Anuken
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
Anuken
0371126ccf Various menu fixes 2019-07-04 00:51:42 -04:00
Anuken
d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
Anuken
0d39400f8b Fixed performance regression / Removed useless fallback sprites 2019-07-03 17:07:22 -04:00