Commit Graph

251 Commits

Author SHA1 Message Date
976d0f54b3 Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
# Conflicts:
#	core/src/io/anuke/mindustry/mod/Mods.java
2019-12-15 13:55:30 -05:00
9d3dda035c Compile fixes 2019-12-14 12:53:37 -05:00
c1cf3183ac Fixed some Android-related script issues 2019-12-14 11:04:22 -05:00
252d0f6aa1 aaaaa 2019-12-14 10:51:36 -05:00
f4ee67c08b Fixed gradle complaining about absolutely nothing 2019-12-10 10:45:07 -05:00
da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
2a03ef0c43 More cleanup 2019-12-09 16:59:43 -05:00
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
9461d7a360 Hjson unit tests 2019-11-19 19:08:41 -05:00
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
34db321577 Disabled 'import github' button on Android because Android is garbage and can't even do something as simple as an HTTP request without 5 workaround for different versions 2019-10-27 10:51:35 -04:00
b7e788d529 Fixed #877 / Fixed #871 / Other fixes 2019-10-25 12:58:07 -04:00
eb1d3c27c5 Mods + crash message for iOS/Android 2019-10-21 00:02:36 -04:00
4fa173f0f5 Don't auto-increment build version 2019-09-21 11:04:35 -04:00
5a0669d437 SAF is terrible 2019-09-18 19:24:49 -04:00
1e667946b3 Bugfixes 2019-09-18 12:46:11 -04:00
d49b15b2a0 Fixed some things 2019-09-16 08:24:10 -04:00
82493c596d Merge remote-tracking branch 'origin/master' 2019-09-09 16:22:40 -04:00
5a3fbf33df Made all color names lowercase for consistent style 2019-09-09 16:22:29 -04:00
fa56996e10 Update AndroidLauncher.java 2019-09-09 00:01:07 -04:00
b867cdb8b9 Map fix 2019-09-08 23:33:21 -04:00
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
06e6deae42 More cleanup 2019-09-07 12:10:26 -04:00
38fe99f10e Android cleanup 2019-09-07 12:04:28 -04:00
168011586b More file chooser fixes 2019-09-06 22:09:54 -04:00
b5f1e566b2 New Android file chooser implementation 2019-09-06 21:21:30 -04:00
3b9d3fd233 Platform cleanup 2019-08-30 17:32:49 -04:00
d5916f3bc3 hmmm 2019-08-28 16:18:53 -04:00
3ce870fb19 Building fix 2019-08-28 16:17:04 -04:00
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
a3d8586199 Improvements to version scripts 2019-08-25 22:02:00 -04:00
fd973038bb mnet was a mistake 2019-08-24 18:29:21 -04:00
1880c32f90 Experimental MNet-2 backend 2019-08-22 22:49:22 -04:00
a33fd45136 bugfixes 2019-08-22 21:51:56 -04:00
4bb6a25055 Added deployment scripts 2019-08-21 14:46:36 -04:00
17b17979ab Release preparations 2019-08-16 11:00:15 -04:00
974ab59fd2 Classic data backup dialog 2019-08-13 15:14:03 -04:00
d0ff0307f5 New icon 2019-08-12 13:29:02 -04:00
c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
5c6bcbf9cd Renamed layout/Unit to UnitScl to prevent name conflicts 2019-08-06 11:04:58 -04:00
697894274f Fixed editor restoring incorrect orientation 2019-07-30 01:02:08 -04:00
bb398a2f1e Crash fixes 2019-07-02 18:52:04 -04:00
0aee75c1c1 Splitting of building+mining into separate traits 2019-06-12 14:03:50 -04:00
940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00
bd134bf9c9 Cleanup 2019-05-28 09:24:13 -04:00
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00