Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,890 Commits 4 Branches 180 Tags
e45df98f263f4e7ff2d9b6794f1cdea9efd948e7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
 2020-01-10 15:19:07 -05:00
Anuken 677aa0d0bf Shortening of a few classes 2020-01-10 15:13:34 -05:00
Anuken 6cf7651069 Merge remote-tracking branch 'origin/master' 2020-01-10 11:39:48 -05:00
Anuken 18e73b1a4a Fixed mech pad indicators displaying onscreen 2020-01-10 11:39:38 -05:00
Anuken 5675565c96 Merge remote-tracking branch 'origin/master' 2020-01-09 14:56:26 -05:00
Anuken 6050274c0f Bugfixes 2020-01-09 14:56:21 -05:00
AnukenandGitHub 75f8a495e7 Update feature_request.md 2020-01-09 14:35:33 -05:00
AnukenandGitHub 5d6b8acf4c Update feature_request.md 2020-01-09 14:35:09 -05:00
Anuken 65ee2d2b9e Merge remote-tracking branch 'origin/master' 2020-01-09 12:07:41 -05:00
Anuken e06f514023 Added basic subnet bans 2020-01-09 12:03:45 -05:00
Anuken 2345b48e97 Merge remote-tracking branch 'origin/master' 2020-01-08 23:35:27 -05:00
Anuken 50355b45d5 Tech tree balance 2020-01-08 23:28:25 -05:00
Anuken a7cddf97b8 Implemented bridge opacity from #1006 2020-01-08 16:16:19 -05:00
Anuken 7b4ee27fe4 Bugfixes 2020-01-08 11:37:12 -05:00
Anuken 8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken 1193e18ee1 Updated bundles post-merge 2020-01-08 11:01:12 -05:00
Anuken c04c825cec Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
 2020-01-08 11:00:19 -05:00
Anuken 5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
Anuken 6e5d506a35 Stub implementation of action filters 2020-01-08 09:37:18 -05:00
Anuken f8f3ecd451 Merge remote-tracking branch 'origin/master' 2020-01-07 20:15:09 -05:00
Anuken f4a819ba28 Fixed text wrapping for credits in Russian 2020-01-07 20:14:11 -05:00
Anuken cf5e8c6463 Point planet renderer 2020-01-07 20:09:21 -05:00
Anuken c183b2dac4 Fixed incorrect variable usage 2020-01-07 15:54:51 -05:00
Anuken 1f3bab5fa3 Added untested rate limits 2020-01-07 14:16:48 -05:00
Anuken 6f25ba4541 squares. 2020-01-07 13:55:45 -05:00
Anuken c611ce9d58 Removed old Matrix4 class 2020-01-07 11:16:04 -05:00
Anuken 3e0556de05 Merge remote-tracking branch 'origin/master' 2020-01-07 10:32:39 -05:00
Anuken 7a71468388 Updated arc hash just in case 2020-01-07 10:32:34 -05:00
Anuken c8980163e9 3D progress 2020-01-07 10:32:00 -05:00
Anuken 81602dc3d5 Cleanup 2020-01-07 00:25:33 -05:00
Anuken c474b082cd Cleanup 2020-01-07 00:24:37 -05:00
Anuken b730cd52d5 GL cleanup 2020-01-06 23:47:29 -05:00
Anuken 3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Anuken 7f23803db1 Visual changes 2020-01-06 16:25:08 -05:00
Anuken 854e69322b Merge remote-tracking branch 'origin/master' 2020-01-06 08:38:13 -05:00
Anuken 03286b29e8 Changed Cyrillic font 2020-01-06 08:37:19 -05:00
Anuken 71da1f1135 Added mod listing data class 2020-01-05 00:08:48 -05:00
Anuken 6c83c111cd Merge remote-tracking branch 'origin/master' 2020-01-04 15:28:19 -05:00
Anuken 8af3b877b5 Fixed #1320 2020-01-04 15:12:29 -05:00
Anuken ea66d9a92f Merge remote-tracking branch 'origin/master' 2020-01-04 12:10:21 -05:00
Anuken 197769a9fe Fixed #1319 2020-01-04 12:10:03 -05:00
Anuken 7fa61eaf3b Added server MOTD 2020-01-02 22:09:33 -05:00
Anuken 5f3c10e397 arc 2020-01-02 14:33:21 -05:00
Anuken e214a8e7c0 Merge remote-tracking branch 'origin/master' 2020-01-02 14:10:22 -05:00
Anuken cb76e80836 Bugfixes 2020-01-02 14:08:41 -05:00
AnukenandGitHub 70e6e52eba Update README.md 2020-01-02 14:04:12 -05:00
Anuken af9be8584e Merge remote-tracking branch 'origin/master' 2020-01-01 12:16:29 -05:00
Anuken ddb0d7eff2 Fixed #1304 2020-01-01 12:16:23 -05:00
AnukenandGitHub fdee9c7b50 Update README.md 2020-01-01 10:45:02 -05:00
Anuken 7a29877a2d Bugfixes 2019-12-31 19:19:04 -05:00
Anuken 42e0238bb9 Merge remote-tracking branch 'origin/master' 2019-12-31 10:30:04 -05:00
Anuken a78c0defc7 Fixed #1289 2019-12-31 10:29:18 -05:00
Anuken e7d813ab5b Votekick config 2019-12-30 13:03:29 -05:00
Anuken 1de294cae5 Bugfixes 2019-12-30 13:00:28 -05:00
Anuken 51bd74fcc1 Build time increase of basic blocks 2019-12-30 12:55:35 -05:00
Anuken f2e1d17ce9 Made junction harder to spam 2019-12-30 12:49:27 -05:00
Anuken 44ef5148b4 Reduced drone lag 2019-12-30 12:47:40 -05:00
Anuken 73461e0364 Added config for showing connect/disconnect messages 2019-12-30 11:36:50 -05:00
Anuken 905d7abadb Bugfixes 2019-12-29 23:49:09 -05:00
Anuken 6f61665390 Fixed some block indexing 2019-12-29 21:51:44 -05:00
Anuken 66d19ec6b7 Merge remote-tracking branch 'origin/master' 2019-12-29 21:46:03 -05:00
Anuken ee4f06a9c2 Bugfixes 2019-12-29 21:45:59 -05:00
AnukenandGitHub bcd5b811bb a brief experiment 2019-12-29 21:05:02 -05:00
Anuken 689b0b8c61 Fixed games never ending 2019-12-29 20:04:08 -05:00
Anuken 1ce9b54e10 Merge remote-tracking branch 'origin/master' 2019-12-29 18:59:17 -05:00
Anuken 39db62e3a5 Minimap tweaks 2019-12-29 18:56:29 -05:00
Anuken b952ee0725 Tweaks 2019-12-29 18:01:10 -05:00
Anuken 670f085f78 New, improved minimap / Bugfixes 2019-12-29 17:56:10 -05:00
Anuken 811c22b84e Added camera movement while paused 2019-12-29 15:40:56 -05:00
Anuken 6edcbb9120 Bugfixes 2019-12-29 14:38:03 -05:00
Anuken 566052cabf Fixed #1272 2019-12-29 12:24:51 -05:00
Anuken 730d30ef98 Added core schematic selection setting 2019-12-29 11:40:52 -05:00
Anuken e04c592f9e Bugfixes 2019-12-29 00:40:25 -05:00
Anuken 77b89d45d6 Cleanup / Desktop dead camera panning 2019-12-29 00:09:46 -05:00
Anuken df4a0dd5e4 Added openServer method 2019-12-28 22:18:16 -05:00
Anuken 8c941c7165 Added update trigger / Server moddability tweaks 2019-12-28 21:34:20 -05:00
Anuken b01d56aae8 Bugfixes 2019-12-28 18:22:20 -05:00
Anuken 497ae740aa Removed pointless "> " 2019-12-28 18:12:34 -05:00
Anuken 7543d92473 Added startup commands to server 2019-12-28 18:05:45 -05:00
Anuken 60d83751e8 Fixed server port not being parsed 2019-12-28 17:55:00 -05:00
Anuken e0f59404c1 Added BE server 2019-12-28 17:49:49 -05:00
Anuken d3c559fa00 Moved server run scripts 2019-12-28 17:33:17 -05:00
Anuken 179bf4d525 Added BE-specific server list 2019-12-28 16:34:35 -05:00
Anuken 16ddb91466 Merge remote-tracking branch 'origin/master' 2019-12-28 16:30:46 -05:00
Anuken e1bf8bdab1 Added BE auto-updater / Server config / Fixed #1266 2019-12-28 16:30:40 -05:00
Anuken c0c0ffa682 Bugfixes 2019-12-27 01:22:50 -05:00
Anuken 98f8a1732e Renamed Calls -> Call 2019-12-26 23:00:26 -05:00
Anuken d6d6dc29dc More plugin customization / Renamed Rectangle 2019-12-26 22:44:15 -05:00
Anuken 6080a7e4bc Possibly fixed tests / Added support for mod icons 2019-12-26 20:53:53 -05:00
Anuken c339a0ecdf Merge 2019-12-26 20:44:05 -05:00
Anuken 684f3075cb Team#toString() 2019-12-26 20:20:12 -05:00
Anuken 954e26fc14 Method cleanup 2019-12-26 20:08:53 -05:00
Anuken c449302d28 Fixed tests 2019-12-26 19:57:24 -05:00
Anuken d8629100db Functionality fixes 2019-12-26 19:48:45 -05:00
Anuken 4858e602ed Fixed compilation 2019-12-26 19:40:54 -05:00
Anuken de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken 36ec88e2e2 Team cleanup 2019-12-26 14:20:36 -05:00
Anuken a5978b6163 Updated Arc 2019-12-26 08:08:16 -05:00
Anuken 1d6f769e3d Debug fixes 2019-12-26 08:01:24 -05:00
Anuken 2b22b7e7e4 Condensed unit group array 2019-12-25 22:26:51 -05:00