Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,576 Commits 4 Branches 180 Tags
af91e17b1337cb88fa6d73cfe519e79ea8326c8f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken af91e17b13 2 2019-09-15 13:13:21 -04:00
Anuken 69bfd8f54d Static steam names 2019-09-15 13:03:29 -04:00
Anuken 369c3b569c Bugfixes, game startup connection 2019-09-15 12:44:30 -04:00
Anuken 8480e656b9 More steam stuff 2019-09-15 10:38:36 -04:00
Anuken fb29324905 Steam stuff 2019-09-15 09:27:31 -04:00
Anuken ed88633712 More bugfixes 2019-09-14 21:36:32 -04:00
Anuken cd456f80a4 Bugfixes 2019-09-14 20:57:10 -04:00
Anuken 6d61515e28 Compile fix 2019-09-14 20:30:26 -04:00
Anuken 38af936e3f Bugfix 2019-09-14 19:14:22 -04:00
Anuken d59f5ddc59 Achievement work, cleanup 2019-09-14 19:01:27 -04:00
Anuken 6c07c5006a Added client implementation for 50 achievemenets 2019-09-13 22:02:13 -04:00
Anuken d4d060a500 'then' 2019-09-13 14:01:31 -04:00
Anuken 55e43761e9 Auto-tag Arc commits at release time 2019-09-13 13:53:15 -04:00
Anuken b1edaa1408 Testing arc hash script 4 2019-09-13 13:12:34 -04:00
Anuken d8d9762998 Testing arc hash script 3 2019-09-13 13:08:21 -04:00
Anuken dd93284062 Merge remote-tracking branch 'origin/master' 2019-09-13 13:04:20 -04:00
Anuken 19c76fc741 Testing arc hash script 2019-09-13 13:03:02 -04:00
AnukenandGitHub 1013455b0f Update ItemBridge.java 2019-09-13 08:56:53 -04:00
Anuken 066e4380e1 Crash fix 2019-09-13 08:17:47 -04:00
Anuken 55da9df2a1 Fixed #655 2019-09-13 08:13:40 -04:00
Anuken 4b26c57a20 Added direct core-vault chaining 2019-09-12 21:14:09 -04:00
Anuken d0491dd68a 8 2019-09-12 19:00:31 -04:00
Anuken cd8cc34c31 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.travis.yml
 2019-09-12 18:56:30 -04:00
Anuken 0249ebf718 7 2019-09-12 18:56:03 -04:00
AnukenandGitHub 7fb4eeb998 Update .travis.yml 2019-09-12 18:29:10 -04:00
Anuken 0cd7313523 5 2019-09-12 17:48:41 -04:00
Anuken 5c3fc2a6ba 4 2019-09-12 17:45:53 -04:00
Anuken 19f888061f 3 2019-09-12 17:39:45 -04:00
Anuken 4e8a02be7d 2 2019-09-12 17:33:15 -04:00
Anuken 2231062c19 Travis testing 2019-09-12 17:19:01 -04:00
Anuken fb4faa15bb Merge remote-tracking branch 'origin/master' 2019-09-12 13:03:49 -04:00
Anuken e6d05926dd Bugfix 2019-09-12 13:02:48 -04:00
AnukenandGitHub ca9f18325c Fixed #583 2019-09-12 12:40:52 -04:00
Anuken bd96ae5a48 Nestable array iterators + unit tests 2019-09-12 12:17:28 -04:00
Anuken bbaaa91575 Fixed black styles on game reload (Android) 2019-09-12 09:06:25 -04:00
Anuken 41b21c81a0 Fixed mass driver deadlock 2019-09-12 08:42:19 -04:00
Anuken 44842d3221 Deploy animation 2019-09-11 16:54:18 -04:00
Anuken d9c7665aca Events 2019-09-11 12:37:58 -04:00
Anuken 565b79d1b2 Events, triggers 2019-09-10 22:50:00 -04:00
Anuken f30dc7dcd9 Cleanup 2019-09-10 21:20:28 -04:00
Anuken e4cdf515c9 More workshop implementation 2019-09-10 20:53:31 -04:00
Anuken ad3463cbc4 Merge remote-tracking branch 'origin/master' 2019-09-10 15:05:06 -04:00
Anuken db733bced6 Stats 2019-09-10 15:05:02 -04:00
Anuken 7aa71a7201 Steam workshop publishing 2019-09-10 14:25:34 -04:00
Anuken 6fe55661ed Bugfixes / Fixed #639 2019-09-09 19:06:11 -04:00
Anuken af89efcfc4 Update links to match Steam policy 2019-09-09 17:05:36 -04:00
Anuken 82493c596d Merge remote-tracking branch 'origin/master' 2019-09-09 16:22:40 -04:00
Anuken 5a3fbf33df Made all color names lowercase for consistent style 2019-09-09 16:22:29 -04:00
AnukenandGitHub 5bed0f3bcc Update LoadDialog.java 2019-09-09 00:03:55 -04:00
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