Context Navigation

gamestates

Timestamp:

Oct 23, 2017, 2:22:13 PM (8 years ago)

Author:

patricwi

Message:

trunk merged into hud

Location:

code/branches/HUD_HS16

Files:

Property svn:mergeinfo changed

/code/branches/Alejandro_FS17 (added)	merged: 11369,11423,11427
/code/branches/BigShip_HS16 (added)	merged: 11213,11220,11228,11259,11268,11275,11291,11297,11302,11311,11320,11329
/code/branches/Dialogue_FS17 (added)	merged: 11360,11371,11377,11382,11384,11390,11393-11394,11401,11406-11408,11413,11415,11417,11421-11422,11428,11432-11433,11435
/code/branches/Highscore_HS16 (added)	merged: 11226,11233,11235,11245,11254,11265,11267,11304,11313,11315,11324,11326,11333
/code/branches/SpaceRace_HS16 (added)	merged: 11214,11224,11232,11238-11239,11246,11249-11250,11256,11260,11272,11276,11279,11281-11284,11289,11303,11306,11312,11322,11327-11328,11334,11337
/code/branches/StoryModeMap_HS16 (added)	merged: 11221,11229,11234,11242,11255,11269,11286,11299,11308,11316,11330
/code/branches/SuperOrxoBros_FS17 (added)	merged: 11365,11370,11378-11379,11381,11383,11392,11396-11398,11400,11402-11405,11409-11412,11414,11416,11418-11420,11426,11431
/code/trunk (added)	merged: 11353-11359,11372-11376,11447-11451,11493,11495

-                      r11336
+                      r11497
 #include "PlayerManager.h"
 #include "GSRoot.h"
-// #include "overlays/hud/HUDPickupSystem.h"
 namespace orxonox
 …
             InputManager::getInstance().leaveState("game");
-        // HUDPickupSystem* pickupSystem;
-        // for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
-        //     pickupSystem = hud;
-        // pickupSystem->repaint=false;
         // disconnect all HumanPlayers
         PlayerManager::getInstance().disconnectAllClients();

r11336	r11497
31	31
32	32	#include "OrxonoxPrereqs.h"
33		~~// #include "overlays/OverlaysPrereqs.h"~~
34	33
35	34	#include <string>

Note: See TracChangeset for help on using the changeset viewer.