Commit Graph

4603 Commits

Author SHA1 Message Date
Anuken
d0d72101ab Fixed game6.ogg ending abruptly 2019-08-23 18:05:06 -04:00
Anuken
7b41d65fa6 Fixed issues with multithreaded serializer access 2019-08-23 16:13:46 -04:00
Anuken
5f9000db92 MNet cleanup 2019-08-23 15:04:31 -04:00
Anuken
de031b1ddb Merge branches 'master' and 'mnet' of https://github.com/Anuken/Mindustry 2019-08-23 14:29:53 -04:00
Anuken
58f46bb75f Merge remote-tracking branch 'origin/master' 2019-08-23 14:17:01 -04:00
Anuken
d1e07ec0a2 Fixed OpenAL not loading correctly 2019-08-23 17:17:45 -06:00
Anuken
0d4716f3b4 Fallback shield shader 2019-08-23 14:16:51 -04:00
Anuken
9ddfd650dd . 2019-08-23 14:16:25 -04:00
Anuken
cf9cda4936 Merge branch 'master' of https://github.com/Anuken/Mindustry into steam 2019-08-23 14:05:46 -04:00
Anuken
1880c32f90 Experimental MNet-2 backend 2019-08-22 22:49:22 -04:00
Anuken
6d72c08d63 ignore some files 2019-08-22 21:52:51 -04:00
Anuken
95ac1b2c21 Merge remote-tracking branch 'origin/master' 2019-08-22 21:52:06 -04:00
Anuken
a33fd45136 bugfixes 2019-08-22 21:51:56 -04:00
Anuken
4e43d2a96b . 2019-08-22 21:09:33 -04:00
Anuken
d68c8fe72c Merge remote-tracking branch 'origin/steam' into steam
# Conflicts:
#	desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
2019-08-22 21:08:58 -04:00
Anuken
c9d0619289 . 2019-08-22 21:08:44 -04:00
Anuken
8ea33946c4 proper discovery 2019-08-22 21:08:01 -04:00
Anuken
bef7394004 Merge remote-tracking branch 'origin/steam' into steam
# Conflicts:
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
2019-08-22 20:50:43 -04:00
Anuken
4042bf042e . 2019-08-22 20:50:16 -04:00
Anuken
643b698c30 discovery 2019-08-22 20:49:27 -04:00
Anuken
aba3e3985a . 2019-08-22 19:53:44 -04:00
Anuken
91f679f762 disconnection 2019-08-22 19:49:29 -04:00
Anuken
3eeed507cc Merge remote-tracking branch 'origin/steam' into steam 2019-08-22 17:38:04 -04:00
Anuken
988e1d6e30 . 2019-08-22 17:38:00 -04:00
Anuken
04b4aabcf6 . 2019-08-22 17:37:16 -04:00
Anuken
d97fe47206 . 2019-08-22 17:16:13 -04:00
Anuken
0d8748a6ce autoclip 2019-08-22 17:02:41 -04:00
Anuken
b360a39fcf debug 2019-08-22 16:59:39 -04:00
Anuken
70b071fa26 fixes 2019-08-22 16:51:26 -04:00
Anuken
64badb2cb7 Cleanup 2019-08-22 16:44:32 -04:00
Anuken
3da6634242 things 2019-08-22 16:19:29 -04:00
Anuken
4b8d072854 testing 2019-08-22 16:13:39 -04:00
Anuken
a1ea393f35 Update MirrorFilter.java 2019-08-22 15:45:14 -04:00
Anuken
32abd991e7 steam debugging 2019-08-22 09:27:59 -04:00
Anuken
3294f800be Steam things 2019-08-21 21:20:44 -04:00
Anuken
74e3dc2d7d ? 2019-08-21 20:12:00 -04:00
Anuken
a7a49a823b Merge 2019-08-21 20:10:54 -04:00
Anuken
14c943adfe fix of uninteresting variety 2019-08-21 19:04:26 -04:00
Anuken
fb84b4b7c1 Added fastlane integration 2019-08-21 18:46:46 -04:00
Anuken
4089ee424c Removed pointless platform-specific dists 2019-08-21 15:50:58 -04:00
Anuken
9bf010e222 Removed lwjgl3 desktop module, sdl promoted to main module 2019-08-21 15:41:38 -04:00
Anuken
0553fb6b79 Finalized build scripts 2019-08-21 15:34:01 -04:00
Anuken
4bb6a25055 Added deployment scripts 2019-08-21 14:46:36 -04:00
Anuken
66ff7b1592 Fixed minimization v89 2019-08-20 20:47:28 -04:00
Anuken
be32810608 on second thought, no 2019-08-20 19:57:42 -04:00
Anuken
88f48599a0 Names updated 2019-08-20 19:52:08 -04:00
Anuken
014e2ac8b8 Bugfixes 2019-08-20 19:42:39 -04:00
Anuken
bae88ec416 iPhone X splash images 2019-08-20 19:14:30 -04:00
Anuken
46230ad307 nothing 2019-08-20 18:31:56 -04:00
Anuken
963a207194 New power node link system 2019-08-20 10:52:06 -04:00