Changeset 6150 for code/branches/presentation2/data/gui/layouts
- Timestamp:
- Nov 25, 2009, 4:52:37 PM (15 years ago)
-
merged menu branch to presentation2 branch with some additional fixes and features
- Location:
- code/branches/presentation2
- Files:
-
- 3 edited
- 13 copied
-
. (modified) (1 prop)
-
data/gui/layouts/DecisionPopup.layout (copied) (copied from code/branches/menu/data/gui/layouts/DecisionPopup.layout)
-
data/gui/layouts/InGameMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/InGameMenu.layout)
-
data/gui/layouts/MainMenu.layout (modified) (1 diff)
-
data/gui/layouts/MainMenuBackground.layout (copied) (copied from code/branches/menu/data/gui/layouts/MainMenuBackground.layout)
-
data/gui/layouts/NewAudioMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewAudioMenu.layout)
-
data/gui/layouts/NewControlsMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewControlsMenu.layout)
-
data/gui/layouts/NewCreditsMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewCreditsMenu.layout)
-
data/gui/layouts/NewGameplayMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewGameplayMenu.layout)
-
data/gui/layouts/NewGraphicsMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewGraphicsMenu.layout)
-
data/gui/layouts/NewMainMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewMainMenu.layout)
-
data/gui/layouts/NewMouseControlsMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewMouseControlsMenu.layout)
-
data/gui/layouts/NewMultiplayerMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewMultiplayerMenu.layout)
-
data/gui/layouts/NewSettingsMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewSettingsMenu.layout)
-
data/gui/layouts/NewSingleplayerMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/NewSingleplayerMenu.layout)
-
data/gui/layouts/QuestGUI.layout (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2
- Property svn:mergeinfo changed
/code/branches/ingamemenu (added) merged: 6003,6018-6020,6022-6023 /code/branches/menu (added) merged: 5941,5944,5952,6024,6032,6036,6047-6049,6051,6145-6146,6148
- Property svn:mergeinfo changed
-
code/branches/presentation2/data/gui/layouts/MainMenu.layout
r5781 r6150 1 1 <?xml version="1.0" ?> 2 2 <GUILayout> 3 <Window Type="TaharezLook/StaticImage" Name="orxonox/Background"> 4 <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/> 5 <Property Name="Image" Value="set:MainMenuBackground image:Background"/> 6 <Property Name="FrameEnabled" Value="set:true"/> 7 <Property Name="BackgroundEnabled" Value="set:false"/> 8 3 <Window Type="DefaultWindow" Name="orxonox/MainMenuRootWindow"> 4 <Property Name="InheritsAlpha" Value="false"/> 9 5 <Window Type="TaharezLook/Button" Name="orxonox/StandaloneButton"> 10 6 <Property Name="UnifiedPosition" Value="{{0.11,0},{0.3,0}}"/> -
code/branches/presentation2/data/gui/layouts/QuestGUI.layout
r5781 r6150 6 6 <Property Name="FrameEnabled" Value="set:true"/> 7 7 <Property Name="BackgroundEnabled" Value="set:false"/> 8 <Property Name="InheritsAlpha" Value="False" /> 8 9 9 10 <Window Type="TaharezLook/Titlebar" Name="orxonox/QuestGUI/Title">
Note: See TracChangeset
for help on using the changeset viewer.
