mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-06 08:18:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/steam' into steam

Browse Source 
# Conflicts:
#	desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
This commit is contained in:
Anuken
2019-08-22 21:08:58 -04:00
parent c9d0619289 8ea33946c4
commit d68c8fe72c
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@ -27,7 +27,7 @@ import static io.anuke.mindustry.Vars.*;
public class DesktopPlatform extends Platform{
static boolean useDiscord = OS.is64Bit, useSteam = true, showConsole = false;
static boolean useDiscord = OS.is64Bit, useSteam = true, showConsole = true;
final static String applicationId = "610508934456934412";
String[] args;

2
desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
View File

@ -142,6 +142,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
@Override
public void discover(Consumer<Host> callback, Runnable done){
smat.addRequestLobbyListResultCountFilter(32);
smat.requestLobbyList();
lobbyCallback = callback;
lobbyDoneCallback = done;
@ -275,6 +276,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
@Override
public void onLobbyMatchList(int matches){
Log.info("found {0} matches", matches);
if(lobbyDoneCallback != null){
for(int i = 0; i < matches; i++){