Commit Graph

115 Commits

Author SHA1 Message Date
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
0c5f781702 Sector wave spawning fixes 2021-08-16 13:15:14 -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
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
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
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
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
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
1ce6772601 Merge 2021-06-09 17:15:22 -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
a7de30ba53 RidgedPerlin cleanup / More river noise options 2021-06-07 20:38:17 -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
786d638ad0 Misc cleanup 2021-03-16 21:51:12 -04:00
Anuken
e5413cebdc Fixed #4766 2021-02-23 11:29:51 -05:00
Anuken
6357c17f8a Fixed #4164 / Fixed #4159 2020-12-29 10:13:27 -05:00
Anuken
c54f398063 Fixed Parallax not moving players serverside 2020-12-10 18:21:39 -05:00
Anuken
57ad1d5366 Fixed #3899 2020-12-09 20:19:54 -05:00
Anuken
66918f0322 Campaign balancing 2020-11-27 17:37:22 -05:00
Anuken
ad71007a0a Campaign balance 2020-11-22 17:20:20 -05:00
Anuken
455e3188c4 More concentrated enemy bases 2020-11-22 14:45:43 -05:00
Anuken
f71b726877 Testing Github Actions CI 2020-11-19 18:53:02 -05:00
Anuken
3c36749990 Implemented automatic co-op sector change sync 2020-11-17 09:39:28 -05:00
Anuken
f296d23cfa Bugfixes 2020-11-16 19:43:56 -05:00
Anuken
6c2541491f More campaign water 2020-11-14 17:34:35 -05:00
Anuken
3b3b1520f9 Apparently every base part had a base tier of 0 this whole time 2020-11-13 12:40:23 -05:00
Anuken
0908176079 Campaign changes 2020-11-13 11:33:31 -05:00
Anuken
44286cee59 Wave versions 2020-10-28 18:51:42 -04:00
Anuken
46b2f4cccb Minor bugfixes & wave tweaks 2020-10-22 11:54:27 -04:00
Anuken
c1c41a19c8 Cleanup 2020-10-18 09:08:47 -04:00
Anuken
be394c4b33 Checks to prevent uncaptureable sectors 2020-10-17 10:10:29 -04:00
Anuken
06877b457e Rule selection fixes 2020-10-12 15:59:22 -04:00
Anuken
ad2bda8ec1 Better sector gen 2020-10-11 13:33:02 -04:00
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -04:00