# # ChangeLog for code/branches/newlevel2012 # # Generated by Trac 1.0.9 # Nov 10, 2024, 4:06:12 PM Thu, 24 May 2012 08:00:06 GMT mentzerf [9236] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/newlevel2012/data/levels/templates/tower.oxt (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * Changed waypoint scale so that they are not visible anymore * ... Fri, 18 May 2012 14:07:37 GMT weigeltm [9213] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/newlevel2012/data/levels/templates/tower.oxt (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseController.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseController.h (added) tried to fix towers. failed. Fri, 18 May 2012 14:00:21 GMT mentzerf [9211] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) + Now only adding tower if there is enough credit Fri, 18 May 2012 13:34:50 GMT mentzerf [9207] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (modified) + Added new class 'TowerDefensePlayerStats' to manage stats - ... Fri, 18 May 2012 13:21:21 GMT mentzerf [9204] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (deleted) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (deleted) * Renamed TowerDefensePlayerStats to TowerDefenseHUDController Fri, 18 May 2012 13:02:07 GMT mentzerf [9199] * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.blend (added) Tower.blend now in SVN Fri, 18 May 2012 13:00:02 GMT mentzerf [9196] * code/branches/newlevel2012/src/modules/towerdefense/tower/OgreXMLConverter.log (deleted) * code/branches/newlevel2012/src/modules/towerdefense/tower/RustySteel.jpg (deleted) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh.xml (deleted) - Removed unused files Fri, 18 May 2012 12:57:05 GMT mentzerf [9194] * code/branches/newlevel2012/src/modules/towerdefense/Tower (deleted) * code/branches/newlevel2012/src/modules/towerdefense/tower (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/OgreXMLConverter.log (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/RustySteel.jpg (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.material (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh.xml (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2 (deleted) Yet another new model... Fri, 18 May 2012 12:46:22 GMT mentzerf [9193] * code/branches/newlevel2012/src/modules/towerdefense/tower2 (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/OgreXMLConverter.log (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/Scene.material (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/Tower.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/Tower.mesh.xml (added) Created another tower model Fri, 18 May 2012 12:32:32 GMT mentzerf [9190] * code/branches/newlevel2012/src/modules/towerdefense/Tower (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/Scene.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/TestBrick.png (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/Tower.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/Tower.mesh.xml (added) Added Tower mesh Fri, 18 May 2012 11:54:37 GMT mentzerf [9188] * code/branches/newlevel2012/src/orxonox/controllers/FormationController.cc (modified) * Now using new waypoints Mon, 14 May 2012 07:27:32 GMT jo [9181] * code/branches/newlevel2012/.project (modified) That was not supposed. Mon, 14 May 2012 07:21:32 GMT jo [9180] * code/branches/newlevel2012/.project (modified) * code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) TowerDefenseHUD is displayed correctly now. Fri, 11 May 2012 14:03:28 GMT weigeltm [9175] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/newlevel2012/data/levels/templates/tower.oxt (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc (modified) removed attach-command, got rid of error messages, attached weapons ... Fri, 11 May 2012 13:35:56 GMT mentzerf [9173] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * Fixed compile error + Added another OverlayText, but still not ... Fri, 11 May 2012 12:53:41 GMT mentzerf [9172] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (added) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * Tried to add HUD. Failed miserably. Does not compile any more =( Fri, 11 May 2012 11:28:44 GMT mentzerf [9168] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * Changed Collision shape of playfield Fri, 11 May 2012 11:17:00 GMT weigeltm [9167] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) small refactor (ridiculously small (really)) Fri, 04 May 2012 14:19:17 GMT weigeltm [9161] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (added) * code/branches/newlevel2012/data/levels/templates/tower.oxt (added) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) updated tower template and more stuff Fri, 04 May 2012 14:12:47 GMT mentzerf [9160] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Fixed height of towers + not adding towers when they were added already Fri, 04 May 2012 12:51:44 GMT mentzerf [9154] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) * Fixed size of oxw stuff. + Added tileScale to ... Fri, 04 May 2012 11:55:19 GMT mentzerf [9149] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender (deleted) - Removed Tower Model Fri, 04 May 2012 11:53:59 GMT mentzerf [9148] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * Changed addWaypointsAndFirstEnemy Fri, 04 May 2012 11:24:38 GMT weigeltm [9146] * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Scene.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_ME.mesh (added) exported tower Fri, 04 May 2012 11:21:13 GMT weigeltm [9145] * code/branches/newlevel2012/.project (modified) * code/branches/newlevel2012/data/levels/teamDeathMatch.oxw (modified) * code/branches/newlevel2012/data/levels/theTimeMachine.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_ME.mesh.xml (modified) exported tower Fri, 04 May 2012 11:12:42 GMT mentzerf [9144] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_MAT.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_ME.mesh.xml (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Turm.blend (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Turm.scene (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/brick01.jpg (added) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) + Added Tower model, not in game yet Wed, 02 May 2012 11:22:20 GMT jo [9143] * code/branches/newlevel2012/.project (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/towerdefensereadme.txt (modified) Some hints added on how to proceed. Sun, 29 Apr 2012 15:22:56 GMT mentzerf [9142] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) + Tried to create waypoints programmatically, succeeded, BUT: the ... Sun, 29 Apr 2012 13:42:22 GMT mentzerf [9141] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/towerdefensereadme.txt (added) Added readme file and reformatted some more Sun, 29 Apr 2012 12:05:17 GMT mentzerf [9140] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Fixed a bug that prevented compiling Sun, 29 Apr 2012 10:52:05 GMT mentzerf [9139] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Fixed some formatting, some comments and some logs. Done for today. Sun, 29 Apr 2012 10:40:11 GMT mentzerf [9138] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) Fixed the oxw file (some more): * the playfield now lies in the x,y ... Sun, 29 Apr 2012 09:17:38 GMT mentzerf [9137] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) + 'addTower' now adds a "tower" (actually a green cube) at 0,0 Sun, 29 Apr 2012 09:08:26 GMT mentzerf [9136] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) + Added console command "addTower" to later spawn in towers. Now only ... Sun, 29 Apr 2012 09:06:40 GMT mentzerf [9135] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (modified) + Added class Tower, later will be used to spawn in towers Sun, 29 Apr 2012 09:06:06 GMT mentzerf [9134] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) + Added Template for tower * Replaced StaticEntity for playfield ... Sun, 29 Apr 2012 08:06:09 GMT mentzerf [9133] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) Fixed oxw file: * Camera is now focus on 0,0,0 and locked on a ... Sun, 29 Apr 2012 08:04:00 GMT mentzerf [9132] * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield.material (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend1 (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/playfield_top.png (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/plazfield_top.png (deleted) - Deleted Playfield files, they are in the trunk now Fri, 27 Apr 2012 13:59:19 GMT mentzerf [9129] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) added spaceship that follows four waypoints on the playfield Fri, 27 Apr 2012 13:18:31 GMT mentzerf [9124] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) restored working playfield Fri, 27 Apr 2012 12:56:33 GMT mentzerf [9123] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * Fixed SVN error Fri, 27 Apr 2012 12:49:43 GMT mentzerf [9122] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) Updated oxw and added method call to spawnEnemy Fri, 27 Apr 2012 12:17:32 GMT mentzerf [9117] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) + Should spawn enemy now Fri, 27 Apr 2012 12:09:48 GMT mentzerf [9116] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) adjusted position of the plazfield Sat, 21 Apr 2012 21:51:24 GMT jo [9113] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.cc (deleted) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (added) Forgot to update the Prereqs Sat, 21 Apr 2012 21:47:19 GMT jo [9112] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) Created minimal working version for the TowerDefence module. The code ... Fri, 20 Apr 2012 14:47:47 GMT mentzerf [9111] * code/branches/newlevel2012/src/modules/CMakeLists.txt (modified) + Added did to CMakeList of src/modules Fri, 20 Apr 2012 14:45:46 GMT mentzerf [9110] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.cc (added) + Added CMakeLists.txt + Added basic centerpoint class Fri, 20 Apr 2012 14:43:20 GMT mentzerf [9109] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * Updated oxw once again Fri, 20 Apr 2012 14:40:44 GMT mentzerf [9108] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * Updated oxw once again Fri, 20 Apr 2012 14:32:35 GMT mentzerf [9106] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) Changed oxw Fri, 20 Apr 2012 14:27:52 GMT mentzerf [9104] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * Changed TowerDefense superclass to DeathMatch * Updated oxw Fri, 20 Apr 2012 14:26:03 GMT mentzerf [9103] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Changed TowerDefense superclass to DeathMatch * Updated oxw Fri, 20 Apr 2012 13:00:32 GMT mentzerf [9098] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (added) Added Gametype class Fri, 20 Apr 2012 12:28:46 GMT mentzerf [9097] * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield.material (modified) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/playfield_top.png (added) Renamed playfield texture Fri, 20 Apr 2012 12:00:47 GMT mentzerf [9096] * code/branches/newlevel2012/.project (added) * code/branches/newlevel2012/data/levels/towerDefense.oxw (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend1 (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/plazfield_top.png (added) Added level files Fri, 20 Apr 2012 11:52:01 GMT mentzerf [9095] * code/branches/newlevel2012/data/levels/emptyLevel.oxw (modified) restored emptzlevel and added towerdefense test level\ Fri, 20 Apr 2012 11:43:35 GMT mentzerf [9094] * code/branches/newlevel2012/data/levels/emptyLevel.oxw (modified) Added Textures and Cube into empty level Fri, 30 Mar 2012 13:11:39 GMT weigeltm [9066] * code/branches/newlevel2012/src/modules/towerdefense (added) * code/branches/newlevel2012/src/modules/towerdefense/TDEnemy.h (added) derp Fri, 16 Mar 2012 13:32:17 GMT weigeltm [9033] * code/branches/newlevel2012 (copied) Wed, 15 Feb 2012 22:51:58 GMT jo [9016] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (copied) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/asteroidField.lua (copied) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (copied) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/underAttackHUD.oxo (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (copied) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (copied) * code/trunk/src/orxonox/controllers/FormationController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (copied) * code/trunk/src/orxonox/gametypes/Mission.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (copied) * code/trunk/src/orxonox/gametypes/TeamGametype.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merging presentation2011 branch to trunk. Please check for possible bugs.