Index: /code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw
===================================================================
--- /code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw (revision 12411)
+++ /code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw (revision 12412)
@@ -44,5 +44,5 @@
-
+
Index: /code/branches/Presentation_FS19/data/levels/pong.oxw
===================================================================
--- /code/branches/Presentation_FS19/data/levels/pong.oxw (revision 12411)
+++ /code/branches/Presentation_FS19/data/levels/pong.oxw (revision 12412)
@@ -16,5 +16,4 @@
-
@@ -51,4 +50,5 @@
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /code/branches/Presentation_FS19/data/levels/towerDefense.oxw
===================================================================
--- /code/branches/Presentation_FS19/data/levels/towerDefense.oxw (revision 12411)
+++ /code/branches/Presentation_FS19/data/levels/towerDefense.oxw (revision 12412)
@@ -106,11 +106,11 @@
-
+
-
- x
+
+
Index: /code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc
===================================================================
--- /code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc (revision 12411)
+++ /code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc (revision 12412)
@@ -69,5 +69,5 @@
void Asteroids2DShip::tick(float dt)
{
- //SUPER(Asteroids2DShip, tick, dt);
+ SUPER(Asteroids2DShip, tick, dt);
Vector3 pos = this->getPosition();
Index: /code/branches/Presentation_FS19/src/modules/pong/Pong.cc
===================================================================
--- /code/branches/Presentation_FS19/src/modules/pong/Pong.cc (revision 12411)
+++ /code/branches/Presentation_FS19/src/modules/pong/Pong.cc (revision 12412)
@@ -127,5 +127,4 @@
void Pong::start()
{
- orxout() << "Hello" << endl;
if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
{