Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,526 Commits 4 Branches 180 Tags
87f6ff7be68526cf9c307e22aeb6808c06604dce
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub 87f6ff7be6 Update IOSLauncher.java 2019-09-09 00:01:48 -04:00
AnukenandGitHub fa56996e10 Update AndroidLauncher.java 2019-09-09 00:01:07 -04:00
Anuken b867cdb8b9 Map fix 2019-09-08 23:33:21 -04:00
Anuken 3bac32e04a Dialog fix 2019-09-08 23:30:15 -04:00
Anuken c4c0f45228 cleaning up what remains 2019-09-08 22:55:36 -04:00
Anuken d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken c9f0a59339 time for a crusade against dialogs 2019-09-08 15:08:55 -04:00
AnukenandGitHub ec58e868fd Update bundle.properties 2019-09-08 11:35:38 -04:00
Anuken 2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
Anuken 8653e7bbb1 Cleanup 2019-09-07 16:03:20 -04:00
Anuken 4fb7430fb7 More cleanup, removed connection IDs 2019-09-07 15:23:13 -04:00
Anuken e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken 06e6deae42 More cleanup 2019-09-07 12:10:26 -04:00
Anuken 38fe99f10e Android cleanup 2019-09-07 12:04:28 -04:00
Anuken 05ab62f038 merge 2019-09-06 22:51:35 -04:00
Anuken 168011586b More file chooser fixes 2019-09-06 22:09:54 -04:00
Anuken b5f1e566b2 New Android file chooser implementation 2019-09-06 21:21:30 -04:00
Anuken 9b6fb2f382 cleanup 2019-09-06 15:20:30 -04:00
Anuken 24bb2428e7 Bugfixes 2019-09-06 14:05:13 -04:00
Anuken 75ba33abc0 Compile fix 2019-09-06 14:02:42 -04:00
Anuken ff54629550 Merge 2019-09-06 13:58:32 -04:00
Anuken b492c7ae27 Bugfixes 2019-09-05 21:44:49 -04:00
Anuken 5d04f93a88 Merge remote-tracking branch 'origin/master' 2019-09-05 19:23:25 -04:00
Anuken 5651d1b023 Support for built-in servers 2019-09-05 19:23:17 -04:00
Anuken 3cbb02f9fb Merge remote-tracking branch 'origin/master' 2019-09-04 23:16:33 -04:00
Anuken 0f79298c28 Many various fixes 2019-09-04 23:16:26 -04:00
AnukenandGitHub 8f4bd09635 Update Blocks.java 2019-09-04 10:00:16 -04:00
Anuken 0a9cad2ea6 net fix 2019-09-03 22:59:10 -04:00
Anuken dc21adfda5 Better spawn animations 2019-09-03 22:55:46 -04:00
Anuken a7bfe18f4a Player limit / Server mode display / Crash fixes / More save info 2019-09-03 19:14:33 -04:00
Anuken 9cc76a148b Utility methods 2019-09-03 08:36:59 -04:00
Anuken 1d95a255bc Bugfixes 2019-09-03 08:21:23 -04:00
Anuken 3f8d412d1c Merge remote-tracking branch 'origin/master' 2019-09-02 21:07:45 -04:00
Anuken b2c35d45c3 merge 2 2019-09-02 21:07:40 -04:00
Anuken 35ab90e445 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/io/anuke/mindustry/core/NetServer.java
 2019-09-02 21:07:15 -04:00
Anuken 9bfb5216f9 Merge remote-tracking branch 'origin/master' 2019-09-02 20:59:44 -04:00
Anuken b10656294e Merge 2019-09-02 20:59:35 -04:00
Anuken 316f4d471f Fixed iOS crash 2019-09-02 20:58:15 -04:00
AnukenandGitHub e640042e5d Update build.gradle 2019-09-02 12:40:52 -04:00
AnukenandGitHub 2c0d2c5e22 Update NetServer.java 2019-09-02 12:37:25 -04:00
AnukenandGitHub 9eed39c2ae Update NetServer.java 2019-09-02 12:34:15 -04:00
Anuken e8d89b6c43 Bugfixes 2019-09-01 15:52:07 -04:00
Anuken 494c3ffbc4 💥 2019-09-01 13:34:20 -04:00
Anuken 40d27c787c Fixed drones not finding blocked ores 2019-09-01 13:21:20 -04:00
Anuken 2fe5b44698 Java 8+ plugin load fix 2019-09-01 11:01:04 -04:00
Anuken 5cc32b9001 Fixed map loading bugs 2019-09-01 10:46:44 -04:00
Anuken d481af43c7 Fixed "disconnected" bug / Updated menu music 2019-09-01 10:19:13 -04:00
Anuken 1cd43f938f Bugfixes 2019-09-01 00:45:54 -04:00
Anuken 528f5295c2 Slightly more informative D/C messages 2019-09-01 00:39:08 -04:00
Anuken aaedeea870 console 2019-08-31 20:08:48 -04:00
Anuken c684c32abe Merge branch 'master' of https://github.com/Anuken/Mindustry into steam 2019-08-31 17:04:23 -04:00
Anuken 34df9cca2c Fixed Java 8+ compatibility 2019-08-31 16:54:29 -04:00
Anuken c678b53d3f Merge remote-tracking branch 'origin/master' 2019-08-31 14:49:33 -04:00
Anuken ea30cc7d19 Renamed folder to use correct locale 2019-08-31 14:49:29 -04:00
Anuken a0016f001c Updated bundles 2019-08-31 13:08:06 -04:00
Anuken 89402fd097 removeCommand() 2019-08-31 13:00:34 -04:00
Anuken 5f361413bb /sync command 2019-08-31 10:14:26 -04:00
Anuken 3414026828 Crash fix 2019-08-31 09:50:05 -04:00
Anuken 7089fae0d5 Map fixes 2019-08-31 09:45:27 -04:00
Anuken 80bdf1e19c Bugfix 2019-08-31 08:47:53 -04:00
Anuken e0c1f2a31a Minor save fixes 2019-08-30 23:39:29 -04:00
Anuken 92cfa2b033 1x deconstruction speed 2019-08-30 22:16:18 -04:00
Anuken 877cd5968c Tweaks 2019-08-30 21:37:10 -04:00
Anuken b39464a7d1 Merged save previews 2019-08-30 20:13:03 -04:00
Anuken 52332e5821 Bugfixes 2019-08-30 20:11:48 -04:00
Anuken 7f2c7685b4 Lobby prefs 2019-08-30 19:49:36 -04:00
Anuken 7e80a60e65 More cleanup 2019-08-30 17:44:28 -04:00
Anuken 44544020ec Platform cleanup 2019-08-30 17:35:26 -04:00
Anuken 3b9d3fd233 Platform cleanup 2019-08-30 17:32:49 -04:00
Anuken 4e2d2ee378 Steam cleanup 2019-08-30 17:25:37 -04:00
Anuken 7aafa8b150 Merge 2019-08-30 16:39:40 -04:00
Anuken 6d9a59c60b More cleanup 2019-08-30 16:37:04 -04:00
Anuken 39e0977231 Entity cleanup 2019-08-30 16:00:09 -04:00
Anuken f8f140090f Fixed #623 2019-08-30 15:52:55 -04:00
Anuken f063f7b2d3 Minor tweaks 2019-08-30 15:17:05 -04:00
Anuken 60306f146f Campaign slot preview 2019-08-30 15:08:43 -04:00
Anuken 3b873b7cb2 Merge branches 'master' and 'save-preview' of https://github.com/Anuken/Mindustry into save-preview 2019-08-30 15:01:48 -04:00
Anuken 26d44ea030 Save slot previews 2019-08-30 15:01:38 -04:00
Anuken b369751a75 Bugfixes 2019-08-30 13:56:33 -04:00
Anuken 6e2cd81c9f Save previews 2019-08-30 13:53:19 -04:00
Anuken e953bd40eb PR build fix 2019-08-30 12:41:43 -04:00
Anuken 233ae99d3f Added teamchat 2019-08-29 23:22:47 -04:00
Anuken ddca5ef25a Data export/import 2019-08-29 22:04:01 -04:00
Anuken ae88f286a6 Merge remote-tracking branch 'origin/master' 2019-08-29 19:07:05 -04:00
Anuken 25af0c4302 Added bleeding edge info 2019-08-29 19:07:00 -04:00
Anuken 97d1c49a3c ... 2019-08-29 18:53:46 -04:00
Anuken e83dfd3d5a ... 2019-08-29 18:45:03 -04:00
Anuken 1142af853d ... 2019-08-29 18:37:27 -04:00
Anuken 4d502fe073 Updated travis.yml 2019-08-29 18:31:55 -04:00
Anuken b022333df1 sadness 2019-08-29 18:27:42 -04:00
Anuken 725b2188aa Updated travis.yml 2019-08-29 18:09:03 -04:00
Anuken 1f20d19aea Updated travis.yml 2019-08-29 18:04:39 -04:00
Anuken ec9f91519d Updated travis.yml 2019-08-29 17:23:50 -04:00
Anuken ae4e3e2d33 Updated travis.yml 2019-08-29 17:07:58 -04:00
Anuken b931493d2f Updated travis.yml 2019-08-29 17:04:05 -04:00
Anuken 7b0c07533b Updated travis.yml 2019-08-29 16:52:52 -04:00
AnukenandGitHub 33f0d64971 Update .travis.yml 2019-08-29 16:49:07 -04:00
AnukenandGitHub d10592a397 Testing builds 2019-08-29 10:01:01 -04:00
Anuken 641937f952 Automatic custom game saves 2019-08-29 08:53:41 -04:00
Anuken b5ed309405 Page fix 2019-08-28 22:44:19 -04:00