[Orxonox-commit 6731] r11359 - in code/trunk: . data/gui/layouts data/gui/schemes data/gui/scripts data/levels data/levels/templates data/overlays src/orxonox/gametypes
patricwi at orxonox.net
patricwi at orxonox.net
Thu Mar 9 16:30:11 CET 2017
Author: patricwi
Date: 2017-03-09 16:30:11 +0100 (Thu, 09 Mar 2017)
New Revision: 11359
Added:
code/trunk/data/levels/StoryModeMap.oxw
code/trunk/data/levels/templates/StoryMode.oxt
code/trunk/data/overlays/StoryModeHUD.oxo
code/trunk/src/orxonox/gametypes/StoryMode.cc
code/trunk/src/orxonox/gametypes/StoryMode.h
Modified:
code/trunk/
code/trunk/data/gui/layouts/CampaignMenu.layout
code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme
code/trunk/data/gui/schemes/OrxonoxLook.scheme
code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme
code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme
code/trunk/data/gui/schemes/TaharezGreenLook.scheme
code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme
code/trunk/data/gui/schemes/TaharezLook.scheme
code/trunk/data/gui/scripts/CampaignMenu.lua
code/trunk/data/gui/scripts/SingleplayerMenu.lua
code/trunk/src/orxonox/gametypes/CMakeLists.txt
Log:
story mode map merged
Property changes on: code/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/AI_HS15:10640-10832
/code/branches/BigShip_HS16:11213-11356
/code/branches/HUD_HS16:11212-11353
/code/branches/Highscore_HS16:11226-11355
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/SpaceRace_HS16:11214-11357
/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/BigShip_HS16:11213-11356
/code/branches/HUD_HS16:11212-11353
/code/branches/Highscore_HS16:11226-11355
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/SpaceRace_HS16:11214-11357
/code/branches/StoryModeMap_HS16:11221-11358
/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
Modified: code/trunk/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/trunk/data/gui/layouts/CampaignMenu.layout 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/layouts/CampaignMenu.layout 2017-03-09 15:30:11 UTC (rev 11359)
@@ -7,83 +7,163 @@
<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" >
+
+ <!-- Misson 1************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Text" >
<Property Name="Text" Value="Mission One" />
<Property Name="Visible" Value="False"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
+ </Window>
+
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission1Button" >
+ <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.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
<Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
+
+ <!-- Misson 2************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Text" >
<Property Name="Text" Value="Fight in our Back" />
<Property Name="Visible" Value="False"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
+ </Window>
+
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
+ <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="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
+
+ <!-- Misson 3************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Text" >
<Property Name="Text" Value="Pirate Attack" />
<Property Name="Visible" Value="False"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.75,0},{0.8,0},{0.8,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
+
+ <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.685,0},{0.605,0},{0.75,0},{0.71,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
+
+ <!-- Misson 4************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Text" >
<Property Name="Text" Value="Trip to Area 51" />
<Property Name="Visible" Value="False"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.575,0},{0.5,0},{0.775,0},{0.55,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
+
+ <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.78,0},{0.48,0},{0.87,0},{0.59,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
+
+ <!-- Misson 5************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Text" >
<Property Name="Text" Value="Area 51 under Fire" />
<Property Name="Visible" Value="False"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.625,0},{0.4,0},{0.825,0},{0.45,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
+
+ <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.725,0},{0.27,0},{0.775,0},{0.37,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
+
+ <!-- Misson 6************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Text" >
<Property Name="Text" Value="Escape the Bastards" />
<Property Name="Visible" Value="False"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.1,0},{0.725,0},{0.15,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
+
+ <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.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
+
+ <!-- Misson 7************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Text" >
<Property Name="Text" Value="Expedition to Sector 5C" />
<Property Name="Visible" Value="False"/>
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission7Button" >
+
+ <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.47,0},{0.13,0},{0.525,0},{0.23,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
+
+ <!-- Misson 8************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Text" >
<Property Name="Text" Value="Shuttle under Attack" />
<Property Name="Visible" Value="False"/>
+ <Property Name="Disabled" Value="True" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.45,0},{0.25,0}}" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission8Button" >
+
+ <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.33,0},{0.1,0},{0.38,0},{0.18,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
+
+ <!-- Misson 9************************************* -->
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Text" >
<Property Name="Text" Value="Retaliation" />
<Property Name="Visible" Value="False"/>
+ <Property Name="Disabled" Value="True" />
+ <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.145,0},{0.3,0},{0.195,0}}" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
+ </Window>
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission9Button" >
+
+ <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.18,0},{0.07,0},{0.24,0},{0.145,0}}" />
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
</Window>
-
+ <!-- Back Button************************************* -->
<Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
<Property Name="Text" Value="Back" />
<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="UnifiedAreaRect" Value="{{0.75,0},{0.9,0},{0.95,0},{0.95,0}}" />
<Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/>
</Window>
<Window Type="MenuWidgets/StaticText" Name="orxonox/CampaignMenuCongratulation" >
Modified: code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme
===================================================================
--- code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -39,4 +39,6 @@
<WindowAlias Alias="HUDWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
<WindowAlias Alias="HUDWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
<WindowAlias Alias="HUDWidgets/Tree" Target="OrxonoxLook/Tree" />
+
+ <WindowAlias Alias="HUDWidgets/ImageButton" Target="OrxonoxLook/JuuButton" />
</GUIScheme>
Modified: code/trunk/data/gui/schemes/OrxonoxLook.scheme
===================================================================
--- code/trunk/data/gui/schemes/OrxonoxLook.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/OrxonoxLook.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -49,5 +49,9 @@
<FalagardMapping WindowType="OrxonoxLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="OrxonoxLook/AltProgressBar" />
<FalagardMapping WindowType="OrxonoxLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="OrxonoxLook/VUMeter" />
<FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="OrxonoxLook/LargeVerticalScrollbar" />
- <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
+ <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
+
+ <!-- Special Button for CampaignMenu -->
+ <FalagardMapping WindowType="OrxonoxLook/JuuButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="OrxonoxLook/JuuButton" />
+
</GUIScheme>
Modified: code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme
===================================================================
--- code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -39,4 +39,6 @@
<WindowAlias Alias="MenuWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
<WindowAlias Alias="MenuWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
<WindowAlias Alias="MenuWidgets/Tree" Target="OrxonoxLook/Tree" />
+
+ <WindowAlias Alias="MenuWidgets/JuuButton" Target="OrxonoxLook/JuuButton" />
</GUIScheme>
Modified: code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme
===================================================================
--- code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -39,4 +39,6 @@
<WindowAlias Alias="HUDWidgets/Titlebar" Target="TaharezGreenLook/Titlebar" />
<WindowAlias Alias="HUDWidgets/Tooltip" Target="TaharezGreenLook/Tooltip" />
<WindowAlias Alias="HUDWidgets/Tree" Target="TaharezGreenLook/Tree" />
+
+ <WindowAlias Alias="HUDWidgets/ImageButton" Target="TaharezGreenLook/JuuButton" />
</GUIScheme>
Modified: code/trunk/data/gui/schemes/TaharezGreenLook.scheme
===================================================================
--- code/trunk/data/gui/schemes/TaharezGreenLook.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/TaharezGreenLook.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -50,4 +50,7 @@
<FalagardMapping WindowType="TaharezGreenLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezGreenLook/VUMeter" />
<FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezGreenLook/LargeVerticalScrollbar" />
<FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezGreenLook/LargeVerticalScrollbarThumb" />
+
+ <!-- Special Button for CampaignMenu -->
+ <FalagardMapping WindowType="TaharezGreenLook/JuuButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="TaharezGreenLook/JuuButton" />
</GUIScheme>
Modified: code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme
===================================================================
--- code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -39,4 +39,6 @@
<WindowAlias Alias="MenuWidgets/Titlebar" Target="TaharezGreenLook/Titlebar" />
<WindowAlias Alias="MenuWidgets/Tooltip" Target="TaharezGreenLook/Tooltip" />
<WindowAlias Alias="MenuWidgets/Tree" Target="TaharezGreenLook/Tree" />
+
+ <WindowAlias Alias="MenuWidgets/JuuButton" Target="TaharezGreenLook/JuuButton" />
</GUIScheme>
Modified: code/trunk/data/gui/schemes/TaharezLook.scheme
===================================================================
--- code/trunk/data/gui/schemes/TaharezLook.scheme 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/schemes/TaharezLook.scheme 2017-03-09 15:30:11 UTC (rev 11359)
@@ -50,4 +50,5 @@
<FalagardMapping WindowType="TaharezLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
+
</GUIScheme>
Modified: code/trunk/data/gui/scripts/CampaignMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/CampaignMenu.lua 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/scripts/CampaignMenu.lua 2017-03-09 15:30:11 UTC (rev 11359)
@@ -8,14 +8,23 @@
function P.updateButtons()
P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
+ P.updateButton(0, winMgr:getWindow("orxonox/Mission1Text"))
P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
+ P.updateButton(1, winMgr:getWindow("orxonox/Mission2Text"))
P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
+ P.updateButton(2, winMgr:getWindow("orxonox/Mission3Text"))
P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
+ P.updateButton(3, winMgr:getWindow("orxonox/Mission4Text"))
P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
+ P.updateButton(4, winMgr:getWindow("orxonox/Mission5Text"))
P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
+ P.updateButton(5, winMgr:getWindow("orxonox/Mission6Text"))
P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
+ P.updateButton(6, winMgr:getWindow("orxonox/Mission7Text"))
P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
+ P.updateButton(7, winMgr:getWindow("orxonox/Mission8Text"))
P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
+ P.updateButton(8, winMgr:getWindow("orxonox/Mission9Text"))
if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
@@ -96,7 +105,7 @@
end
function P.loadLevel(level)
- orxonox.execute("startGame " .. level:getXMLFilename())
+ orxonox.execute("changeGame " .. level:getXMLFilename())
hideAllMenuSheets()
end
@@ -117,7 +126,8 @@
end
function P.CampaignMenuBackButton_clicked(e)
- hideMenuSheet(P.name)
+ orxonox.execute("startMainMenu")
+ hideMenuSheet("CampaignMenu")
end
return P
\ No newline at end of file
Modified: code/trunk/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/SingleplayerMenu.lua 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/data/gui/scripts/SingleplayerMenu.lua 2017-03-09 15:30:11 UTC (rev 11359)
@@ -171,7 +171,9 @@
end
function P.CampaignButton_clicked(e)
- showMenuSheet("CampaignMenu", true)
+ -- showMenuSheet("CampaignMenu", true)
+ hideAllMenuSheets()
+ orxonox.execute("startGame StoryModeMap.oxw")
end
return P
Copied: code/trunk/data/levels/StoryModeMap.oxw (from rev 11358, code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw)
===================================================================
--- code/trunk/data/levels/StoryModeMap.oxw (rev 0)
+++ code/trunk/data/levels/StoryModeMap.oxw 2017-03-09 15:30:11 UTC (rev 11359)
@@ -0,0 +1,94 @@
+
+
+<LevelInfo
+ name = "StoryModeMap"
+ description = "The Campaign Menu Map with all the Campaignmissons in it"
+ tags = "Campaign, Campaignmissons"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("StoryModeHUD.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/StoryMode.oxt")
+
+ include("templates/lodInformation.oxt")
+?>
+
+<Level
+gametype = StoryMode
+>
+
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "0.2, 0.2, 0.2"
+ skybox = "Orxonox/Starbox"
+ >
+
+
+<StaticEntity position="0,0,0" direction="0,0,0" >
+ <attached>
+
+ <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="600,370,-80" material="Flares/lensflare" scale=4.5 />
+
+ <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="100,350,-330" material="Flares/lensflare" scale=4.5 />
+
+ <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="-600,250,-580" material="Flares/lensflare" scale=5 />
+
+ <Model position="-1000,50,-750" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="-1000,50,-830" material="Flares/lensflare" scale=5 />
+
+ <Model position="-900,-400,-1000" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="-900,-400,-1080" material="Flares/lensflare" scale=5 />
+
+ <Model position="-500,-700,-1250" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="-500,-700,-1330" material="Flares/lensflare" scale=5 />
+
+ <Model position="0,-900,-1500" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="0,-900,-1580" material="Flares/lensflare" scale=5 />
+
+ <Model position="700,-1100,-1750" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="700,-1100,-1830" material="Flares/lensflare" scale=5 />
+
+ <Model position="1500,-1300,-2000" mesh="planets/moon.mesh" scale=100 />
+ <Billboard colour="1,1,0.05" position="1500,-1300,-2080" material="Flares/lensflare" scale=5 />
+
+ </attached>
+</StaticEntity>
+
+
+
+
+
+
+
+
+<Template name=spaceshipassff>
+ <ControllableEntity
+ camerapositiontemplate = spaceshipassffcameras
+
+
+ >
+
+ </ControllableEntity>
+
+
+</Template>
+
+
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+
+ <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
+
+ </Scene>
+</Level>
+
Copied: code/trunk/data/levels/templates/StoryMode.oxt (from rev 11358, code/branches/StoryModeMap_HS16/data/levels/templates/StoryMode.oxt)
===================================================================
--- code/trunk/data/levels/templates/StoryMode.oxt (rev 0)
+++ code/trunk/data/levels/templates/StoryMode.oxt 2017-03-09 15:30:11 UTC (rev 11359)
@@ -0,0 +1,21 @@
+<Template name=StoryMode>
+ <SpaceShip
+ hudtemplate = StoryModeMap
+ camerapositiontemplate = spaceshipghostcameras
+
+ >
+
+
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipghostcameras defaults=0>
+ <SpaceShip>
+ <camerapositions>
+ <CameraPosition position="0,20,80" drag=true mouselook=true />
+ <CameraPosition position="0,40,160" drag=true mouselook=true />
+ <CameraPosition position="0,50,200" drag=true mouselook=true />
+ </camerapositions>
+ </SpaceShip>
+</Template>
+
Copied: code/trunk/data/overlays/StoryModeHUD.oxo (from rev 11358, code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo)
===================================================================
--- code/trunk/data/overlays/StoryModeHUD.oxo (rev 0)
+++ code/trunk/data/overlays/StoryModeHUD.oxo 2017-03-09 15:30:11 UTC (rev 11359)
@@ -0,0 +1,14 @@
+
+<Template name="StoryModeMap">
+ <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+ <Map />
+
+
+ <GUIOverlay
+ name = "CampaignMenu"
+ guiname = "CampaignMenu"
+ visible = "true"
+ />
+
+ </OverlayGroup>
+</Template>
Modified: code/trunk/src/orxonox/gametypes/CMakeLists.txt
===================================================================
--- code/trunk/src/orxonox/gametypes/CMakeLists.txt 2017-03-09 15:22:19 UTC (rev 11358)
+++ code/trunk/src/orxonox/gametypes/CMakeLists.txt 2017-03-09 15:30:11 UTC (rev 11359)
@@ -10,4 +10,5 @@
LastTeamStanding.cc
TeamGametype.cc
Mission.cc
+ StoryMode.cc
)
Copied: code/trunk/src/orxonox/gametypes/StoryMode.cc (from rev 11358, code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc)
===================================================================
--- code/trunk/src/orxonox/gametypes/StoryMode.cc (rev 0)
+++ code/trunk/src/orxonox/gametypes/StoryMode.cc 2017-03-09 15:30:11 UTC (rev 11359)
@@ -0,0 +1,100 @@
+/*
+ * 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:
+ * Marvin Haeberle & Julian Huwyler
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "StoryMode.h"
+
+#include "items/Engine.h"
+#include "controllers/ArtificialController.h"
+
+#include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
+#include "infos/PlayerInfo.h"
+#include "network/Host.h"
+#include "worldentities/pawns/Pawn.h"
+#include "LevelManager.h"
+
+namespace orxonox
+{
+
+ SetConsoleCommand("StoryMode", "exit", &StoryMode::exit);
+ RegisterUnloadableClass(StoryMode);
+
+ StoryMode::StoryMode(Context* context) : Gametype(context)
+ {
+ RegisterObject(StoryMode);
+
+ this->gtinfo_ = new GametypeInfo(context);
+ this->bAutoStart_ = true;
+ this->bForceSpawn_ = true;
+ }
+
+
+ /*
+ void StoryMode::start()
+ {
+ Gametype::start();
+
+ this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
+ }
+*/
+ void StoryMode::exit()
+ {
+ orxout() << "s funktioniert"<< endl;
+ for (StoryMode* mission : ObjectList<StoryMode>())
+ { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
+ mission->end();
+ }
+ //Gametype::end();
+ }
+/*
+ void Mission::setTeams()
+ { //Set pawn-colours
+ for (Pawn* pawn : ObjectList<Pawn>())
+ {
+ if (!pawn)
+ continue;
+ this->setDefaultObjectColour(pawn);
+ }
+ }
+ void Mission::endMission(bool accomplished)
+ {
+ for (Mission* mission : ObjectList<Mission>())
+ { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
+ mission->setMissionAccomplished(accomplished);
+ mission->end();
+ }
+ }
+
+ void Mission::setLivesWrapper(unsigned int amount)
+ {
+ for (Mission* mission : ObjectList<Mission>())
+ { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would affect ALL missions!
+ mission->setLives(amount);
+ }
+ }*/
+}
Copied: code/trunk/src/orxonox/gametypes/StoryMode.h (from rev 11358, code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h)
===================================================================
--- code/trunk/src/orxonox/gametypes/StoryMode.h (rev 0)
+++ code/trunk/src/orxonox/gametypes/StoryMode.h 2017-03-09 15:30:11 UTC (rev 11359)
@@ -0,0 +1,49 @@
+/*
+ * 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:
+ * Julian Huwyler & Marvin Haeberle
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Mission_H__
+#define _Mission_H__
+
+#include "OrxonoxPrereqs.h"
+#include "Gametype.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport StoryMode : public Gametype
+ {
+ public:
+ StoryMode(Context* context);
+ virtual ~StoryMode() {}
+ static void exit();
+
+
+ };
+}
+
+#endif /* _Mission_H__ */
+
More information about the Orxonox-commit
mailing list