PvP merge

core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java

@@ -1,12 +1,14 @@
 package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.Sector;
 import io.anuke.ucore.util.Bundles;
 
 import static io.anuke.mindustry.Vars.*;
 
 public class RestartDialog extends FloatingDialog{
+    private Team winner;
 
     public RestartDialog(){
         super("$text.gameover");
@@ -14,13 +16,25 @@ public class RestartDialog extends FloatingDialog{
         shown(this::rebuild);
     }
 
+    public void show(Team winner){
+        this.winner = winner;
+        show();
+    }
+
     void rebuild(){
         buttons().clear();
         content().clear();
 
         buttons().margin(10);
 
-        if(world.getSector() == null){
+        if(state.mode.isPvp){
+            content().add(Bundles.format("text.gameover.pvp",winner.localized())).pad(6);
+            buttons().addButton("$text.menu", () -> {
+                hide();
+                state.set(State.menu);
+                logic.reset();
+            }).size(130f, 60f);
+        }else if(world.getSector() == null){
             if(control.isHighScore()){
                 content().add("$text.highscore").pad(6);
                 content().row();

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -145,6 +145,11 @@ public class HudFragment extends Fragment{
             t.table("clear", top -> top.add("[orange]< " + Bundles.get("text.paused") + " >").pad(6).get().setFontScale(fontScale * 1.5f));
         });
 
+        parent.fill(t -> {
+            t.visible(() -> netServer.isWaitingForPlayers() && !state.is(State.menu));
+            t.table("clear", c -> c.margin(10).add("$text.waiting.players"));
+        });
+
         //'core is under attack' table
         parent.fill(t -> {
             float notifDuration = 240f;