Commit Graph

43 Commits

Author SHA1 Message Date
Anuken
30e2d52341 Massive TechTree system cleanup 2021-11-28 13:48:06 -05:00
Anuken
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
2021-10-20 10:45:51 -04:00
Anuken
bd329f57d6 Add sensing of reconstructor config 2021-10-16 10:22:20 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ad425f322c Proper asteroid albedo 2021-09-16 10:33:15 -04:00
Anuken
00eca00f11 space payloads 2021-09-05 19:04:04 -04:00
Anuken
dedfd8efd3 Cloud improvements 2021-09-05 11:10:36 -04:00
Anuken
9feedabf07 Serpulo clouds, now with 2 layers 2021-09-05 01:18:50 -04:00
Anuken
ed86f50a2f Serpulo clouds 2021-09-05 00:42:47 -04:00
Anuken
5ddb22ab61 Various minor tweaks 2021-08-20 00:05:08 -04:00
Anuken
53eba2fb6a Asteroid clip size fix 2021-08-18 21:39:51 -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
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -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
016e5ab97e Env rules for many various blocks 2021-06-17 11:08:01 -04:00
Anuken
ecbf0dcf31 Planet lighting parameters 2021-06-12 11:07:40 -04:00
Anuken
d710c2e8b5 Minor generation improvements 2021-06-12 10:11:37 -04:00
Anuken
ae52eaab19 Asteroid progress 2021-06-11 21:51:49 -04:00
Anuken
c4b1bf3e55 Asteroid progress 2021-06-11 19:59:18 -04:00
Anuken
537c8f3cc5 Planet progress 2021-06-11 11:31:21 -04:00
Anuken
31ebb1d156 Planet progress 2021-06-10 20:46:10 -04:00
Anuken
f99b8e35bd Testing single-sector planets 2021-06-10 19:55:06 -04:00
Anuken
35be671d86 Planet constructor tweaks 2021-06-09 22:18:54 -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
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
bea9deb386 Removed planet switch debug code 2020-10-13 19:37:45 -04:00
Anuken
f39609d1ef Named the starter planet 2020-07-30 16:14:15 -04:00
Anuken
66c0c9baa2 Autopan to last sector 2020-07-29 23:36:59 -04:00
Anuken
7b3a5ad227 Functional presets 2020-05-17 13:07:46 -04:00
Anuken
a344c1a5d0 Better sun 2020-05-10 19:17:08 -04:00
Anuken
7ba7e14282 Atmosphere tweaks 2020-03-29 18:34:00 -04:00
Anuken
f22e1bdeb3 Added planet atmosphere shader 2020-03-29 17:08:25 -04:00
Anuken
53a6297b59 Better naval check 2020-03-22 11:30:15 -04:00
Anuken
7a01719816 Real-time lighting + solar system rendering 2020-02-29 11:58:10 -05:00
Anuken
f0857fa22d Universe time + Progress on solar system framework 2020-02-28 20:21:00 -05:00
Anuken
e3621f44da Barely functional IO 2020-02-13 19:26:36 -05:00
Anuken
b2f9b2ef77 Planet cleanup 2020-01-18 17:03:03 -05:00
Anuken
c681cc5cf8 Compile fixes 2019-12-25 13:25:44 -05:00
Anuken
1e7c83f0c9 Partial merge 2019-12-25 13:22:36 -05:00