Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,802 Commits 4 Branches 180 Tags
bdd74bfcc3a20a3630c8b4d9be32c8d1e89b840c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken c95fa25b60 Unlock bosses when defeated 2019-10-05 16:08:34 -04:00
Anuken 9e2ad3c642 Merge branches 'master' and 'zone-objectives' of https://github.com/Anuken/Mindustry 2019-10-05 16:06:57 -04:00
Anuken a51216d7a6 Test fix 2019-10-05 16:06:36 -04:00
Anuken a24321ae56 Mod cleanup 2019-10-05 16:05:54 -04:00
Anuken 4b99f7c819 Cleanup, bugfixes 2019-10-05 15:51:29 -04:00
Anuken ae6925ccce Stop sounds on state change 2019-10-05 10:57:58 -04:00
Anuken e5c7d5dd2f Config banned blocks 2019-10-05 01:16:03 -04:00
Anuken c1ff7812d8 Zone objective abstraction, cleanup 2019-10-05 00:21:48 -04:00
Anuken 1b93da20f4 Workshop map listing button 2019-10-04 19:43:26 -04:00
Anuken edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
Anuken df3f23731b Workshop mod loading 2019-10-04 15:06:29 -04:00
Anuken f7b6cea21b Fast color calculation 2019-10-03 22:32:25 -04:00
Anuken 8f0eefa97e Bug report link, proper minimap colors 2019-10-03 22:26:13 -04:00
Anuken bc02d178ce Support for zones 2019-10-03 18:53:43 -04:00
Anuken 35ede418eb Merge remote-tracking branch 'origin/master' 2019-10-03 12:51:32 -04:00
Anuken 46f118db13 Added link to modding guide 2019-10-03 12:51:25 -04:00
Anuken 92d7efeea2 Support for modded floors 2019-10-03 08:59:53 -04:00
Anuken cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken 3369de6bf7 Merge remote-tracking branch 'origin/master' 2019-10-02 23:09:51 -04:00
Anuken 532926a9e3 Mod reloading that works for some ridiculous reason? 2019-10-02 23:09:35 -04:00
Anuken 89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -04:00
Anuken ffd4297b17 Mod corruption load warnings 2019-10-02 21:23:29 -04:00
Anuken ec29bd3682 Custom sounds, mod sound loading 2019-10-02 21:03:56 -04:00
Anuken 76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
Anuken e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
AnukenandGitHub 7dfe2116fe Update Logic.java 2019-10-02 09:57:17 -04:00
AnukenandGitHub 525360f284 Update Control.java 2019-10-02 09:56:31 -04:00
Anuken 2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00
Anuken d9b8335e0e Block tech tree mods 2019-10-01 21:47:02 -04:00
Anuken 5b8c237a1e Modding improvements 2019-10-01 21:33:51 -04:00
Anuken 8ccdba5be2 Disabled Player-Player and Player-Drone collisions 2019-10-01 20:28:40 -04:00
Anuken cb929a7239 Merge remote-tracking branch 'origin/master' 2019-10-01 17:35:30 -04:00
Anuken 251b8deb25 Fixed steam crash with a workaround 2019-10-01 17:35:23 -04:00
Anuken 9145ade617 Changed host confirmation text 2019-10-01 12:40:43 -04:00
Anuken 4b83569b43 Switched consumers over to dynamic Bits 2019-10-01 12:15:50 -04:00
Anuken 4bc37ab065 Some minor queued block fixes 2019-09-30 22:12:02 -04:00
Anuken c9e969c7b4 Editor scroll fix 2019-09-30 21:45:25 -04:00
Anuken 65290dc2bf Merge branches 'config-int' and 'master' of https://github.com/Anuken/Mindustry 2019-09-30 21:35:07 -04:00
Anuken 8c3f8f9b01 Fixed connection glitch 2019-09-30 21:34:50 -04:00
Anuken 985918b870 Fixed power node config 2019-09-30 21:08:56 -04:00
Anuken 62ad78ace9 Saving of broken blocks 2019-09-30 20:48:02 -04:00
Anuken af37c58bc1 Merge remote-tracking branch 'origin/master' 2019-09-30 20:21:43 -04:00
Anuken 5eba4a360d Fixed Steam offline crash 2019-09-30 20:21:37 -04:00
Anuken 7bfdbaabe7 Int configuration / Drone rebuilding 2019-09-30 19:40:08 -04:00
Anuken 3b5dd7567a Allow mods to add maps 2019-09-30 17:24:51 -04:00
Anuken 94733515e4 Reduced spirit factory to 1 drone, 2x power 2019-09-30 17:12:08 -04:00
AnukenandGitHub d64872d9ae Fixed wiki link 2019-09-30 12:28:56 -04:00
AnukenandGitHub a2474e71cc Zone mod parsing 2019-09-30 12:18:43 -04:00
AnukenandGitHub c361f692df Update Zone.java 2019-09-30 12:11:23 -04:00
AnukenandGitHub 758670eb51 Update InputHandler.java 2019-09-30 10:57:48 -04:00
AnukenandGitHub c8b12837a4 Update MenuFragment.java 2019-09-30 10:25:49 -04:00
AnukenandGitHub f7f854f0d3 Update MenuFragment.java 2019-09-30 10:17:08 -04:00
AnukenandGitHub 8c27108b0a Update CrashSender.java 2019-09-30 10:15:27 -04:00
Anuken 7cd220fe8c Display more launch info / Store mod list in saves 2019-09-29 23:40:23 -04:00
Anuken 7fccd18910 Server mod checking 2019-09-29 22:59:23 -04:00
Anuken 73e9f55e55 More tutorial info 2019-09-29 21:51:45 -04:00
Anuken 002a052371 Fixed #748 / Better mod loading 2019-09-29 21:41:32 -04:00
Anuken 0049a0004e Block rotation / Mod loading improvements 2019-09-29 19:54:52 -04:00
Anuken b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties
 2019-09-29 17:03:28 -04:00
Anuken 429bb6ac13 plugins -> mods 2019-09-29 16:52:17 -04:00
Anuken f1b0ba039c plugins -> mods 2019-09-29 16:26:13 -04:00
Anuken 33416aadef Parsing fixes / Moved annotations to Arc 2019-09-29 16:09:43 -04:00
Anuken f17e46015a JSON block, item loading 2019-09-29 15:21:50 -04:00
Anuken 63744c0a3a 'belts' 2019-09-29 12:39:59 -04:00
Anuken 9c175ac893 Type parsing work 2019-09-29 12:36:01 -04:00
Anuken c6bc398950 Texture packing 2019-09-29 11:26:25 -04:00
Anuken 4210070d07 Fixed server map shuffling 2019-09-29 10:06:17 -04:00
Anuken c05fb7ebf1 oh no 2019-09-29 10:05:54 -04:00
Anuken d35fbb8383 bugfixes 2019-09-29 08:59:53 -04:00
Anuken fe3f75f141 Starting work on json content parsing 2019-09-28 23:58:30 -04:00
Anuken 79554bf8e9 Mod import/export dialog, restarting 2019-09-28 23:26:55 -04:00
Anuken 4f9ed73a59 Added mod file tree, bundle loading 2019-09-28 21:13:44 -04:00
Anuken 2019196f65 Sort Steam server lists, ignore version when unimportant 2019-09-28 18:01:55 -04:00
Anuken a815763833 Upped lower FPS cap to 15 2019-09-28 16:40:12 -04:00
Anuken 92a3f150bb Thruster fix / Removed info on Steam to prevent confusion 2019-09-28 15:40:31 -04:00
Anuken 000b23d703 Workshop crash fix / Mine balancing 2019-09-28 15:14:29 -04:00
Anuken 438b3d9752 Workshop map updates, removal detection 2019-09-28 13:13:23 -04:00
Anuken a9edee1550 Made wave events fire on clients 2019-09-28 11:32:34 -04:00
Anuken b63de8b7d6 iOS cleanup 2019-09-28 11:03:15 -04:00
Anuken 5e0e3f4522 iOS map imports 2019-09-28 10:47:40 -04:00
Anuken a74722aea5 Bugfixes 2019-09-28 10:34:50 -04:00
Anuken 4e55cbbfe8 Merge remote-tracking branch 'origin/master' 2019-09-28 10:14:48 -04:00
Anuken 5f8b9f301a Added summary.txt 2019-09-28 10:14:27 -04:00
Anuken b3666ed2a8 More mod setup 2019-09-27 22:20:16 -04:00
Anuken 8609400d76 Ask players if they want to make games public 2019-09-27 20:39:30 -04:00
Anuken 0b0aa36aab More diagnostic info + crash fix 2019-09-27 20:23:02 -04:00
Anuken 70ab102d8c Mods branch 2019-09-27 19:51:46 -04:00
Anuken f925ec8cbe Basic kill tracking 2019-09-27 16:04:34 -04:00
Anuken 53d4f44178 Crash fixes 2019-09-26 19:51:41 -04:00
Anuken f3ab8f34ed Steam bugfixes 2019-09-26 19:18:10 -04:00
Anuken ecff04424d Merge remote-tracking branch 'origin/master' 2019-09-26 19:06:52 -04:00
Anuken b02a563519 Steam crash fix (?) 2019-09-26 19:06:42 -04:00
Anuken 6a29fb2bf9 why 2019-09-26 16:10:25 -04:00
Anuken 7b3d65feca Triggering Arc update 2019-09-26 16:09:20 -04:00
Anuken 9230be87d4 Fixed #680 2019-09-26 16:03:12 -04:00
Anuken 3f87d64e54 Merge remote-tracking branch 'origin/master' 2019-09-26 15:41:48 -04:00
Anuken 10ddb5f361 Bugfixes / Bundles updated 2019-09-26 15:41:42 -04:00
Anuken e15b6e7cff Cleanup / Halved drone production, increased mining speed 2019-09-25 21:59:15 -04:00
Anuken 85dc6385cd Fixed normal mech movement 2019-09-25 20:40:09 -04:00
Anuken 94d245246c Actual speed fix 2019-09-25 20:29:26 -04:00