[Orxonox-commit 6566] r11206 - in code/branches/presentationFS16: . data/defaultConfig data/gui/layouts data/gui/scripts src/orxonox src/orxonox/gametypes src/orxonox/overlays
fvultier at orxonox.net
fvultier at orxonox.net
Thu May 26 16:15:54 CEST 2016
Author: fvultier
Date: 2016-05-26 16:15:54 +0200 (Thu, 26 May 2016)
New Revision: 11206
Added:
code/branches/presentationFS16/src/orxonox/LevelStatus.cc
code/branches/presentationFS16/src/orxonox/LevelStatus.h
code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.cc
code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.h
Modified:
code/branches/presentationFS16/
code/branches/presentationFS16/data/defaultConfig/orxonox.ini
code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout
code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua
code/branches/presentationFS16/data/gui/scripts/SingleplayerMenu.lua
code/branches/presentationFS16/src/orxonox/CMakeLists.txt
code/branches/presentationFS16/src/orxonox/LevelManager.cc
code/branches/presentationFS16/src/orxonox/LevelManager.h
code/branches/presentationFS16/src/orxonox/gametypes/Mission.cc
code/branches/presentationFS16/src/orxonox/gametypes/Mission.h
code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt
code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc
Log:
merged campain menu
Property changes on: code/branches/presentationFS16
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/AI_HS15:10640-10832
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/campaignHS15:10639-10973
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hoverHS15:10633-10959
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particleEffectsHS15:10644-10962
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/planetLevelHS15:10637-10966
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/presentationHS15:10959-11055
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/soundEffects:9382-11020
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
+ /code/branches/AI_HS15:10640-10832
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/bindermFS16:11139-11204
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/campaignHS15:10639-10973
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hoverHS15:10633-10959
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particleEffectsHS15:10644-10962
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/planetLevelHS15:10637-10966
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/presentationHS15:10959-11055
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/soundEffects:9382-11020
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
Modified: code/branches/presentationFS16/data/defaultConfig/orxonox.ini
===================================================================
--- code/branches/presentationFS16/data/defaultConfig/orxonox.ini 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/data/defaultConfig/orxonox.ini 2016-05-26 14:15:54 UTC (rev 11206)
@@ -7,4 +7,4 @@
campaignMissions_[5] = "iiiJohnVane_EscapeTheBastards.oxw"
campaignMissions_[6] = "expeditionSector.oxw"
campaignMissions_[7] = "shuttleAttack.oxw"
-campaignMissions_[8] = "shuttleRetaliation.oxw"
+campaignMissions_[8] = "shuttleRetaliation.oxw"
\ No newline at end of file
Modified: code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout 2016-05-26 14:15:54 UTC (rev 11206)
@@ -7,85 +7,97 @@
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
<Property Name="BackgroundEnabled" Value="False" />
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
<Property Name="Text" Value="Mission One" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.34,0},{0.3,0},{0.39,0}}" />
<Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
<Property Name="Text" Value="Fight in our Back" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
- <Property Name="Disabled" Value="True" />
+ <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.26,0},{0.4,0},{0.31,0}}" />
+ <Property Name="Disabled" Value="True"/>
<Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
<Property Name="Text" Value="Pirate Attack" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.42,0},{0.4,0},{0.47,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
<Property Name="Text" Value="Trip to Area 51" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.41,0},{0.26,0},{0.71,0},{0.31,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
<Property Name="Text" Value="Area 51 under Fire" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.41,0},{0.42,0},{0.71,0},{0.47,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
<Property Name="Text" Value="Escape the Bastards" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.10,0},{0.99,0},{0.15,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
<Property Name="Text" Value="Expedition to Sector 5C" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.18,0},{0.99,0},{0.23,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
<Property Name="Text" Value="Shuttle under Attack" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.50,0},{0.99,0},{0.55,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
</Window>
+
<Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
<Property Name="Text" Value="Retaliation" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.58,0},{0.99,0},{0.63,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
</Window>
-
<Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
<Property Name="Text" Value="Back" />
+ <Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
+ <Property Name="Visible" Value="True"/>
+ <Property Name="Disabled" Value="False"/>
<Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/>
</Window>
+
<Window Type="MenuWidgets/StaticText" Name="orxonox/CampaignMenuCongratulation" >
<Property Name="Text" Value="Campaign Completed!!!" />
<Property Name="Visible" Value="False"/>
Modified: code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua
===================================================================
--- code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua 2016-05-26 14:15:54 UTC (rev 11206)
@@ -16,35 +16,33 @@
P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
+end
- if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
- local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
- label:setProperty("Visible","True")
+function P.updateButton(index, button)
+ local lastMission = orxonox.LevelManager:getInstance():getLastWonMission()
+ if (lastMission == "") then
+ else
+ local lastwon =P.getIndexOfLastFinishedMission()
+ orxonox.LevelManager:getInstance():updatewon(lastwon)
end
-end
-function P.updateButton(index, button)
- if (P.shouldDisplayButton(index)) then
- button:setProperty("Visible", "True")
+ local test =orxonox.LevelManager:getInstance():missionactivate(index)
- if (P.shouldEnableButton(index)) then
- button:setProperty("Disabled", "False")
- end
+ if (test==1) then
+ button:setProperty("Visible", "True")
+ button:setProperty("Disabled", "False")
+ elseif (test==2) then
+ button:setProperty("Visible", "True")
+ button:setProperty("Disabled", "True")
+ else
+ button:setProperty("Visible", "False")
+ button:setProperty("Disabled", "True")
end
end
-function P.shouldDisplayButton(index)
- local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
- return index < size
-end
-
-function P.shouldEnableButton(index)
- return index <= P.getIndexOfLastFinishedMission() + 1
-end
-
function P.getIndexOfLastFinishedMission()
- local lastMission = orxonox.LevelManager:getInstance():getLastFinishedCampaignMission()
+ local lastMission = orxonox.LevelManager:getInstance():getLastWonMission()
if (lastMission and lastMission ~= "") then
local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
local index = 0
Modified: code/branches/presentationFS16/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/presentationFS16/data/gui/scripts/SingleplayerMenu.lua 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/data/gui/scripts/SingleplayerMenu.lua 2016-05-26 14:15:54 UTC (rev 11206)
@@ -171,7 +171,12 @@
end
function P.CampaignButton_clicked(e)
+-- P.test()
showMenuSheet("CampaignMenu", true)
end
+--function P.test()
+-- orxonox.CampaignMenu:test()
+--end
+
return P
Modified: code/branches/presentationFS16/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/presentationFS16/src/orxonox/CMakeLists.txt 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/CMakeLists.txt 2016-05-26 14:15:54 UTC (rev 11206)
@@ -25,6 +25,7 @@
SET_SOURCE_FILES(ORXONOX_SRC_FILES
Level.cc
LevelInfo.cc
+ LevelStatus.cc
LevelManager.cc
Main.cc
MoodManager.cc
@@ -57,6 +58,7 @@
FIND_HEADER_FILES
TOLUA_FILES
chat/ChatInputHandler.h
+ overlays/CampaignMenu.h
LevelInfo.h
LevelManager.h
MoodManager.h
@@ -64,6 +66,7 @@
infos/PlayerInfo.h
sound/SoundManager.h
controllers/ScriptController.h
+ overlays/CampaignMenu.h
PCH_FILE
OrxonoxPrecompiledHeaders.h
LINK_LIBRARIES
Modified: code/branches/presentationFS16/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/presentationFS16/src/orxonox/LevelManager.cc 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/LevelManager.cc 2016-05-26 14:15:54 UTC (rev 11206)
@@ -23,6 +23,7 @@
* Fabian 'x3n' Landau
* Co-authors:
* Damian 'Mozork' Frick
+ * Matthias Binder
*
*/
@@ -32,6 +33,7 @@
*/
#include "LevelManager.h"
+#include "LevelStatus.h"
#include <map>
@@ -46,8 +48,13 @@
#include "Level.h"
#include "PlayerManager.h"
+
namespace orxonox
{
+
+
+
+
SetCommandLineArgument(level, "").shortcut("l").information("Default level file (overrides LevelManager::defaultLevelName_ configValue)");
ManageScopedSingleton(LevelManager, ScopeID::ROOT, false);
@@ -63,6 +70,8 @@
RegisterObject(LevelManager);
this->setConfigValues();
+
+
// check override
if (!CommandLineParser::getArgument("level")->hasDefaultValue())
{
@@ -72,13 +81,20 @@
this->compileAvailableLevelList();
this->nextIndex_ = 0;
this->nextLevel_ = this->availableLevels_.begin();
+
+ buildallLevelStatus();
}
+
LevelManager::~LevelManager()
{
// Delete all the LevelInfoItem objects because the LevelManager created them
for (LevelInfoItem* info : availableLevels_)
info->destroy();
+ for(unsigned int i = 0; i<allLevelStatus_.size();++i)
+ {
+ allLevelStatus_[i]->destroy();
+ }
}
/**
@@ -87,21 +103,15 @@
*/
void LevelManager::setConfigValues()
{
+
SetConfigValue(defaultLevelName_, "missionOne.oxw")
.description("Sets the pre selection of the level in the main menu.");
- SetConfigValue(lastFinishedCampaignMission_, "")
+ SetConfigValue(lastWonMission_, "")
.description("The last finished mission of a campaign");
SetConfigValue(campaignMissions_, std::vector<std::string>())
.description("The list of missions in the campaign");
}
- /**
- * @brief Stores the argument in the corresponding config value.
- */
- void LevelManager::setLastFinishedCampaignMission(const std::string& lastFinishedCampaignMission)
- {
- ModifyConfigValue(lastFinishedCampaignMission_, set, lastFinishedCampaignMission);
- }
/**
@brief
@@ -168,6 +178,7 @@
*/
void LevelManager::activateNextLevel()
{
+
if (this->levels_.size() > 0)
{
// Activate the level that is the first in the list of levels whose activity has been requested.
@@ -316,4 +327,119 @@
{
//TODO: Implement some kind of update?
}
+
+
+
+ /**
+ @brief
+ first updates allLevelStatus and then check if the level with index i is activated
+ */
+ int LevelManager::missionactivate(int index)
+ {
+ updateAllLevelStatus();
+ int activated = allLevelStatus_[index]->activated;
+ return activated;
+ }
+ /**
+ @brief
+ update the last won mission to won=true
+ */
+
+ void LevelManager::updatewon(int lastwon)
+ {
+ allLevelStatus_[lastwon]->won=true;
+
+ }
+
+ /**
+ @brief
+ checks if a level is won
+ if a level is won, the other levels should be shown as saved in 'nextLevels' of the won level
+ therefore 'activated' of all other levels will be updated to the correct value
+ if more than one level is won, the level with the highes index decides which other levels will be shown, activated or not activated
+ */
+
+ void LevelManager::updateAllLevelStatus()
+ {
+ for(unsigned int i =0;i<allLevelStatus_.size();i++)
+ {
+ if(allLevelStatus_[i]->won)
+ {
+ allLevelStatus_[i]->activated=1;
+ std::vector<int> nextLevels=allLevelStatus_[i]->nextLevels;
+ for(unsigned int j=0;j<allLevelStatus_.size();j++)
+ {
+ allLevelStatus_[j]->activated=nextLevels[j];
+ }
+ }
+ }
+ }
+
+ /**
+ @brief
+ the name of the last won mission is saved in the config file
+ */
+
+ void LevelManager::setLevelStatus(const std::string& LevelWon)
+ {
+
+
+ ModifyConfigValue(lastWonMission_, set, LevelWon);
+
+ /**
+ TODO: save allLevelWon_ into the config file
+ */
+ }
+
+
+ /**
+ @brief
+ build up allLevelStatus_
+ has to be done once per game (not per level)
+ all connections between the levels are saved in the allLevelStatus_
+ also the won variable of the LevelStatus have to be set to the corresponding allLevelWon_ values
+ */
+ void LevelManager::buildallLevelStatus()
+ {
+ for(unsigned int i =0;i<campaignMissions_.size();++i)
+ {
+ LevelStatus* level= new LevelStatus(this->getContext());
+ allLevelStatus_.push_back(level);
+ }
+
+ /**
+ TODO: allLevelWon_ should be loaded into the allLevelSatus_ such that the progress of the campaign can be saved
+ */
+
+ allLevelStatus_[0]->activated=1;
+
+
+ std::vector<int> v={1,1,1,0,0,0,0,0,0};
+ allLevelStatus_[0]->nextLevels=v;
+
+ v={1,1,2,1,0,0,0,0,0};
+ allLevelStatus_[1]->nextLevels=v;
+
+ v={1,2,1,0,1,0,0,0,0};
+ allLevelStatus_[2]->nextLevels=v;
+
+ v={1,1,2,1,0,1,1,0,0};
+ allLevelStatus_[3]->nextLevels=v;
+
+ v={1,2,1,0,1,0,0,1,1};
+ allLevelStatus_[4]->nextLevels=v;
+
+ v={1,1,2,1,0,1,2,0,0};
+ allLevelStatus_[5]->nextLevels=v;
+
+ v={1,1,2,1,0,2,1,0,0};
+ allLevelStatus_[6]->nextLevels=v;
+
+ v={1,2,1,0,1,0,0,1,2};
+ allLevelStatus_[7]->nextLevels=v;
+
+ v={1,2,1,0,1,0,0,2,1};
+ allLevelStatus_[8]->nextLevels=v;
+
+ }
}
Modified: code/branches/presentationFS16/src/orxonox/LevelManager.h
===================================================================
--- code/branches/presentationFS16/src/orxonox/LevelManager.h 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/LevelManager.h 2016-05-26 14:15:54 UTC (rev 11206)
@@ -23,6 +23,7 @@
* Fabian 'x3n' Landau
* Co-authors:
* Damian 'Mozork' Frick
+ * Matthias Binder
*
*/
@@ -46,7 +47,9 @@
#include "util/Singleton.h"
#include "core/config/Configurable.h"
+#include "LevelStatus.h"
+
// tolua_begin
namespace orxonox
{
@@ -62,8 +65,13 @@
@author
Damian 'Mozork' Frick
- @ingroup Orxonox
+
+ @ingroup Orxonox1
*/
+
+
+
+
class _OrxonoxExport LevelManager
// tolua_end
: public Singleton<LevelManager>, public Configurable
@@ -73,13 +81,21 @@
LevelManager();
virtual ~LevelManager();
+ void buildallLevelStatus();
+ void updateAllLevelStatus();
+ void setLevelStatus(const std::string& LevelWon);
+
+
void setConfigValues(); //!< Set the config values for this object.
void requestActivity(Level* level); //!< Request activity for the input Level.
void releaseActivity(Level* level); //!< Release activity for the input Level.
+
Level* getActiveLevel(); //!< Get the currently active Level.
// tolua_begin
+ void updatewon(int lastwon);
+ int missionactivate(int index);
void setDefaultLevel(const std::string& levelName); //!< Set the default Level.
/**
@brief Get the default level.
@@ -90,15 +106,16 @@
unsigned int getNumberOfLevels(void);
LevelInfoItem* getAvailableLevelListItem(unsigned int index); //!< Get the LevelInfoItem at the given index in the list of available Levels.
- void setLastFinishedCampaignMission(const std::string& lastFinishedCampaignMission);
- inline const std::string& getLastFinishedCampaignMission() const
- { return this->lastFinishedCampaignMission_; }
+ inline const std::string& getLastWonMission() const
+ { return this->lastWonMission_; }
inline unsigned int getNumberOfCampaignMissions()
{ return this->campaignMissions_.size(); }
+
inline const std::string& getCampaignMission(unsigned int index)
{ return this->campaignMissions_[index]; }
+
/**
@brief Get the instance of the LevelManager.
@return Returns the instance of the LevelManager.
@@ -126,9 +143,13 @@
// config values
std::string defaultLevelName_;
- std::string lastFinishedCampaignMission_;
+ std::string lastWonMission_;
std::vector<std::string> campaignMissions_;
+ std::vector<int> allLevelWon_; //level i is won if allLevelWon_[i]=1
+ std::vector<LevelStatus*> allLevelStatus_;
+
+
static LevelManager* singletonPtr_s;
}; // tolua_export
} // tolua_export
Copied: code/branches/presentationFS16/src/orxonox/LevelStatus.cc (from rev 11204, code/branches/bindermFS16/src/orxonox/LevelStatus.cc)
===================================================================
--- code/branches/presentationFS16/src/orxonox/LevelStatus.cc (rev 0)
+++ code/branches/presentationFS16/src/orxonox/LevelStatus.cc 2016-05-26 14:15:54 UTC (rev 11206)
@@ -0,0 +1,64 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Matthias Binder
+ *
+ */
+
+
+
+
+#include "LevelStatus.h"
+
+#include <map>
+
+#include "core/singleton/ScopedSingletonIncludes.h"
+#include "core/commandline/CommandLineIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
+#include "core/ClassTreeMask.h"
+#include "core/Loader.h"
+#include "core/Resource.h"
+#include "core/XMLFile.h"
+#include "Level.h"
+#include "PlayerManager.h"
+
+namespace orxonox
+{
+ RegisterClass(LevelStatus);
+
+
+ /**
+ @brief
+ Constructor. sets config values and initializes variables.
+ */
+ LevelStatus::LevelStatus(Context* context) : BaseObject(context)
+ {
+ RegisterObject(LevelStatus);
+ this->won = false;
+ this->nextLevels.insert(this->nextLevels.begin(),1);
+ this->activated=0;
+ }
+
+ LevelStatus::~LevelStatus()
+ {}
+}
Copied: code/branches/presentationFS16/src/orxonox/LevelStatus.h (from rev 11204, code/branches/bindermFS16/src/orxonox/LevelStatus.h)
===================================================================
--- code/branches/presentationFS16/src/orxonox/LevelStatus.h (rev 0)
+++ code/branches/presentationFS16/src/orxonox/LevelStatus.h 2016-05-26 14:15:54 UTC (rev 11206)
@@ -0,0 +1,69 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Matthias Binder
+ *
+ */
+
+
+#ifndef _LevelStatus_H__
+#define _LevelStatus_H__
+
+
+#include "OrxonoxPrereqs.h"
+
+#include <cassert>
+#include <list>
+#include <map>
+#include <string>
+
+#include "LevelInfo.h"
+
+#include "util/Singleton.h"
+#include "core/config/Configurable.h"
+
+
+namespace orxonox
+{
+
+ /**
+ @brief
+ LevelStatus:
+ In the LevelStatus class all necessary information of a mission in the campaign is saved.
+ It is only used in the LevelManager to save the progress of the campaign. It is now possible to have a treelike campaign menu structure.
+
+ */
+
+
+ class _OrxonoxExport LevelStatus : public BaseObject
+ {
+ public:
+ LevelStatus(Context* context);
+ virtual ~LevelStatus();
+
+ bool won; //if the Level is won or not
+ std::vector<int> nextLevels; //if this Level is won, the ith element of this vector shows, what to do with the other leves
+ int activated; //0 not activated, 1 activated, 2 visible
+ };
+}
+
+#endif /* _LevelStatus_H__ */
Modified: code/branches/presentationFS16/src/orxonox/gametypes/Mission.cc
===================================================================
--- code/branches/presentationFS16/src/orxonox/gametypes/Mission.cc 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/gametypes/Mission.cc 2016-05-26 14:15:54 UTC (rev 11206)
@@ -90,7 +90,10 @@
{
this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
- LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
+ //LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
+
+ //gibt index von bestandenem level weiter
+ LevelManager::getInstance().setLevelStatus(this->getFilename());
}
else if (!this->gtinfo_->hasEnded())
this->gtinfo_->sendAnnounceMessage("Mission failed!");
Modified: code/branches/presentationFS16/src/orxonox/gametypes/Mission.h
===================================================================
--- code/branches/presentationFS16/src/orxonox/gametypes/Mission.h 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/gametypes/Mission.h 2016-05-26 14:15:54 UTC (rev 11206)
@@ -44,7 +44,7 @@
virtual void tick(float dt) override;
virtual void start() override;
- virtual void end() override;
+ virtual void end() override; //checks if the mission was accomplished and sends the name of the won mission to the LevelManager
virtual void setTeams();
virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
inline void setLives(unsigned int amount)
Modified: code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt
===================================================================
--- code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt 2016-05-26 14:15:54 UTC (rev 11206)
@@ -2,6 +2,7 @@
GUISheet.cc
OrxonoxOverlay.cc
OverlayGroup.cc
+ CampaignMenu.cc
#COMPILATION_BEGIN OverlayCompilation.cc
InGameConsole.cc
Copied: code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.cc (from rev 11204, code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc)
===================================================================
--- code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.cc (rev 0)
+++ code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.cc 2016-05-26 14:15:54 UTC (rev 11206)
@@ -0,0 +1,63 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Matthias Binder
+ *
+ */
+
+
+#include "CampaignMenu.h"
+
+#include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
+#include "core/XMLPort.h"
+#include "core/GameMode.h"
+
+
+namespace orxonox
+{
+
+
+ RegisterClass(CampaignMenu);
+
+ CampaignMenu::CampaignMenu(Context* context)
+ :BaseObject(context)
+
+ {
+ RegisterObject(CampaignMenu);
+ }
+
+ CampaignMenu::~CampaignMenu()
+ {}
+
+ void CampaignMenu::test()
+ {
+ orxout()<<"test"<< endl;
+ }
+
+
+ //loads the new campaign menu
+ void CampaignMenu::loadnewmenu()
+ {
+
+ }
+}
Copied: code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.h (from rev 11204, code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h)
===================================================================
--- code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.h (rev 0)
+++ code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.h 2016-05-26 14:15:54 UTC (rev 11206)
@@ -0,0 +1,53 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Matthias Binder
+ *
+ */
+
+#ifndef _CampaignMenu_H__
+#define _CampaignMenu_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "core/BaseObject.h"
+#include "util/Singleton.h"
+
+//tolua_begin
+namespace orxonox
+{
+//tolua_end
+class _OrxonoxExport CampaignMenu : public BaseObject //tolua_export
+ { //tolua_export
+ public:
+ CampaignMenu(Context* context);
+ ~CampaignMenu();
+ static void test(); //tolua_export
+ void loadnewmenu();
+ }; //tolua_export
+
+
+
+} //tolua_export
+
+#endif /* _CampaignMenu_H__ */
Modified: code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc
===================================================================
--- code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc 2016-05-26 13:58:37 UTC (rev 11205)
+++ code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc 2016-05-26 14:15:54 UTC (rev 11206)
@@ -32,11 +32,15 @@
#include "core/GUIManager.h"
#include "core/XMLPort.h"
#include "core/GameMode.h"
+#include "core/command/ConsoleCommandIncludes.h"
namespace orxonox
{
+
+
RegisterClass(GUISheet);
+
GUISheet::GUISheet(Context* context)
: BaseObject(context)
, bShowOnLoad_(false)
@@ -94,4 +98,5 @@
this->bHidePreviousSet_ = true;
// Note: This call has no effect when already showing!
}
+
}
More information about the Orxonox-commit
mailing list