[Orxonox-commit 7282] r11899 - in code/branches/OrxyRoad_FS18: data/levels data/levels/templates src/modules/orxyroad
jacobsr at orxonox.net
jacobsr at orxonox.net
Tue Apr 24 10:32:56 CEST 2018
Author: jacobsr
Date: 2018-04-24 10:32:56 +0200 (Tue, 24 Apr 2018)
New Revision: 11899
Modified:
code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt
code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc
Log:
restored orxyroad to dodgerace state, fixed waiting for players issue
Modified: code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw 2018-04-24 08:32:56 UTC (rev 11899)
@@ -42,7 +42,7 @@
<!-- <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"/> -->
<Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
- <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=OrxyRoadShip pawndesign=spaceshipdodgerace />
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=OrxyRoadShip pawndesign=spaceshiporxyroad />
<DistanceTrigger name="start" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=0 />
Modified: code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt 2018-04-24 08:32:56 UTC (rev 11899)
@@ -1,5 +1,5 @@
-<Template name=spaceshipdodgerace>
- <DodgeRaceShip
+<Template name=spaceshiporxyroad>
+ <OrxyRoadShip
hudtemplate = spaceshiphud
camerapositiontemplate = spaceshipescortcameras
spawnparticlesource = "Orxonox/fairytwirl"
@@ -73,11 +73,11 @@
<?lua
include("../includes/invaderWeapon.oxi")
?>
- </DodgeRaceShip>
+ </OrxyRoadShip>
</Template>
<Template name=spaceshipescortcameras defaults=0>
- <DodgeRaceShip>
+ <OrxyRoadShip>
<camerapositions>
<CameraPosition position="0,100,180" direction="0, -0.2, -1" drag=false mouselook=true />
<CameraPosition position="0,200,250" direction="0, -0.4, -1" drag=false mouselook=true />
@@ -84,7 +84,7 @@
<CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />
<CameraPosition position="0,1300,-100" direction="0, -1, 0" drag=false mouselook=true />
</camerapositions>
- </DodgeRaceShip>
+ </OrxyRoadShip>
</Template>
<Template name=spaceshipinvaderengine baseclass=MultiStateEngine>
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt 2018-04-24 08:32:56 UTC (rev 11899)
@@ -1,4 +1,4 @@
-SET_SOURCE_FILES(OrxyRoad_SRC_FILES
+SET_SOURCE_FILES(Orxyroad_SRC_FILES
OrxyRoad.cc
OrxyRoadCenterPoint.cc
OrxyRoadShip.cc
@@ -13,5 +13,5 @@
LINK_LIBRARIES
orxonox
overlays
- SOURCE_FILES ${OrxyRoad_SRC_FILES}
+ SOURCE_FILES ${Orxyroad_SRC_FILES}
)
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc 2018-04-24 08:32:56 UTC (rev 11899)
@@ -42,7 +42,7 @@
{
RegisterUnloadableClass(OrxyRoad);
- OrxyRoad::OrxyRoad(Context* context) : Gametype(context)
+ OrxyRoad::OrxyRoad(Context* context) : Deathmatch(context)
{
RegisterObject(OrxyRoad);
@@ -117,9 +117,9 @@
cubeList.push_back(cube);
switch(pattern)
{
- case 1: cube->addTemplate("DodgeRaceCube01");
+ case 1: cube->addTemplate("OrxyRoadCube01");
break;
- case 2: cube->addTemplate("DodgeRaceCube01");
+ case 2: cube->addTemplate("OrxyRoadCube01");
break;
}
@@ -190,6 +190,7 @@
GSLevel::startMainMenu();
return;
}
+ Deathmatch::start();
}
void OrxyRoad::playerPreSpawn(PlayerInfo* player)
@@ -233,7 +234,7 @@
if (Highscore::exists())
{
int score = this->getPoints();
- Highscore::getInstance().storeScore("Dodge Race", score, this->playerInfo_);
+ Highscore::getInstance().storeScore("Orxy Road ", score, this->playerInfo_);
}
GSLevel::startMainMenu();
}
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h 2018-04-24 08:32:56 UTC (rev 11899)
@@ -56,13 +56,13 @@
#include "core/command/ConsoleCommand.h"
-#include "gametypes/Gametype.h"
+#include "gametypes/Deathmatch.h"
#include "tools/Timer.h"
namespace orxonox
{
- class _OrxyRoadExport OrxyRoad : public Gametype
+ class _OrxyRoadExport OrxyRoad : public Deathmatch
{
public:
OrxyRoad(Context* context);
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc 2018-04-24 08:32:56 UTC (rev 11899)
@@ -1,3 +1,4 @@
+
/* ORXONOX - the hottest 3D action shooter ever to exist
* > www.orxonox.net <
*
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc 2018-04-23 11:10:23 UTC (rev 11898)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc 2018-04-24 08:32:56 UTC (rev 11899)
@@ -54,6 +54,8 @@
void OrxyRoadShip::tick(float dt)
{
+ orxout(user_info) << "This is some cool output!" << endl;
+
Vector3 pos = getPosition();
//Movement calculation
More information about the Orxonox-commit
mailing list