Commit Graph

31 Commits

Author SHA1 Message Date
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
c60f6d155f Fixed #5725 2021-08-09 11:41:39 -04:00
Anuken
42486cd784 Fixed export/import lines curving through planet 2021-08-09 09:59:49 -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
1eebb48baa Displaced orbit fix 2021-06-11 11:43:55 -04:00
Anuken
537c8f3cc5 Planet progress 2021-06-11 11:31:21 -04:00
Anuken
f99b8e35bd Testing single-sector planets 2021-06-10 19:55:06 -04:00
Anuken
9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
Anuken
dfd2b22917 Planet method renaming 2021-06-10 18:51:29 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
b8efed9eaf Better space skybox scaling 2020-12-16 19:52:10 -05:00
Anuken
371a14af87 Inlined Time.time 2020-11-30 10:15:22 -05:00
Anuken
c41dfa46aa Fixed #3657 2020-11-29 19:41:10 -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
2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken
ddc2cc7098 New preset / Indication of vulnerable sectors 2020-11-10 13:47:55 -05:00
Skat
ed36390f3c Great cleanup 2020-11-07 11:37:46 +03:00
DeltaNedas
091593c84d Merge branch 'master' into planetdraw 2020-10-17 16:59:28 +00:00
DeltaNedas
ef2bf2e129 add universeDraw event 2020-10-17 15:38:12 +01:00
DeltaNedas
35a86a1aac add universe draw events 2020-10-17 15:34:00 +01:00
DeltaNedas
8e0c5023c9 hh 2020-10-17 12:28:46 +01:00
DeltaNedas
05b77d787e hide orbits of hidden planets 2020-10-17 12:10:52 +01:00
DeltaNedas
97b0461d7f allow modded planets to customize drawing 2020-10-16 23:00:06 +01:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Anuken
e267519c6d Balance & bugfixes 2020-09-05 22:58:07 -04:00
Anuken
f39609d1ef Named the starter planet 2020-07-30 16:14:15 -04:00
Anuken
8ea28e1ced Seq. 2020-06-08 17:19:47 -04:00
Anuken
68f1efdbdd Sector launch impl 2020-06-01 16:00:36 -04:00
Anuken
ba788bac7a Planet rendering refactoring 2020-06-01 13:55:52 -04:00