Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,745 Commits 4 Branches 180 Tags
c8b12837a4e6cce000dc3dcab923ad031d4f11de
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken d79ec83817 Possible javelin fix 2019-09-25 20:04:24 -04:00
Anuken f19dfe9d70 Server shuffle fix 2019-09-25 16:54:43 -04:00
Anuken b47f40eb07 Full player reset 2019-09-25 16:49:11 -04:00
Anuken fd69241de9 Bugfixes 2019-09-25 16:44:55 -04:00
Anuken 47e723c557 Removed logging 2019-09-25 16:32:36 -04:00
Anuken 48bf88f99d More testing 2019-09-25 16:23:37 -04:00
Anuken 289ab44ed5 ? 2019-09-25 16:14:46 -04:00
Anuken 8ec465319b server debug 2019-09-25 16:10:00 -04:00
Anuken 53f66308d4 Merge remote-tracking branch 'origin/master' 2019-09-25 15:40:37 -04:00
Anuken 2658c1f52e Workshop fixes / Message block extension 2019-09-25 15:40:31 -04:00
Anuken 29bf181a08 Fixed #709 2019-09-25 13:55:31 -04:00
Anuken 4c244e836b Merge remote-tracking branch 'origin/master' 2019-09-25 13:51:36 -04:00
Anuken 5ac7fa5eca Bugfixes 2019-09-25 13:51:23 -04:00
AnukenandGitHub 49b9d1ec82 Update bug_report.md 2019-09-25 12:56:19 -04:00
Anuken 1462402519 More crash fixes 2019-09-25 12:24:30 -04:00
Anuken 5edf70103f Crash fix 2019-09-25 12:17:08 -04:00
Anuken 9ba11e2474 Bugfixes 2019-09-25 12:12:43 -04:00
Anuken a1da82a173 crashfix 2019-09-24 23:57:19 -04:00
Anuken f1456190b5 Buffer fix 2019-09-24 22:25:49 -04:00
Anuken 03bb94da23 Fixed pathfinding 2019-09-24 22:17:24 -04:00
Anuken 65dde8bc97 Merge remote-tracking branch 'origin/master' 2019-09-24 19:16:18 -04:00
Anuken 83dce4d8d2 Bugfixes 2019-09-24 19:16:12 -04:00
AnukenandGitHub 6680326392 Update TRANSLATING.md 2019-09-24 17:56:23 -04:00
AnukenandGitHub cc222034cb Update TRANSLATING.md 2019-09-24 17:56:12 -04:00
Anuken 5b0250ee74 Merge remote-tracking branch 'origin/master' 2019-09-24 17:50:16 -04:00
Anuken eb52f3b902 Added steam metadata 2019-09-24 17:49:49 -04:00
AnukenandGitHub 9add64ae8d Update feature_request.md 2019-09-24 17:35:50 -04:00
AnukenandGitHub 20c5aadefe Update feature_request.md 2019-09-24 17:35:38 -04:00
AnukenandGitHub 34896a805e Update bug_report.md 2019-09-24 17:35:10 -04:00
Anuken ecd73dcc2c Various bugfixes / Added new blocks to tech tree 2019-09-24 17:02:34 -04:00
Anuken b6e97c4261 Added armored conveyors 2019-09-22 15:12:15 -04:00
Anuken a2750c8aff Default linear filtering on desktop 2019-09-22 12:35:53 -04:00
Anuken 2c0372f680 Power graph capacity display 2019-09-22 11:38:13 -04:00
Anuken 2dceb8927c Votekick after being offline / Votekick button 2019-09-22 11:28:32 -04:00
Anuken e5cf2161d4 spaghetti eradicated 2019-09-22 01:37:50 -04:00
Anuken b2bae64215 extreme confusion 2019-09-22 00:01:48 -04:00
Anuken 552dc254da spgashfetiti 2019-09-21 23:41:56 -04:00
Anuken dc51afdc60 Fixed sprites 2019-09-21 20:24:07 -04:00
Anuken 3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png
 2019-09-21 18:59:49 -04:00
Anuken c45805e703 no 2019-09-21 17:51:44 -04:00
Anuken d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken 5955ecefd3 Bugfixes 2019-09-21 15:54:34 -04:00
Anuken 0d25d83651 Better Android keyboard support 2019-09-21 15:35:59 -04:00
Anuken 1957b6aa12 Removed unused rally point block 2019-09-21 13:06:09 -04:00
Anuken 4fa173f0f5 Don't auto-increment build version 2019-09-21 11:04:35 -04:00
Anuken fed3bcd79d Cleanup 2019-09-20 23:21:43 -04:00
Anuken dda1f18f67 Unit enemy spawnpoint camping 2019-09-20 23:09:11 -04:00
Anuken 025386af53 New pathfinding implementation on separate thread 2019-09-20 22:01:27 -04:00
Anuken bd1ea41c0d Merge remote-tracking branch 'origin/master' 2019-09-19 23:46:34 -04:00
Anuken 5d729c1e8d Bugfixes 2019-09-19 23:46:27 -04:00