[Orxonox-commit 6943] r11564 - in code/branches/CampaignMap_HS17: data/levels src/modules/overlays/hud
fanconic at orxonox.net
fanconic at orxonox.net
Mon Nov 20 13:27:34 CET 2017
Author: fanconic
Date: 2017-11-20 13:27:33 +0100 (Mon, 20 Nov 2017)
New Revision: 11564
Modified:
code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw
code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc
code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h
Log:
small changes
Modified: code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw 2017-11-20 12:06:08 UTC (rev 11563)
+++ code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw 2017-11-20 12:27:33 UTC (rev 11564)
@@ -1,5 +1,5 @@
<LevelInfo
- name = "Nikola's StoryMode"
+ name = "Nikola and Claudio's StoryMode"
description = "A level in which the Campaign Menu is defined, which opens other levels."
tags = "test"
screenshot = "emptylevel.png"
Modified: code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc
===================================================================
--- code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc 2017-11-20 12:06:08 UTC (rev 11563)
+++ code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc 2017-11-20 12:27:33 UTC (rev 11564)
@@ -160,7 +160,7 @@
//display name next to cursor
//TODO: Planet.getName()
- text_->setCaption("Was geht ab?");
+ text_->setCaption("Hello Muthafuckin' World!");
// Transform to screen coordinates
Vector3 pos = camTransform * Vector3(0,0,0); // planet->getRVWorldPosition();
Modified: code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h
===================================================================
--- code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h 2017-11-20 12:06:08 UTC (rev 11563)
+++ code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h 2017-11-20 12:27:33 UTC (rev 11564)
@@ -20,10 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Felix Schulthess
+ * Nikola Bolt
* Co-authors:
- * Reto Grieder
- * Matthias Spalinger
+ * Claudio Fanconi
*
*/
More information about the Orxonox-commit
mailing list