Changeset 9941 for code/trunk/data/gui

Timestamp:

Dec 29, 2013, 8:06:44 PM (11 years ago)

Author:

jo

Message:

Adding most of the changes that were proposed in the release2012 branch.

Location:

code/trunk/data/gui

Files:

• layouts/CreditsMenu.layout (modified) (1 diff)
• scripts/MiscConfigMenu.lua (modified) (2 diffs)

code/trunk/data/gui/layouts/CreditsMenu.layout

@@ -46 +46 @@
     
     Credits:
+    http://www.orxonox.net/wiki/credits
+
+    Thanks to AMIV:
+    https://www.amiv.ethz.ch/
                       </Property>
                     </Window>

code/trunk/data/gui/scripts/MiscConfigMenu.lua

@@ -33 +33 @@
     table.insert(P.commandList, "UnderAttack gameTime_")
     table.insert(P.commandList, "TeamDeathmatch teams_")
+    table.insert(P.commandList, "TeamDeathmatch maxScore_")
     table.insert(P.commandList, "HumanPlayer nick_")
     table.insert(P.commandList, "ChatOverlay displayTime_")
@@ -56 +57 @@
     table.insert(P.nameList, "UnderAttack: game time")
     table.insert(P.nameList, "TeamDeathmatch: Number of teams")
+    table.insert(P.nameList, "TeamDeathmatch: Score needed to end the game")
     table.insert(P.nameList, "Playername")
     table.insert(P.nameList, "Chat: display time")