Changeset 11752

Timestamp:

Feb 15, 2018, 11:32:36 PM (6 years ago)

Author:

landauf

Message:

merged FlappyOrx_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• data/levels/FlappyOrx.oxw (copied) (copied from code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw)
• data/levels/templates/enemyFlappyOrx.oxt (copied) (copied from code/branches/FlappyOrx_HS17/data/levels/templates/enemyFlappyOrx.oxt)
• data/levels/templates/spaceshipFlappyOrx.oxt (copied) (copied from code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt)
• data/overlays/FlappyOrxHUD.oxo (copied) (copied from code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo)
• data/particle/fire3.particle (modified) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/flappyorx (copied) (copied from code/branches/FlappyOrx_HS17/src/modules/flappyorx)

code/branches/Presentation_HS17_merge/data/particle/fire3.particle

@@ -65 +65 @@
                 colour3 0 0 0 0
                 time3   1
-                colour4 0.5 0.5 0.5 0
-                time4   1
-                colour5 0.5 0.5 0.5 0
-                time5   1
+                
         }
 }

code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt

@@ -48 +48 @@
 ADD_SUBDIRECTORY(superorxobros)
 ADD_SUBDIRECTORY(asteroids2D)
+ADD_SUBDIRECTORY(flappyorx)