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

178 Commits

Author SHA1 Message Date
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
3f6d5b9dfe Sync/save @tick/@time; make @time be based off of @tick 
Closes Anuken/Mindustry-Suggestions/issues/2976
 2021-09-22 19:35:15 -04:00
Anuken
bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Matthew Peng
cbb3afa95c Add boolean[] to TypeIO (#6026) 
* Add `boolean[]` to `TypeIO`

I'm too lazy to convert `byte[]` in my code.

* Order
 2021-09-20 00:10:43 -04:00
Anuken
e08e51b939 Planet background system 2021-09-17 11:23:32 -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
5e13f71fde Minor bugfixes & compatibility fixes 2021-09-07 17:57:03 -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
c60f6d155f Fixed #5725 2021-08-09 11:41:39 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
f820121e08 Sector bugfixes / More sector info 2021-08-03 16:01:27 -04:00
Anuken
c14532ecae Fixed #5645 2021-07-25 12:04:17 -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
bda461e480 Large constructor variant 2021-07-22 17:48:50 -04:00
Anuken
7879648090 Suppress invalid save meta errors 2021-07-18 14:40:59 -04:00
Anuken
f7f2b3438c Use short filter names in JSON 2021-07-17 16:46:35 -04:00
Anuken
0980495a28 (commented) support for Call server-to-client sounds 2021-07-16 15:39:03 -04:00
Anuken
8fb7cdaba6 Fixed #5584 2021-07-15 10:10:36 -04:00
Anuken
d468a4f328 Removed unnecessary TODOs 2021-06-22 16:07:19 -04:00
Anuken
82742339a3 Implementation of #5280 2021-06-07 10:47:53 -04:00
Anuken
ac20b17e0b Mod bugfixes 2021-06-03 13:58:56 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
bd36ca821d Improvements of status effects in database 2021-03-10 16:22:07 -05:00
Anuken
a60772a81e Fixed #4891 2021-03-07 17:54:43 -05:00
Patrick 'Quezler' Mounier
ae838b9392 Trace times joined & kicked (#4844) 
* Trace times joined & kicked

* Make mindustry.* import obsolete
 2021-03-03 09:09:05 -05:00
Anuken
25d013b768 Mod browser icon support 2021-02-06 12:05:59 -05:00
Anuken
ee79bc5501 Replaced waves.never with ∞ 2021-01-12 11:52:51 -05:00
Anuken
e7885a405e Removed 3.5 map image message 
Reasoning: 3.5 images and most other map images won't work in the editor. If you try to import a random image, it will give you an empty map. Only maps that were exported as images previously will work correctly.
 2021-01-12 10:19:30 -05:00
Anuken
bba52e99e0 Fixed #4121 2020-12-25 12:34:02 -05:00
Anuken
f9cfc8a2b8 Fixed #3812 / Fixed #3813 2020-12-05 20:48:56 -05:00
Anuken
9c616fd03b Possible fix for notched insets 2020-12-02 13:02:27 -05:00
Anuken
305e2642ba Minor bugfixes 2020-12-01 12:48:26 -05:00
Anuken
9870098457 Updated Steam meta / Fixed #3673 2020-11-30 17:12:29 -05:00
Anuken
eaa7b04c3d Fixed CI / Fixed exponentially increasing broken blocks 2020-11-25 10:15:14 -05:00
Anuken
7d43856735 Bugfixes 2020-11-24 10:23:28 -05:00
Skat
ed36390f3c Great cleanup 2020-11-07 11:37:46 +03:00
Anuken
479cad3d0c Un-protected IORunner 2020-11-05 09:16:54 -05:00
Anuken
47b123c219 Cleanup 2020-11-05 09:09:19 -05:00
Anuken
8f53d44278 Various fixes 2020-11-02 16:46:11 -05:00
Anuken
b1b03a7503 Extra legacy block substitution / iOS fixes 2020-10-31 16:11:51 -04:00
Anuken
8d6ea6b197 Correct team display on maps 2020-10-31 10:35:21 -04:00
Anuken
2c29a06eb5 Fixed #3206 2020-10-31 10:07:01 -04:00
Anuken
a9f5aa9220 suffering 2020-10-29 19:58:10 -04:00
Anuken
1663497e6c Better save validation 2020-10-29 19:03:58 -04:00
Anuken
44286cee59 Wave versions 2020-10-28 18:51:42 -04:00
Anuken
81dae580a4 Bugfixes / Removed tile unit multi-mining 2020-10-25 11:22:10 -04:00
Anuken
23673f0b11 typo 2020-10-22 20:34:02 -04:00
Anuken
514e2503fa Editor generation cleanup 2020-10-22 19:26:55 -04:00
Anuken
a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
Anuken
9ab272a01f Better server colors 2020-10-20 11:21:47 -04:00