Commit Graph

3910 Commits

Author SHA1 Message Date
Anuken
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
2231062c19 Travis testing 2019-09-12 17:19:01 -04:00
Anuken
e6d05926dd Bugfix 2019-09-12 13:02:48 -04:00
east
cf1cc2ca49 Typo fix (#653)
Corrected "Prepating"
2019-09-12 10:41:22 -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
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
Anuken
5bed0f3bcc
Update LoadDialog.java 2019-09-09 00:03:55 -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
Anuken
ec58e868fd
Update bundle.properties 2019-09-08 11:35:38 -04:00
Ulysses2
aa5152ac70 Update Router.java (#643) 2019-09-08 09:31:49 -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
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
ff54629550 Merge 2019-09-06 13:58:32 -04:00
Anuken
b492c7ae27 Bugfixes 2019-09-05 21:44:49 -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
Anuken
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
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
316f4d471f Fixed iOS crash 2019-09-02 20:58:15 -04:00
J-VdS
ef0b56eb22 Extra events (#630)
* eventype player join

* playerjoin event

* player leave

* player leave event

* typo

* remove

* leave fix
2019-09-02 19:37:38 -04:00