Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,845 Commits 4 Branches 180 Tags
aa6eb73de8d2c9e5992b8e54858f253cebaa65c0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken 255f97dc56 breach 2021-10-23 17:32:58 -04:00
Anuken 79d90ca75d Merge remote-tracking branch 'origin/master' 2021-10-23 14:35:59 -04:00
Anuken b2b47353bf Fixed kotlin daemon randomly crashing 2021-10-23 14:35:54 -04:00
Anuken 693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken 553333b656 Beam drill bugfixes 2021-10-23 11:27:25 -04:00
Anuken 00e1d69348 Merge remote-tracking branch 'origin/master' 2021-10-23 09:26:35 -04:00
Anuken 88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
Anuken a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
Anuken 414f27a3b6 Merge remote-tracking branch 'origin/master' 2021-10-22 17:47:22 -04:00
Anuken 009eea1988 Cloud rendering overlap fix 2021-10-22 17:47:17 -04:00
Anuken 5d20f3a89b Merge remote-tracking branch 'origin/master' 2021-10-22 09:04:06 -04:00
Anuken 677e0e6f58 Fixed #6207 2021-10-22 09:04:00 -04:00
Anuken 4dc2164468 Merge remote-tracking branch 'origin/master' 2021-10-21 12:11:59 -04:00
Anuken e9612ce9f0 Fixed #6203 / Minor block requirement changes 2021-10-21 12:11:54 -04:00
Anuken 699364580e Added hiddenBuildItems rule 2021-10-20 16:25:24 -04:00
Anuken 085a974350 Cleanup 2021-10-20 14:34:27 -04:00
Anuken 4436a5ced9 An experiment 2021-10-20 14:30:06 -04:00
Anuken 9416f137cb bugfixes 2021-10-20 11:01:47 -04: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 a21f6d335f Fixed incorrect waves on serpulo sectors 2021-10-19 18:18:58 -04:00
Anuken 2469cf0851 Added isPayload utility for buildings 2021-10-19 12:13:29 -04:00
Anuken a82ba0567b Merge remote-tracking branch 'origin/master' 2021-10-19 09:19:51 -04:00
Anuken 6022fcd109 Removed unused iOS splash screen 2021-10-19 09:19:46 -04:00
Anuken 7dc492892e Fixed #6190 2021-10-18 16:28:52 -04:00
Anuken 4e92aa2000 Turret payload shoot fix 2021-10-18 11:48:44 -04:00
Anuken 3c8e21ac6a Remove debug write test 2021-10-18 11:37:52 -04:00
Anuken 8f5aa02428 Merge remote-tracking branch 'origin/master' 2021-10-18 11:37:32 -04:00
Anuken f31759bb96 Update/draw payload buildings (broken) 2021-10-18 11:37:26 -04:00
Anuken c6f6b8e46e Fixed legged units using wrong pathfinder 2021-10-18 09:58:01 -04:00
Anuken 3a9c0377ac Merge remote-tracking branch 'origin/master' 2021-10-17 22:40:26 -04:00
Anuken 324e5151aa Block cleanup 2021-10-17 22:40:21 -04:00
Anuken 3c963fb1bc Merge remote-tracking branch 'origin/master' 2021-10-17 19:55:45 -04:00
Anuken af3467035b Building tile referernce cleanup 2021-10-17 19:55:37 -04:00
Anuken 0acd339e33 Payload loader crash fix 2021-10-17 16:46:39 -04:00
Anuken e897458e94 Sound codegen fixes 2021-10-17 16:12:47 -04:00
Anuken a72adef051 Fixed off-tinted cells 2021-10-17 16:03:05 -04:00
Anuken a8ffd6c520 Merge remote-tracking branch 'origin/master' 2021-10-17 15:30:56 -04:00
Anuken 9cb8c6d83d Added liquid container to tech tree 2021-10-17 15:30:52 -04:00
Anuken 994f6f7e84 Redundant codegen cleanup 2021-10-17 15:21:41 -04:00
Anuken ba91fb8eb7 Bugfixes 2021-10-17 15:14:19 -04:00
Anuken e6d7330f6e Fixed #6182 2021-10-17 15:01:29 -04:00
Anuken be1561b0cb Don't allow constructing banned blocks 2021-10-16 23:17:54 -04:00
Anuken b271f5b630 Fixed #6174 2021-10-16 23:06:07 -04:00
Anuken d5a2f13442 Payload loader tweaks 2021-10-16 22:33:17 -04:00
Anuken f03d3d89f3 Fixed large units fitting into deconstructors 2021-10-16 18:43:43 -04:00
Anuken 717a620ff4 Unpause game in logic variable dialog if necessary 2021-10-16 14:51:53 -04:00
Anuken 9dfd4d0049 Merge remote-tracking branch 'origin/master' 2021-10-16 13:01:07 -04:00
Anuken 290450de5b Fixed deconstructor not accepting direct unit payloads 2021-10-16 13:01:03 -04:00
Anuken b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Anuken f43e308dad Merge remote-tracking branch 'origin/master' 2021-10-16 10:22:24 -04:00
Anuken bd329f57d6 Add sensing of reconstructor config 2021-10-16 10:22:20 -04:00
Anuken 902f3695ee amend 2021-10-16 09:03:21 -04:00
Anuken d5e239c610 Fixed #6168 2021-10-16 09:02:40 -04:00
Anuken 36064c63e3 Fixed #6166 2021-10-15 22:26:52 -04:00
Anuken 733e0e86f9 Fixed #6166 2021-10-15 22:26:25 -04:00
Anuken 01a8a8bb4d Merge remote-tracking branch 'origin/master' 2021-10-15 21:40:13 -04:00
Anuken 4a979058c2 Crawler shootOnDeath 2021-10-15 21:40:09 -04:00
Anuken c3c3c2b522 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 18:53:37 -04:00
Anuken 956cbe792b Fixed #6164 2021-10-15 18:48:59 -04:00
Anuken 73dae0da47 compile fix 2021-10-15 18:46:11 -04:00
Anuken a04e8f87a9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 17:10:30 -04:00
Anuken 7a94af5e82 drag multiplier 2021-10-15 17:10:24 -04:00
Anuken e9e5fea306 Merge remote-tracking branch 'origin/master' 2021-10-15 17:04:39 -04:00
Anuken f683496440 cleanup 2021-10-15 17:04:34 -04:00
Anuken 176343e862 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 14:24:48 -04:00
Anuken 816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken bccdd86f30 Merge remote-tracking branch 'origin/master' 2021-10-15 11:41:00 -04:00
Anuken 9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
AnukenandGitHub 18c5f508b1 Update README.md 2021-10-14 22:41:33 -04:00
Anuken d8cf65e24c More permissive json type re-declarations 2021-10-14 21:59:02 -04:00
Anuken 3de9cfa1d7 Don't crash on invalid research 2021-10-14 21:26:34 -04:00
Anuken df156444e7 Prioritize mod content in parser 2021-10-14 21:24:19 -04:00
Anuken 8a3dd53aa2 ClassMap regen 2021-10-14 21:01:20 -04:00
Anuken 56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
 2021-10-14 21:00:14 -04:00
Anuken b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken 6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken ef399d349c # Conflicts: 
#	core/src/mindustry/content/Blocks.java
 2021-10-14 19:17:50 -04:00
Anuken 082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Anuken ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken b30eb26eb7 Merge remote-tracking branch 'origin/master' 2021-10-14 11:16:57 -04:00
Anuken b5f639f518 AGP 7.0.3 2021-10-14 11:16:53 -04:00
Anuken a2f40a5565 Fixed #6148 2021-10-13 19:35:04 -04:00
Anuken 1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00
Anuken f96700320e Removed PayloadLaunchPad 2021-10-13 13:58:47 -04:00
Anuken 4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken d2ec511ede Bundle things 2021-10-13 09:53:52 -04:00
Anuken 1a839bce86 Merge remote-tracking branch 'origin/master' 2021-10-13 08:51:54 -04:00
Anuken 2e747a481a Generator unit cell color tweaks 2021-10-13 08:51:48 -04:00
Anuken 9e01d1a69d Merge remote-tracking branch 'origin/master' 2021-10-12 18:25:43 -04:00
Anuken 5e8a3137c1 FX cast cleanup 2021-10-12 18:25:37 -04:00
AnukenandGitHub 5b9e11cc6c Revert "Update this bundle (#6081)" (#6143) 
This reverts commit 10b1ce2a3d.
 2021-10-12 15:18:56 -04:00
Anuken 90d589939a PR cleanup 2021-10-12 14:15:28 -04:00
Anuken da225d15c7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-10-12 14:14:56 -04:00
Anuken 44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Anuken 25c8623e30 router 2021-10-12 12:35:46 -04:00
Anuken d5f7fc842c Fixed #6140 2021-10-12 08:25:00 -04:00
Anuken da0fea5186 Merge remote-tracking branch 'origin/master' 2021-10-11 10:30:44 -04:00
Anuken 6abb458c27 Increased world stream chunk size 2021-10-11 10:30:40 -04:00
Anuken 9f070323c2 a 2021-10-10 14:11:12 -04:00