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

136 Commits

Author SHA1 Message Date
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Anuken
04df23b88a Generation tweaks 2021-10-07 14:35:09 -04:00
Anuken
00be5b7fa5 Converted soundtrack to ogg 2021-10-07 12:07:26 -04:00
Anuken
56fe1bfa68 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-10-05 12:08:58 -04:00
Anuken
0d0fe394d3 Serpulo water tweaks 2021-10-03 13:12:20 -04:00
Anuken
10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
 2021-10-01 09:41:33 -04:00
Anuken
ee26f51d7a Cleanup 2021-09-30 18:32:31 -04:00
Anuken
0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Anuken
5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
Anuken
71543f2ab2 Improved Serpulo water edge generation 2021-09-28 17:20:20 -04:00
Anuken
e57087e891 Better payload construct/deconstruct effects 2021-09-20 10:09:00 -04:00
Anuken
61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
 2021-09-17 21:33:01 -04:00
Anuken
263850624a Cleanup 2021-09-17 11:36:57 -04:00
Anuken
e08e51b939 Planet background system 2021-09-17 11:23:32 -04:00
Anuken
32baf06c97 Experimental alternate Serpulo generation / Spawn margin decrease 2021-09-16 18:10:38 -04:00
Anuken
c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Anuken
caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
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
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
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