- Timestamp:
- Feb 14, 2018, 11:31:43 PM (6 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/CampaignMap_HS17 (added) merged: 11458,11507,11512-11513,11525-11527,11544-11545,11560,11564,11584,11588,11605,11634,11636,11663,11675-11676
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h
r11359 r11743 41 41 virtual ~StoryMode() {} 42 42 static void exit(); 43 // virtual void playerEntered(PlayerInfo* player); 43 44 44 45
Note: See TracChangeset
for help on using the changeset viewer.