# # ChangeLog for code/branches/3DPacman_FS18/data # # Generated by Trac 1.0.9 # Nov 22, 2024, 8:37:10 PM Thu, 17 May 2018 14:14:35 GMT dreherm [11976] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) HUD erweitert Mon, 14 May 2018 11:08:06 GMT dreherm [11961] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) HUD work Sat, 12 May 2018 22:39:06 GMT dreherm [11958] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) HUD test 1 Fri, 11 May 2018 23:31:25 GMT dreherm [11957] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) Added all Powersphere Fri, 11 May 2018 11:44:20 GMT dreherm [11956] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) Collisionshapes and Powerpoints Tue, 08 May 2018 11:20:49 GMT dreherm [11954] * code/branches/3DPacman_FS18/New Material/meshes/OgreXMLConverter.log (modified) * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) Added Ghostchange Fri, 04 May 2018 22:26:38 GMT dreherm [11949] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 11 Fri, 04 May 2018 22:12:36 GMT dreherm [11945] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Afraid Test 7 Thu, 03 May 2018 13:45:20 GMT dreherm [11933] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h (added) Afraid Ghosts Thu, 03 May 2018 12:57:35 GMT dreherm [11931] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (added) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (added) HUD first commit Sat, 28 Apr 2018 23:38:20 GMT dreherm [11918] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) Added Collsionshapes Thu, 26 Apr 2018 14:11:19 GMT dreherm [11915] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.h (modified) Game playable Tue, 24 Apr 2018 11:10:36 GMT dreherm [11900] * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Add Ghost movements Mon, 23 Apr 2018 11:10:23 GMT dreherm [11898] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/src/modules/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/pacman (added) * code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt (added) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.h (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.h (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPrereqs.h (added) Improved player Fri, 20 Apr 2018 10:47:25 GMT dreherm [11897] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h (modified) Better controll of player Fri, 20 Apr 2018 10:17:32 GMT dreherm [11896] * code/branches/3DPacman_FS18/New Material (added) * code/branches/3DPacman_FS18/New Material/image (added) * code/branches/3DPacman_FS18/New Material/image/PacmanAfraidGhost.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanGelb.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanGhostBlue.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanGhostOrange.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanGhostPink.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanGhostRed.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanMap.PNG (added) * code/branches/3DPacman_FS18/New Material/image/PacmanPointSphere.PNG (added) * code/branches/3DPacman_FS18/New Material/material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanAfraidGhost.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanGelb.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanGhostBlue.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanGhostOrange.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanGhostPink.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanGhostRed.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanMap.material (added) * code/branches/3DPacman_FS18/New Material/material/PacmanPointSphere.material (added) * code/branches/3DPacman_FS18/New Material/mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanAfraidGhost.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanGelb.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanGhostBlue.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanGhostOrange.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanGhostPink.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanGhostRed.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanMap.mesh (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanPointSphere.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes (added) * code/branches/3DPacman_FS18/New Material/meshes/OgreXMLConverter (added) * code/branches/3DPacman_FS18/New Material/meshes/OgreXMLConverter.log (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanAfraidGhost.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanAfraidGhost.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanAfraidGhost.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanAfraidGhost.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanAfraidGhost.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanAfraidGhost.scene (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanBlue.scene (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGelb.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGelb.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGelb.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGelb.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGelb.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGelb.scene (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostBlue.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostBlue.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostBlue.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostBlue.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostBlue.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostOrange.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostOrange.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostOrange.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostOrange.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostOrange.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostPink.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostPink.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostPink.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostPink.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostPink.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostRed.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostRed.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostRed.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostRed.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanGhostRed.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanMap.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanMap.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanMap.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanMap.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanMap.scene (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointSphere.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointSphere.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointSphere.material (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointSphere.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointSphere.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointSphere.scene (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanRed.scene (added) * code/branches/3DPacman_FS18/New Material/meshes/Pacmanmap.blend (added) * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h (modified) Back Up Done Fri, 20 Apr 2018 08:18:23 GMT dreherm [11894] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h (modified) Load Backup Fri, 13 Apr 2018 11:08:46 GMT dreherm [11862] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/3DPacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPrereqs.h (added) * code/branches/3DPacman_FS18/src/modules/dodgerace/DodgeRaceShip.cc (modified) Work on player Thu, 29 Mar 2018 16:14:30 GMT dreherm [11843] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/Pacman (added) * code/branches/3DPacman_FS18/src/modules/Pacman/CMakeLists.txt (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhostController.cc (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhostController.h (added) First try for moving ghosts Mon, 26 Mar 2018 11:09:34 GMT dreherm [11833] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) portals added Thu, 22 Mar 2018 15:14:44 GMT dreherm [11831] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (added) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (added) * code/branches/3DPacman_FS18/src/orxonox/controllers/PacmanGhostRedController.cc (added) * code/branches/3DPacman_FS18/src/orxonox/controllers/PacmanGhostRedController.h (added) * code/branches/3DPacman_FS18/src/orxonox/worldentities/PacmanGhostRed.cc (added) * code/branches/3DPacman_FS18/src/orxonox/worldentities/PacmanGhostRed.h (added) New modells added to game Thu, 15 Mar 2018 13:22:13 GMT patricwi [11819] * code/branches/3DPacman_FS18 (copied) Added new branch Mon, 19 Feb 2018 23:14:40 GMT landauf [11783] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialog.layout (copied) * code/trunk/data/gui/layouts/Dialogue.layout (deleted) * code/trunk/data/gui/layouts/HighscoreMenu.layout (modified) * code/trunk/data/gui/scripts/Dialog.lua (copied) * code/trunk/data/gui/scripts/Dialogue.lua (deleted) * code/trunk/data/gui/scripts/HighscoreMenu.lua (modified) * code/trunk/data/gui/scripts/TestDialogButttons.lua (modified) * code/trunk/data/levels/ArrowLevel.oxw (copied) * code/trunk/data/levels/AsteroidFarming.oxw (copied) * code/trunk/data/levels/Asteroids2D.oxw (copied) * code/trunk/data/levels/DialogShowcase.oxw (copied) * code/trunk/data/levels/DialogueShowcase.oxw (deleted) * code/trunk/data/levels/Endurancefinal.oxw (modified) * code/trunk/data/levels/FlappyOrx.oxw (copied) * code/trunk/data/levels/MilleniumFalconTest.oxw (modified) * code/trunk/data/levels/NC_StoryModeLevel.oxw (copied) * code/trunk/data/levels/ProtectBoss.oxw (copied) * code/trunk/data/levels/SOB.oxw (modified) * code/trunk/data/levels/StoryModeMap.oxw (modified) * code/trunk/data/levels/includes/MFalconWeapon.oxi (modified) * code/trunk/data/levels/includes/asteroids2DWeapon.oxi (copied) * code/trunk/data/levels/newnewnewspacerace.oxw (modified) * code/trunk/data/levels/templates/MFalcon.oxt (modified) * code/trunk/data/levels/templates/StoryMode.oxt (modified) * code/trunk/data/levels/templates/StoryModeEscort.oxt (copied) * code/trunk/data/levels/templates/asteroidsAsteroids2D.oxt (copied) * code/trunk/data/levels/templates/endurancetest_template.oxt (modified) * code/trunk/data/levels/templates/enemyFlappyOrx.oxt (copied) * code/trunk/data/levels/templates/fastship.oxt (modified) * code/trunk/data/levels/templates/spaceshipAsteroids2D.oxt (copied) * code/trunk/data/levels/templates/spaceshipFlappyOrx.oxt (copied) * code/trunk/data/overlays/Asteroids2DHUD.oxo (copied) * code/trunk/data/overlays/FlappyOrxHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/data/overlays/SOBHUD.oxo (modified) * code/trunk/data/overlays/StoryModeHUD.oxo (modified) * code/trunk/data/overlays/StoryModeHUD2.oxo (copied) * code/trunk/data/particle/fire3.particle (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/Mesh.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/asteroidmining (copied) * code/trunk/src/modules/asteroids2D (copied) * code/trunk/src/modules/dialog (copied) * code/trunk/src/modules/dialogue (deleted) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/flappyorx (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/trunk/src/modules/overlays/hud/StoryModeHUD.cc (copied) * code/trunk/src/modules/overlays/hud/StoryModeHUD.h (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/superorxobros/CMakeLists.txt (modified) * code/trunk/src/modules/superorxobros/Orxo.cc (deleted) * code/trunk/src/modules/superorxobros/Orxo.h (deleted) * code/trunk/src/modules/superorxobros/SOB.cc (modified) * code/trunk/src/modules/superorxobros/SOB.h (modified) * code/trunk/src/modules/superorxobros/SOBCastlestone.cc (modified) * code/trunk/src/modules/superorxobros/SOBCastlestone.h (modified) * code/trunk/src/modules/superorxobros/SOBCenterpoint.cc (modified) * code/trunk/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/trunk/src/modules/superorxobros/SOBCoin.cc (modified) * code/trunk/src/modules/superorxobros/SOBCoin.h (modified) * code/trunk/src/modules/superorxobros/SOBFigure.cc (modified) * code/trunk/src/modules/superorxobros/SOBFigure.h (modified) * code/trunk/src/modules/superorxobros/SOBFireball.cc (copied) * code/trunk/src/modules/superorxobros/SOBFireball.h (copied) * code/trunk/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/trunk/src/modules/superorxobros/SOBFlagstone.h (modified) * code/trunk/src/modules/superorxobros/SOBGumba.cc (modified) * code/trunk/src/modules/superorxobros/SOBGumba.h (modified) * code/trunk/src/modules/superorxobros/SOBGumbaBoss.cc (copied) * code/trunk/src/modules/superorxobros/SOBGumbaBoss.h (copied) * code/trunk/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/trunk/src/modules/superorxobros/SOBHUDInfo.h (modified) * code/trunk/src/modules/superorxobros/SOBItem.cc (modified) * code/trunk/src/modules/superorxobros/SOBItem.h (modified) * code/trunk/src/modules/superorxobros/SOBMushroom.cc (modified) * code/trunk/src/modules/superorxobros/SOBMushroom.h (modified) * code/trunk/src/modules/superorxobros/SOBPrereqs.h (modified) * code/trunk/src/modules/superorxobros/SOBQBlock.cc (modified) * code/trunk/src/modules/superorxobros/SOBQBlock.h (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (modified) * code/trunk/src/orxonox/Highscore.cc (modified) * code/trunk/src/orxonox/Highscore.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/controllers/ArrowController.cc (copied) * code/trunk/src/orxonox/controllers/ArrowController.h (copied) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gametypes/StoryMode.cc (modified) * code/trunk/src/orxonox/gametypes/StoryMode.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/Arrow.cc (copied) * code/trunk/src/orxonox/worldentities/Arrow.h (copied) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/NameableStaticEntity.cc (copied) * code/trunk/src/orxonox/worldentities/NameableStaticEntity.h (copied) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) * code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.h (copied) merged Presentation_HS17_merge back to trunk