gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Converts most parts of the game to use Pureon's new UI

Browse Source 
This was SVN commit r14804.
This commit is contained in:
scythetwirler
2014-03-04 02:23:01 +00:00
parent 1a2f889bb9
commit 5582409973
34 changed files with 889 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/aiconfig/aiconfig.xml
+7 -7
View File
@@ -5,32 +5,32 @@
<script file="gui/aiconfig/aiconfig.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="BackgroundTranslucent"/>
<object type="image" z="0" sprite="modernFade"/>
<object type="image" style="StoneDialog" size="50%-200 40%-140 50%+200 40%+180">
<object type="image" style="ModernDialog" size="50%-200 40%-140 50%+200 40%+180">
<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">AI Configuration</object>
<object size="50%-128 30 50%+128 80">
<object type="text" style="RightLabelText" size="-10 0 90 50%">
<object type="text" style="ModernRightLabelText" size="-10 0 90 50%">
AI Player
</object>
<object name="aiSelection" type="dropdown" style="StoneDropDown" size="50%-24 0 50%+136 28">
<object name="aiSelection" type="dropdown" style="ModernDropDown" size="50%-24 0 50%+136 28">
<action on="SelectionChange">selectAI(this.selected);</action>
</object>
<object type="text" style="RightLabelText" size="-10 35 90 50%+35">
<object type="text" style="ModernRightLabelText" size="-10 35 90 50%+35">
AI Difficulty
</object>
<object name="aiDifficulty" type="dropdown" style="StoneDropDown" size="50%-24 35 50%+136 63">
<object name="aiDifficulty" type="dropdown" style="ModernDropDown" size="50%-24 35 50%+136 63">
</object>
</object>
<object size="8% 50%-54 92% 50%+74">
<object name="aiDescription" type="text" style="LeftLabelText" size="0 0 100% 100%" text_align="center"/>
<object name="aiDescription" type="text" style="ModernLeftLabelText" size="0 0 100% 100%" text_align="center"/>
<!-- TODO: we might want to add things like difficulty controls into here -->
binaries/data/mods/public/gui/civinfo/civinfo.xml
+9 -9
View File
@@ -10,7 +10,7 @@
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="bkTranslucent"/>
<object type="image" style="StoneDialog" size="50%-466 50%-316 50%+466 50%+316">
<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">Civilizations</object>
@@ -20,20 +20,20 @@
name="civSelectionHeading"
type="text"
font="serif-bold-20"
textcolor="white"
textcolor="white"
text_align="left"
size="50%-320 10 50%-96 48">
Civilization Selection
</object>
<object name="civSelection" type="dropdown" style="StoneDropDown" size="50%-96 10 50%+96 40">
<object name="civSelection" type="dropdown" style="ModernDropDown" size="50%-96 10 50%+96 40">
<action on="SelectionChange">selectCiv(this.list_data[this.selected]);</action>
</object>
</object>
<!-- Civ data display -->
<object size="25 50 100%-25 65%-5">
<object type="image" sprite="TranslucentPanelThinBorder" size="0 0 100% 40">
<object type="image" sprite="TranslucentPanelThinBorder" size="0 5 100% 40">
<object
name="civGameplayHeading"
type="text"
@@ -45,7 +45,7 @@
/>
</object>
<object type="image" sprite="BackgroundTranslucent" size="0 40 33%-5 100%">
<object type="image" sprite="ModernDarkBoxGold" size="0 45 33%-5 100%">
<object
name="civBonuses"
type="text"
@@ -56,7 +56,7 @@
/>
</object>
<object type="image" sprite="BackgroundTranslucent" size="33%+5 40 75%-5 100%">
<object type="image" sprite="ModernDarkBoxGold" size="33%+5 45 75%-5 100%">
<object
name="civTechs"
type="text"
@@ -67,7 +67,7 @@
/>
</object>
<object type="image" sprite="BackgroundTranslucent" size="75%+5 40 100% 100%">
<object type="image" sprite="ModernDarkBoxGold" size="75%+5 45 100% 100%">
<object
name="civHeroes"
type="text"
@@ -95,7 +95,7 @@
/>
</object>
<object type="image" sprite="BackgroundTranslucent" size="0 35 100% 100%">
<object type="image" sprite="ModernDarkBoxGold" size="0 35 100% 100%">
<object
name="civHistoryText"
type="text"
@@ -122,4 +122,4 @@
</object>
</objects>
</objects>
binaries/data/mods/public/gui/common/modern/sprites.xml
+26
View File
@@ -148,6 +148,32 @@
/>
</sprite>
<!--
==========================================
- Panel -
==========================================
-->
<sprite name = "ModernPanel">
<!-- background -->
<image backcolor = "12 12 12"/>
<image texture = "global/modern/background.png"
texture_size = "0 0 1024 1024"
size = "12 22 100%-12 100%-12"
/>
<!-- shading -->
<!-- we just mirror the same texture on the top and bottom -->
<image texture = "global/modern/shadow-high.png"
texture_size = "0 0 1024 256"
size = "12 100%-268 100%-12 100%-12"
/>
<image texture = "global/modern/shadow-high.png"
texture_size = "1024 256 0 0"
size = "12 22 100%-12 268"
/>
</sprite>
<!--
==========================================
- Box -
binaries/data/mods/public/gui/common/modern/styles.xml
+38 -2
View File
@@ -13,6 +13,12 @@
text_align = "left"
text_valign = "top"
/>
<style name = "ModernPanel"
sprite = "ModernPanel"
buffer_zone = "12"
text_align = "left"
text_valign = "top"
/>
<style name = "ModernList"
buffer_zone = "5"
font = "serif-bold-stroke-14"
@@ -29,7 +35,7 @@
/>
<style name="ModernDropDown"
dropdown_buffer="1"
font="serif-14"
font="serif-bold-14"
textcolor="white"
text_align="left"
text_valign="center"
@@ -39,7 +45,7 @@
sprite2="ModernDropDownArrow"
sprite2_pressed="ModernDropDownArrowHighlight"
buffer_zone="5"
buffer_zone="8"
dropdown_size="200"
sprite_list="colour:12 12 12"
sprite_selectarea="ModernDarkBoxWhite"
@@ -58,6 +64,36 @@
text_align="center"
text_valign="center"
/>
<style name="ModernRightLabelText"
font="serif-bold-stroke-14"
textcolor="white"
text_align="right"
text_valign="center"
/>
<style name="ModernLeftLabelText"
font="serif-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="center"
/>
<style name="ModernTabLabelText"
font="serif-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="top"
/>
<style name="ModernRightTabLabelText"
font="serif-bold-stroke-14"
textcolor="white"
text_align="right"
text_valign="top"
/>
<style name="ModernLeftTabLabelText"
font="serif-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="ModernText"
font="serif-14"
textcolor="white"
binaries/data/mods/public/gui/gamesetup/gamesetup.js
+1
View File
@@ -1472,6 +1472,7 @@ function addChatMessage(msg)
function toggleMoreOptions()
{
Engine.GetGUIObjectByName("moreOptionsFade").hidden = !Engine.GetGUIObjectByName("moreOptionsFade").hidden;
Engine.GetGUIObjectByName("moreOptions").hidden = !Engine.GetGUIObjectByName("moreOptions").hidden;
}
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+132 -134
View File
@@ -9,19 +9,19 @@
<script file="gui/gamesetup/gamesetup.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" style="StoneWindow" size="0 0 100% 100%">
<object type="image" style="ModernWindow" size="0 0 100% 100%">
<object style="TitleText" type="text" size="50%-128 4 50%+128 36">
Match Setup
</object>
<object type="image" style="StoneDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
<object type="image" style="ModernDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
Loading
</object>
<object type="text" style="CenteredLabelText">
<object type="text" style="ModernLabelText">
Loading map data. Please wait...
</object>
@@ -38,15 +38,15 @@
<!-- Number of Players-->
<object size="0 0 150 28">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Number of players:</object>
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Number of players:</object>
</object>
<!-- Number of Players-->
<object size="150 0 200 28">
<object name="numPlayersText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="numPlayersText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="numPlayersSelection"
type="dropdown"
style="StoneDropDown"
style="ModernDropDown"
size="0 0 100% 28"
tooltip_style="onscreenToolTip"
tooltip="Select number of players.">
@@ -57,11 +57,11 @@
</object>
<!-- Player assignments -->
<object size="24 59 100%-440 358" type="image" sprite="BackgroundIndentFillDark" name="playerAssignmentsPannel">
<object size="24 59 100%-440 358" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPannel">
<object size="0 6 100% 30">
<object name="playerNameHeading" type="text" style="CenteredLabelText" size="0 0 25% 100%">Player Name</object>
<object name="playerPlacementHeading" type="text" style="CenteredLabelText" size="25%+5 0 55% 100%">Player Placement</object>
<object name="playerCivHeading" type="text" style="CenteredLabelText" size="55%+65 0 85% 100%">Civilization</object>
<object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 25% 100%">Player Name</object>
<object name="playerPlacementHeading" type="text" style="ModernLabelText" size="25%+5 0 55% 100%">Player Placement</object>
<object name="playerCivHeading" type="text" style="ModernLabelText" size="55%+65 0 85% 100%">Civilization</object>
<object name="civInfoButton"
type="button"
sprite="iconInfoGold"
@@ -74,23 +74,23 @@
Engine.PushGuiPage("page_civinfo.xml");
]]></action>
</object>
<object name="playerTeamHeading" type="text" style="CenteredLabelText" size="85%+5 0 100%-5 100%">Team</object>
<object name="playerTeamHeading" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%">Team</object>
</object>
<object size="1 36 100%-1 100%">
<repeat count="8">
<object name="playerBox[n]" size="0 0 100% 32" hidden="true">
<object name="playerColour[n]" type="image" size="0 0 100% 100%"/>
<object name="playerName[n]" type="text" style="CenteredLabelText" size="0 2 25% 30"/>
<object name="playerAssignment[n]" type="dropdown" style="StoneDropDown" size="25%+5 2 55% 30" tooltip_style="onscreenToolTip" tooltip="Select player."/>
<object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 25% 30"/>
<object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="25%+5 2 55% 30" tooltip_style="onscreenToolTip" tooltip="Select player."/>
<object name="playerConfig[n]" type="button" style="StoneButton" size="55%+5 6 55%+60 26"
tooltip_style="onscreenToolTip"
tooltip="Configure AI settings."
font="serif-bold-stroke-12"
>Settings</object>
<object name="playerCiv[n]" type="dropdown" style="StoneDropDown" size="55%+65 2 85% 30" tooltip_style="onscreenToolTip" tooltip="Select player's civilization."/>
<object name="playerCivText[n]" type="text" style="CenteredLabelText" size="55%+65 0 85% 30"/>
<object name="playerTeam[n]" type="dropdown" style="StoneDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip" tooltip="Select player's team."/>
<object name="playerTeamText[n]" type="text" style="CenteredLabelText" size="85%+5 0 100%-5 100%"/>
<object name="playerCiv[n]" type="dropdown" style="ModernDropDown" size="55%+65 2 85% 30" tooltip_style="onscreenToolTip" tooltip="Select player's civilization."/>
<object name="playerCivText[n]" type="text" style="ModernLabelText" size="55%+65 0 85% 30"/>
<object name="playerTeam[n]" type="dropdown" style="ModernDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip" tooltip="Select player's team."/>
<object name="playerTeamText[n]" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%"/>
</object>
</repeat>
</object>
@@ -100,23 +100,23 @@
<object size="100%-425 363 100%-325 455" name="mapTypeSelectionTooltip">
<object type="text" style="RightLabelText" size="0 0 100% 30">Match Type:</object>
<object type="text" style="RightLabelText" size="0 32 100% 62">Map Filter:</object>
<object type="text" style="RightLabelText" size="0 64 100% 94">Select Map:</object>
<object name="mapSizeDesc" type="text" style="RightLabelText" size="0 96 100% 126">Map Size:</object>
<object type="text" style="ModernRightLabelText" size="0 0 100% 30">Match Type:</object>
<object type="text" style="ModernRightLabelText" size="0 32 100% 62">Map Filter:</object>
<object type="text" style="ModernRightLabelText" size="0 64 100% 94">Select Map:</object>
<object name="mapSizeDesc" type="text" style="ModernRightLabelText" size="0 96 100% 126">Map Size:</object>
</object>
<object size="100%-327 363 100%-25 423" name="mapFilterSelectionTooltip">
<object name="mapTypeText" type="text" style="LeftLabelText" size="0 0 100% 30" hidden="true"/>
<object name="mapFilterText" type="text" style="LeftLabelText" size="0 32 100% 62" hidden="true"/>
<object name="mapSelectionText" type="text" style="LeftLabelText" size="0 64 100% 94" hidden="true"/>
<object name="mapSizeText" type="text" style="LeftLabelText" size="0 96 100% 126" hidden="true"/>
<object name="mapTypeText" type="text" style="ModernLeftLabelText" size="0 0 100% 30" hidden="true"/>
<object name="mapFilterText" type="text" style="ModernLeftLabelText" size="0 32 100% 62" hidden="true"/>
<object name="mapSelectionText" type="text" style="ModernLeftLabelText" size="0 64 100% 94" hidden="true"/>
<object name="mapSizeText" type="text" style="ModernLeftLabelText" size="0 96 100% 126" hidden="true"/>
</object>
<object name="mapTypeSelection"
type="dropdown"
style="StoneDropDown"
size="100%-325 363 100%-25 391"
style="ModernDropDown"
size="100%-315 363 100%-25 391"
tooltip_style="onscreenToolTip"
tooltip="Select a map type.">
<action on="SelectionChange">selectMapType(this.list_data[this.selected]);</action>
@@ -124,17 +124,17 @@
<object name="mapFilterSelection"
type="dropdown"
style="StoneDropDown"
size="100%-325 395 100%-25 423"
style="ModernDropDown"
size="100%-315 395 100%-25 423"
tooltip_style="onscreenToolTip"
tooltip="Select a map filter.">
<action on="SelectionChange">selectMapFilter(this.list[this.selected]);</action>
</object>
<object size="100%-325 427 100%-25 455" name="mapSelectionPannel" z="55">
<object size="100%-315 427 100%-25 455" name="mapSelectionPannel" z="55">
<object name="mapSelection"
style="StoneDropDown"
style="ModernDropDown"
type="dropdown"
size="0 0 100% 100%"
tooltip_style="onscreenToolTip"
@@ -143,123 +143,26 @@
</object>
</object>
<object name="mapSize" size="100%-325 459 100%-25 487" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size. (Larger sizes may reduce performance.)"/>
<object name="mapSize" size="100%-315 459 100%-25 487" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size. (Larger sizes may reduce performance.)"/>
<!-- Map Preview -->
<object type="image" sprite="BackgroundIndentFillDark" name="gamePreviewBox" size="100%-426 57 100%-24 359">
<object type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 57 100%-24 359">
<object type="image" sprite="snMapPreview" size="1 1 401 301" name="mapPreview"/>
</object>
<!-- Map Description -->
<object size="100%-425 497 100%-25 100%-60">
<object name="mapInfoName" type="text" style="LeftLabelText" size="0 0 100%-120 30"/>
<object type="image" sprite="BackgroundIndentFillDark" size="0 30 100% 100%">
<object name="mapInfoName" type="text" style="ModernLeftLabelText" size="0 0 100%-120 30"/>
<object type="image" sprite="ModernDarkBoxGold" size="0 30 100% 100%">
<object name="mapInfoDescription" type="text" style="MapDescription" size="0 0 100% 100%"/>
</object>
</object>
<!-- Options -->
<object name="gameOptionsBox" size="100%-425 497 100%-25 525">
<!-- More Options Button -->
<object
name="showMoreOptions"
type="button"
style="StoneButton"
size="100%-120 0 100% 28"
tooltip_style="onscreenToolTip"
tooltip="See more game options"
>
More Options
<action on="Press">toggleMoreOptions();</action>
</object>
<!-- End Options -->
</object>
<!-- More Options -->
<object name="moreOptions" type="image" sprite="StoneWindow" size="50%-200 50%-150 50%+200 50%+155" z="70" hidden="true">
<object style="TitleText" type="text" size="50%-128 11 50%+128 27">
More Options
</object>
<object size="14 38 94% 66">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Game Speed:</object>
</object>
<object name="gameSpeedText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="gameSpeed" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select game speed."/>
</object>
<object size="14 68 94% 96">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Victory Condition:</object>
</object>
<object name="victoryConditionText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="victoryCondition" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition."/>
</object>
<object size="14 98 94% 126">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Population Cap:</object>
</object>
<object name="populationCapText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="populationCap" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select population cap."/>
</object>
<object size="14 128 94% 156">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Starting Resources:</object>
</object>
<object name="startingResourcesText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="startingResources" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select the game's starting resources."/>
</object>
<object size="14 158 94% 246">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Reveal Map:</object>
</object>
<object size="0 30 40% 58">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Teams Locked:</object>
</object>
<object size="0 60 40% 88" name="enableCheatsDesc" hidden="true">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Cheats:</object>
</object>
<object size="40% 0 100% 28">
<object name="revealMapText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="revealMap" size="4 50%-8 20 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map."/>
</object>
<object size="40% 30 100% 58">
<object name="lockTeamsText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="lockTeams" size="4 50%-8 20 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams."/>
</object>
<object size="40% 60 100% 88">
<object name="enableCheatsText" size="0 0 100% 100%" type="text" style="LeftLabelText" hidden="true"/>
<object name="enableCheats" size="4 50%-8 20 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle the usability of cheats."/>
</object>
</object>
<!-- Hide More Options Button -->
<object
name="hideMoreOptions"
type="button"
style="StoneButton"
size="50%-70 248 50%+70 274"
tooltip_style="onscreenToolTip"
tooltip="Close more game options window"
>
OK
<action on="Press">toggleMoreOptions();</action>
</object>
<!-- End More Options -->
</object>
<!-- Chat window -->
<object name="chatPanel" size="24 370 100%-435 100%-58" type="image" sprite="BackgroundIndentFillDark">
<object name="chatPanel" size="24 370 100%-440 100%-58" type="image" sprite="ModernDarkBoxGold">
<object name="chatText" size="2 2 100%-2 100%-26" type="text" style="ChatPanel"/>
<object name="chatInput" size="4 100%-24 100%-76 100%-4" type="input" style="StoneInput">
<object name="chatInput" size="4 100%-24 100%-76 100%-4" type="input" style="ModernInput">
<action on="Press">submitChatInput();</action>
</object>
@@ -312,6 +215,101 @@
]]>
</action>
</object>
<!-- Options -->
<object name="gameOptionsBox" size="100%-425 497 100%-25 525">
<!-- More Options Button -->
<object
name="showMoreOptions"
type="button"
style="StoneButton"
size="100%-120 0 100% 28"
tooltip_style="onscreenToolTip"
tooltip="See more game options"
>
More Options
<action on="Press">toggleMoreOptions();</action>
</object>
<!-- End Options -->
</object>
<!-- More Options -->
<object hidden="true" name="moreOptionsFade" type="image" z="0" sprite="modernFade"/>
<object name="moreOptions" type="image" sprite="ModernDialog" size="50%-200 50%-150 50%+200 50%+155" z="70" hidden="true">
<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">More Options</object>
<object size="14 38 94% 66">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Game Speed:</object>
</object>
<object name="gameSpeedText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="gameSpeed" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select game speed."/>
</object>
<object size="14 68 94% 96">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Victory Condition:</object>
</object>
<object name="victoryConditionText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="victoryCondition" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition."/>
</object>
<object size="14 98 94% 126">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Population Cap:</object>
</object>
<object name="populationCapText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="populationCap" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select population cap."/>
</object>
<object size="14 128 94% 156">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Starting Resources:</object>
</object>
<object name="startingResourcesText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="startingResources" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select the game's starting resources."/>
</object>
<object size="14 158 94% 246">
<object size="0 0 40% 28">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Reveal Map:</object>
</object>
<object size="0 30 40% 58">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Teams Locked:</object>
</object>
<object size="0 60 40% 88" name="enableCheatsDesc" hidden="true">
<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Cheats:</object>
</object>
<object size="40% 0 100% 28">
<object name="revealMapText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="revealMap" size="10 50%-8 26 50%+8" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map."/>
</object>
<object size="40% 30 100% 58">
<object name="lockTeamsText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
<object name="lockTeams" size="10 50%-8 26 50%+8" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams."/>
</object>
<object size="40% 60 100% 88">
<object name="enableCheatsText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText" hidden="true"/>
<object name="enableCheats" size="10 50%-8 26 50%+8" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle the usability of cheats."/>
</object>
</object>
<!-- Hide More Options Button -->
<object
name="hideMoreOptions"
type="button"
style="StoneButton"
size="50%-70 250 50%+70 276"
tooltip_style="onscreenToolTip"
tooltip="Close more game options window"
>
OK
<action on="Press">toggleMoreOptions();</action>
</object>
<!-- End More Options -->
</object>
</object>
</object>
</objects>
binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
+13 -13
View File
@@ -9,7 +9,7 @@
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="bkTranslucent"/>
<object type="image" style="StoneDialog" size="50%-190 50%-120 50%+190 50%+120">
<object type="image" style="ModernDialog" size="50%-190 50%-120 50%+190 50%+120">
<action on="Tick">
onTick();
@@ -21,25 +21,25 @@
<object name="pageJoin" size="0 32 100% 100%" hidden="true">
<object type="text" style="CenteredLabelText" size="0 0 400 30">
<object type="text" style="ModernLabelText" size="0 0 400 30">
Joining an existing game.
</object>
<object type="text" size="0 40 200 70" style="RightLabelText">
<object type="text" size="0 40 200 70" style="ModernRightLabelText">
Player name:
</object>
<object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput">
<object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "playername");
</action>
</object>
<object type="text" size="0 80 200 110" style="RightLabelText">
<object type="text" size="0 80 200 110" style="ModernRightLabelText">
Server Hostname or IP:
</object>
<object name="joinServer" type="input" size="210 80 100%-32 104" style="StoneInput">
<object name="joinServer" type="input" size="210 80 100%-32 104" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "multiplayerserver")
</action>
@@ -63,16 +63,16 @@
<object name="pageHost" size="0 32 100% 100%" hidden="true">
<object type="text" style="CenteredLabelText" size="0 0 400 30">
<object type="text" style="ModernLabelText" size="0 0 400 30">
Set up your server to host.
</object>
<object name="hostPlayerNameWrapper" hidden="true">
<object type="text" size="0 40 200 70" style="RightLabelText">
<object type="text" size="0 40 200 70" style="ModernRightLabelText">
Player name:
</object>
<object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput">
<object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "playername");
</action>
@@ -80,11 +80,11 @@
</object>
<object name="hostServerNameWrapper" hidden="true">
<object type="text" size="0 80 200 110" style="RightLabelText">
<object type="text" size="0 80 200 110" style="ModernRightLabelText">
Server name:
</object>
<object name="hostServerName" type="input" size="210 80 100%-32 104" style="StoneInput">
<object name="hostServerName" type="input" size="210 80 100%-32 104" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "playername") + "'s game";
</action>
@@ -103,7 +103,7 @@
</object>
</object>
<object name="hostFeedback" type="text" style="CenteredLabelText" size="32 150 100%-32 180" textcolor="red" />
<object name="hostFeedback" type="text" style="ModernLabelText" size="32 150 100%-32 180" textcolor="red" />
<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
Cancel
@@ -111,7 +111,7 @@
</object>
<object name="pageConnecting" hidden="true">
<object name="connectionStatus" type="text" style="CenteredLabelText" size="0 100 100% 120">
<object name="connectionStatus" type="text" style="ModernLabelText" size="0 100 100% 120">
[Connection status]
</object>
</object>
binaries/data/mods/public/gui/gamesetup/styles.xml
+2 -2
View File
@@ -16,7 +16,7 @@
buffer_zone="8"
font="serif-12"
scrollbar="true"
scrollbar_style="wheatScrollBar"
scrollbar_style="ModernScrollBar"
scroll_bottom="true"
textcolor="white"
text_align="left"
@@ -28,7 +28,7 @@
buffer_zone="5"
font="serif-13"
scrollbar="true"
scrollbar_style="wheatScrollBar"
scrollbar_style="ModernScrollBar"
scroll_bottom="true"
textcolor="white"
textcolor_selected="gold"
binaries/data/mods/public/gui/loading/loading.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<script file="gui/loading/loading.js"/>
<script file="gui/common/functions_utility_error.js"/>
<object type="image" style="StoneWindow">
<object type="image" style="ModernWindow">
<!-- LOADING SCREEN progress bar -->
<object size="50%-256 4 50%+256 36" type="image" sprite="LoadingProgressBarBackground">
binaries/data/mods/public/gui/manual/manual.xml
+2 -2
View File
@@ -7,10 +7,10 @@
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" style="TranslucentPanel"/>
<object type="image" style="StoneDialog" size="50%-466 50%-316 50%+466 50%+316">
<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">Manual</object>
<object type="image" sprite="BackgroundTranslucent" size="20 20 100%-20 100%-58">
<object type="image" sprite="modernFade" size="20 20 100%-20 100%-58">
<object name="mainText" type="text" style="textPanel"/>
</object>
<object type="button" style="StoneButton" size="100%-308 100%-52 100%-168 100%-24">
binaries/data/mods/public/gui/manual/styles.xml
+2 -1
View File
@@ -6,11 +6,12 @@
buffer_zone="8"
font="serif-bold-16"
scrollbar="true"
scrollbar_style="wheatScrollBar"
scrollbar_style="ModernScrollBar"
textcolor="white"
textcolor_selected="black"
text_align="left"
text_valign="center"
sprite="ModernDarkBoxGold"
/>
</styles>
binaries/data/mods/public/gui/msgbox/msgbox.xml
+2 -2
View File
@@ -110,7 +110,7 @@
<object>
<object name="mbMain"
style="StoneDialog"
style="ModernDialog"
type="image"
>
@@ -122,7 +122,7 @@
<object name="mbText"
type="text"
style="CenteredLabelText"
style="ModernLabelText"
size="5% 20% 95% 100%-96"
/>
binaries/data/mods/public/gui/page_aiconfig.xml
+6 -3
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>aiconfig/aiconfig.xml</include>
</page>
binaries/data/mods/public/gui/page_civinfo.xml
+7 -4
View File
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>civinfo/civinfo.xml</include>
<include>civinfo/setup.xml</include>
<include>civinfo/sprites.xml</include>
</page>
</page>
binaries/data/mods/public/gui/page_gamesetup.xml
+8 -5
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>gamesetup/setup.xml</include>
<include>gamesetup/sprites.xml</include>
binaries/data/mods/public/gui/page_gamesetup_mp.xml
+7 -4
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>gamesetup/setup.xml</include>
<include>gamesetup/sprites.xml</include>
binaries/data/mods/public/gui/page_loadgame.xml
+6 -3
View File
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_loading.xml
+9 -6
View File
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/init.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>loading/styles.xml</include>
<include>loading/sprites.xml</include>
<include>loading/styles.xml</include>
<include>loading/sprites.xml</include>
<include>loading/loading.xml</include>
<include>common/global.xml</include>
</page>
binaries/data/mods/public/gui/page_lobby.xml
+10 -12
View File
@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/global.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>lobby/styles.xml</include>
<include>lobby/lobby.xml</include>
<include>lobby/styles.xml</include>
<include>lobby/lobby.xml</include>
</page>
binaries/data/mods/public/gui/page_manual.xml
+7 -4
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>manual/styles.xml</include>
<include>manual/manual.xml</include>
binaries/data/mods/public/gui/page_msgbox.xml
+7 -4
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>msgbox/msgbox.xml</include>
</page>
binaries/data/mods/public/gui/page_options.xml
+7 -7
View File
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/icon_sprites.xml</include>
<include>common/init.xml</include>
<include>common/global.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/setup.xml</include>
<include>common/modern/sprites.xml</include>
<include>options/options.xml</include>
</page>
binaries/data/mods/public/gui/page_pregame.xml
+9 -6
View File
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/init.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/init.xml</include>
<include>pregame/sprites.xml</include>
<include>pregame/styles.xml</include>
binaries/data/mods/public/gui/page_prelobby.xml
+10 -11
View File
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/global.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/global.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>lobby/prelobby.xml</include>
<include>lobby/prelobby.xml</include>
</page>
binaries/data/mods/public/gui/page_savegame.xml
+6 -3
View File
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_session.xml
+7 -8
View File
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/icon_sprites.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/icon_sprites.xml</include>
<include>session/sprites.xml</include>
<include>session/setup.xml</include>
<include>session/styles.xml</include>
binaries/data/mods/public/gui/page_splashscreen.xml
+7 -4
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>splashscreen/styles.xml</include>
<include>splashscreen/setup.xml</include>
binaries/data/mods/public/gui/page_summary.xml
+7 -4
View File
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/icon_sprites.xml</include>
<include>common/init.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>summary/summary.xml</include>
<include>summary/sprites.xml</include>
<include>common/global.xml</include>
binaries/data/mods/public/gui/savedgames/load.xml
+2 -2
View File
@@ -9,14 +9,14 @@
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="BackgroundTranslucent"/>
<object type="image" style="StoneDialog" size="50%-300 50%-200 50%+300 50%+200">
<object type="image" style="ModernDialog" size="50%-300 50%-200 50%+300 50%+200">
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
Load Game
</object>
<object name="gameSelection"
style="StoneList"
style="ModernList"
type="list"
size="24 24 100%-24 100%-100">
</object>
binaries/data/mods/public/gui/session/session.xml
+46 -46
View File
@@ -251,7 +251,7 @@
<action on="Press">toggleDeveloperOverlay();</action>
<object size="0 0 100%-18 16" type="text" style="devCommandsText">Control all units</object>
<object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="StoneCrossBox">
<object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="ModernTickBox">
<action on="Press">
g_DevSettings.controlAll = this.checked;
Engine.PostNetworkCommand( {"type": "control-all", "flag": this.checked} );
@@ -259,40 +259,40 @@
</object>
<object size="0 16 100%-18 32" type="text" style="devCommandsText">Change perspective</object>
<object size="100%-16 16 100% 32" type="checkbox" style="StoneCrossBox">
<object size="100%-16 16 100% 32" type="checkbox" style="ModernTickBox">
<action on="Press">Engine.GetGUIObjectByName("viewPlayer").hidden = !this.checked;</action>
</object>
<object size="0 32 100%-18 48" type="text" style="devCommandsText">Display selection state</object>
<object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="StoneCrossBox"/>
<object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="ModernTickBox"/>
<object size="0 48 100%-18 64" type="text" style="devCommandsText">Pathfinder overlay</object>
<object size="100%-16 48 100% 64" type="checkbox" style="StoneCrossBox">
<object size="100%-16 48 100% 64" type="checkbox" style="ModernTickBox">
<action on="Press">Engine.GuiInterfaceCall("SetPathfinderDebugOverlay", this.checked);</action>
</object>
<object size="0 64 100%-18 80" type="text" style="devCommandsText">Obstruction overlay</object>
<object size="100%-16 64 100% 80" type="checkbox" style="StoneCrossBox">
<object size="100%-16 64 100% 80" type="checkbox" style="ModernTickBox">
<action on="Press">Engine.GuiInterfaceCall("SetObstructionDebugOverlay", this.checked);</action>
</object>
<object size="0 80 100%-18 96" type="text" style="devCommandsText">Unit motion overlay</object>
<object size="100%-16 80 100% 96" type="checkbox" style="StoneCrossBox">
<object size="100%-16 80 100% 96" type="checkbox" style="ModernTickBox">
<action on="Press">g_Selection.SetMotionDebugOverlay(this.checked);</action>
</object>
<object size="0 96 100%-18 112" type="text" style="devCommandsText">Range overlay</object>
<object size="100%-16 96 100% 112" type="checkbox" style="StoneCrossBox">
<object size="100%-16 96 100% 112" type="checkbox" style="ModernTickBox">
<action on="Press">Engine.GuiInterfaceCall("SetRangeDebugOverlay", this.checked);</action>
</object>
<object size="0 112 100%-18 128" type="text" style="devCommandsText">Bounding box overlay</object>
<object size="100%-16 112 100% 128" type="checkbox" style="StoneCrossBox">
<object size="100%-16 112 100% 128" type="checkbox" style="ModernTickBox">
<action on="Press">Engine.SetBoundingBoxDebugOverlay(this.checked);</action>
</object>
<object size="0 128 100%-18 144" type="text" style="devCommandsText">Restrict camera</object>
<object size="100%-16 128 100% 144" type="checkbox" style="StoneCrossBox" checked="true">
<object size="100%-16 128 100% 144" type="checkbox" style="ModernTickBox" checked="true">
<action on="Press">
Engine.GameView_SetConstrainCameraEnabled(this.checked);
// Make selection more durable at the expense of speed if unchecked.
@@ -304,13 +304,13 @@
</object>
<object size="0 144 100%-18 160" type="text" style="devCommandsText">Reveal map</object>
<object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="StoneCrossBox">
<object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="ModernTickBox">
<action on="Load">this.checked = Engine.GuiInterfaceCall("IsMapRevealed");</action>
<action on="Press">Engine.PostNetworkCommand({"type": "reveal-map", "enable": this.checked});</action>
</object>
<object size="0 160 100%-18 176" type="text" style="devCommandsText">Enable time warp</object>
<object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="StoneCrossBox">
<object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="ModernTickBox">
<action on="Press">
if (this.checked)
messageBox(500, 250, "Note: time warp mode is a developer option, and not intended\nfor use over long periods of time. Using it incorrectly may\ncause the game to run out of memory or crash.", "Time warp mode", 2);
@@ -318,7 +318,7 @@
</object>
<object size="0 176 100%-18 192" type="text" style="devCommandsText">Promote selected units</object>
<object size="100%-16 176 100% 192" type="button" style="StoneCrossBox">
<object size="100%-16 176 100% 192" type="button" style="ModernTickBox">
<action on="Press">Engine.PostNetworkCommand({"type": "promote", "entities": g_Selection.toList()});</action>
</object>
</object>
@@ -369,7 +369,7 @@
<!-- Chat window -->
<object name="chatDialogPanel" size="50%-180 50%-48 50%+180 50%+36" type="image" hidden="true" sprite="genericPanel">
<object name="chatInput" size="16 12 100%-16 36" type="input" style="StoneInput" max_length="80">
<object name="chatInput" size="16 12 100%-16 36" type="input" style="ModernInput" max_length="80">
<action on="Press">submitChatInput();</action>
</object>
@@ -382,8 +382,8 @@
Cancel
<action on="Press">closeChat();</action>
</object>
<object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="StoneCrossBox"/>
<object size="60%+48 100%-40 100% 100%-12" type="text" style="LeftLabelText">
<object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="ModernTickBox"/>
<object size="60%+48 100%-40 100% 100%-12" type="text" style="ModernLeftLabelText">
Team Only
</object>
</object>
@@ -395,7 +395,7 @@
size="50%-300 50%-200 50%+300 50%+150"
type="image"
hidden="true"
sprite="StoneDialog"
sprite="ModernDialog"
>
<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Diplomacy</object>
@@ -500,7 +500,7 @@
<!-- Settings Window -->
<!-- ================================ ================================ -->
<object name="settingsDialogPanel"
style="StoneDialog"
style="ModernDialog"
type="image"
size="50%-180 50%-225 50%+180 50%+225"
hidden="true"
@@ -513,91 +513,91 @@
size="32 32 100%-32 100%-70"
>
<!-- Settings / shadows -->
<object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 10 100%-80 35" type="text" style="ModernRightLabelText" ghost="true">Enable Shadows</object>
<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetShadowsEnabled();</action>
<action on="Press">Engine.Renderer_SetShadowsEnabled(this.checked);</action>
</object>
<!-- Settings / Shadow PCF -->
<object size="0 35 100%-80 60" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
<object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 35 100%-80 60" type="text" style="ModernRightLabelText" ghost="true">Enable Shadow Filtering</object>
<object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetShadowPCFEnabled();</action>
<action on="Press">Engine.Renderer_SetShadowPCFEnabled(this.checked);</action>
</object>
<!-- Settings / Water Normals -->
<object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Water - HQ Waviness</object>
<object name="waterNormalCheckox" size="100%-56 65 100%-30 90" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 60 100%-80 85" type="text" style="ModernRightLabelText" ghost="true">Water - HQ Waviness</object>
<object name="waterNormalCheckox" size="100%-56 65 100%-30 90" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetWaterNormalEnabled();</action>
<action on="Press">Engine.Renderer_SetWaterNormalEnabled(this.checked);</action>
</object>
<!-- Settings / Real Depth -->
<object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Water - Use Actual Depth</object>
<object name="waterRealDepthCheckbox" size="100%-56 90 100%-30 115" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 85 100%-80 110" type="text" style="ModernRightLabelText" ghost="true">Water - Use Actual Depth</object>
<object name="waterRealDepthCheckbox" size="100%-56 90 100%-30 115" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetWaterRealDepthEnabled();</action>
<action on="Press">Engine.Renderer_SetWaterRealDepthEnabled(this.checked);</action>
</object>
<!-- Settings / Reflection -->
<object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Water - Enable Reflections</object>
<object name="waterReflectionCheckbox" size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 110 100%-80 135" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Reflections</object>
<object name="waterReflectionCheckbox" size="100%-56 115 100%-30 140" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetWaterReflectionEnabled();</action>
<action on="Press">Engine.Renderer_SetWaterReflectionEnabled(this.checked);</action>
</object>
<!-- Settings / Refraction -->
<object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Water - Enable Refraction</object>
<object name="waterRefractionCheckbox" size="100%-56 140 100%-30 165" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 135 100%-80 160" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Refraction</object>
<object name="waterRefractionCheckbox" size="100%-56 140 100%-30 165" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetWaterRefractionEnabled();</action>
<action on="Press">Engine.Renderer_SetWaterRefractionEnabled(this.checked);</action>
</object>
<!-- Settings / Foam -->
<object size="0 160 100%-80 185" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Foam</object>
<object name="waterFoamCheckbox" size="100%-56 165 100%-30 190" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 160 100%-80 185" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Shore Foam</object>
<object name="waterFoamCheckbox" size="100%-56 165 100%-30 190" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetWaterFoamEnabled();</action>
<action on="Press">Engine.Renderer_SetWaterFoamEnabled(this.checked);</action>
</object>
<!-- Settings / Waves -->
<object size="0 185 100%-80 210" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Waves</object>
<object name="waterCoastalWavesCheckbox" size="100%-56 190 100%-30 215" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 185 100%-80 210" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Shore Waves</object>
<object name="waterCoastalWavesCheckbox" size="100%-56 190 100%-30 215" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetWaterCoastalWavesEnabled();</action>
<action on="Press">Engine.Renderer_SetWaterCoastalWavesEnabled(this.checked);</action>
</object>
<!-- Settings / Shadows -->
<object size="0 210 100%-80 235" type="text" style="RightLabelText" ghost="true">Water - Use Surface Shadows</object>
<object name="waterShadowsCheckbox" size="100%-56 215 100%-30 240" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 210 100%-80 235" type="text" style="ModernRightLabelText" ghost="true">Water - Use Surface Shadows</object>
<object name="waterShadowsCheckbox" size="100%-56 215 100%-30 240" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">if (Engine.Renderer_GetWaterShadowEnabled()) this.checked = true; else this.checked = false;</action>
<action on="Press">Engine.Renderer_SetWaterShadowEnabled(this.checked);</action>
</object>
<!-- Settings / Particles -->
<object size="0 235 100%-80 260" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
<object name="particlesCheckbox" size="100%-56 240 100%-30 265" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 235 100%-80 260" type="text" style="ModernRightLabelText" ghost="true">Enable Particles</object>
<object name="particlesCheckbox" size="100%-56 240 100%-30 265" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetParticlesEnabled();</action>
<action on="Press">Engine.Renderer_SetParticlesEnabled(this.checked);</action>
</object>
<!-- Settings / Unit Silhouettes -->
<object size="0 260 100%-80 285" type="text" style="RightLabelText" ghost="true">Enable Unit Silhouettes</object>
<object name="silhouettesCheckbox" size="100%-56 265 100%-30 290" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 260 100%-80 285" type="text" style="ModernRightLabelText" ghost="true">Enable Unit Silhouettes</object>
<object name="silhouettesCheckbox" size="100%-56 265 100%-30 290" type="checkbox" style="ModernTickBox" checked="true">
<action on="Load">this.checked = Engine.Renderer_GetSilhouettesEnabled();</action>
<action on="Press">Engine.Renderer_SetSilhouettesEnabled(this.checked);</action>
</object>
<!-- Settings / Music-->
<object size="0 285 100%-80 310" type="text" style="RightLabelText" ghost="true">Enable Music</object>
<object name="musicCheckbox" size="100%-56 290 100%-30 315" type="checkbox" style="StoneCrossBox" checked="true">
<object size="0 285 100%-80 310" type="text" style="ModernRightLabelText" ghost="true">Enable Music</object>
<object name="musicCheckbox" size="100%-56 290 100%-30 315" type="checkbox" style="ModernTickBox" checked="true">
<action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
</object>
<!-- Settings / Dev Overlay -->
<object size="0 310 100%-80 335" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
<object name="developerOverlayCheckbox" size="100%-56 315 100%-30 340" type="checkbox" style="StoneCrossBox" checked="false">
<object size="0 310 100%-80 335" type="text" style="ModernRightLabelText" ghost="true">Developer Overlay</object>
<object name="developerOverlayCheckbox" size="100%-56 315 100%-30 340" type="checkbox" style="ModernTickBox" checked="false">
<action on="Load"><![CDATA[
if (Engine.HasXmppClient() && Engine.IsRankedGame())
this.enabled = false;
@@ -668,7 +668,7 @@
<object size="50%-48 -26 50%+48 70" name="civIcon" type="image" tooltip_style="sessionToolTipBold"/>
<!-- Switch the view perspective to another player's (largely for AI development) -->
<object size="50%+50 5 50%+150 100%-5" name="viewPlayer" type="dropdown" hidden="true" style="StoneDropDown" tooltip_style="sessionToolTipBold" tooltip="Choose player to view">
<object size="50%+50 5 50%+150 100%-5" name="viewPlayer" type="dropdown" hidden="true" style="ModernDropDown" tooltip_style="sessionToolTipBold" tooltip="Choose player to view">
<action on="SelectionChange">selectViewPlayer(this.selected);</action>
</object>
@@ -683,7 +683,7 @@
<!-- ================================ ================================ -->
<!-- Displays Alpha name and number -->
<object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="CenteredLabelText" text_valign="top" ghost="true">
<object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="ModernLabelText" text_valign="top" ghost="true">
ALPHA XV : Osiris<!-- IMPORTANT: remember to update pregame/mainmenu.xml in sync with this -->
<!-- Displays build date and revision number-->
@@ -708,7 +708,7 @@
</action>
</object>
<object size="100%-380 40 100%-230 65" name="gameSpeed" type="dropdown" buffer_zone="5" style="StoneDropDown" hidden="true" tooltip="Choose game speed" tooltip_style="sessionToolTip"/>
<object size="100%-380 40 100%-230 65" name="gameSpeed" type="dropdown" buffer_zone="5" style="ModernDropDown" hidden="true" tooltip="Choose game speed" tooltip_style="sessionToolTip"/>
<!-- ================================ ================================ -->
<!-- Diplomacy Button -->
binaries/data/mods/public/gui/session/sprites.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<!-- Generic Panel -->
<sprite name="genericPanel">
<image
texture="global/tile/tile_dark.png"
texture="global/modern/background.png"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
binaries/data/mods/public/gui/splashscreen/splashscreen.xml
+4 -4
View File
@@ -5,17 +5,17 @@
<script file="gui/splashscreen/splashscreen.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" style="TranslucentPanel"/>
<object type="image" z="0" style="modernFade"/>
<object type="image" style="StoneDialog" size="50%-274 50%-200 50%+274 50%+200">
<object type="image" style="ModernDialog" size="50%-274 50%-200 50%+274 50%+200">
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">Welcome to 0 A.D. !</object>
<object type="image" sprite="BackgroundTranslucent" size="20 20 100%-20 100%-52">
<object name="mainText" type="text" style="textPanel"/>
<object size="8 100%-60 100% 100%">
<object size="0 20 100% 100%">
<object name="displaySplashScreenText" size="20 0 100% 100%" type="text" style="LeftLabelText">Show this message in the future</object>
<object name="displaySplashScreen" checked="true" size="0 50%-8 16 50%+8" type="checkbox" style="StoneCrossBox"/>
<object name="displaySplashScreenText" size="20 0 100% 100%" type="text" style="ModernLeftLabelText">Show this message in the future</object>
<object name="displaySplashScreen" checked="true" size="0 50%-8 16 50%+8" type="checkbox" style="ModernTickBox"/>
</object>
</object>
</object>
binaries/data/mods/public/gui/summary/sprites.xml
+8
View File
@@ -25,4 +25,12 @@
<image backcolor="gold" size="2 100%-2 100%-2 100%"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
</sprite>
<sprite name="ForegroundBox">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 100%-2 100%-2 100%"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
<image backcolor="gold" size="0 0 100% 100%"/>
</sprite>
</sprites>
binaries/data/mods/public/gui/summary/summary.xml
+473 -461
View File
File diff suppressed because it is too large Load Diff