# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 11, 2024, 8:10:21 AM Fri, 18 May 2012 13:09:07 GMT huttemat [9201] * code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/orxonox/ShipManager.cc (modified) many bugfixes, code cleanup, documentation Fri, 18 May 2012 13:06:46 GMT lkevin [9200] * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) Changed colour of the damageboost pickups. 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:58:33 GMT smerkli [9195] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/levels/includes/pickups.oxi (modified) * code/branches/presentation2012/data/levels/pickups.oxw (modified) * code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/branches/presentation2012/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.h (modified) merged branch pickup2012 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 12:21:25 GMT smerkli [9189] * code/branches/presentation2012 (copied) Created presentation branch for FS2012. Fri, 18 May 2012 11:54:37 GMT mentzerf [9188] * code/branches/newlevel2012/src/orxonox/controllers/FormationController.cc (modified) * Now using new waypoints Fri, 18 May 2012 11:43:08 GMT laumerf [9187] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) replaced pickups Fri, 18 May 2012 11:24:06 GMT huttemat [9185] * code/branches/shipSelection/data/levels/tutorial.oxw (modified) test Fri, 18 May 2012 10:47:54 GMT lkevin [9184] * code/branches/pickup2012/data/levels/includes/pickups.oxi (modified) * code/branches/pickup2012/data/levels/pickups.oxw (modified) * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.h (modified) Finished DamageBoost Pickup and the XML inclusions are working now. 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:20:50 GMT scmoritz [9177] * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.h (modified) 3D arrow trial 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 14:03:17 GMT toliecht [9174] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) bla 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 12:51:22 GMT laumerf [9171] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) added new pickups Fri, 11 May 2012 11:31:42 GMT toliecht [9169] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) zylinderlaumer 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:27:06 GMT laumerf [9162] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) added asteroids and pick ups 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 14:09:25 GMT scmoritz [9159] * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/waypoints/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/waypoints/src/orxonox/overlays/OrxonoxOverlay.h (modified) 3DScene added. creation of the arrow doesnt work. Fri, 04 May 2012 14:05:53 GMT huttemat [9157] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.cc (modified) * code/branches/shipSelection/src/orxonox/ShipManager.cc (added) * code/branches/shipSelection/src/orxonox/ShipManager.h (added) ShipSelecting working, still hackish and featureless though Fri, 04 May 2012 13:56:56 GMT lkevin [9155] * code/branches/pickup2012/data/levels/includes/pickups.oxi (modified) * code/branches/pickup2012/data/levels/pickups.oxw (modified) * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/pickup2012/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) Changed pickup icon and xml for possible varieties of the pickup in ... 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 12:01:18 GMT laumerf [9150] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) bla 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 14:11:30 GMT laumerf [9130] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) added new checkpoints 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:58:26 GMT huttemat [9128] * code/branches/shipSelection/data/levels/tutorial.oxw (modified) some stuff not yet saved Fri, 27 Apr 2012 13:56:15 GMT huttemat [9127] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/libraries/core/Loader.cc (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.h (modified) * code/branches/shipSelection/src/orxonox/LevelManager.cc (modified) shipselection core works now 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:41:35 GMT laumerf [9121] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) Added new Checkpoints Fri, 27 Apr 2012 12:40:09 GMT laumerf [9120] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) * code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt (modified) Added new Checkpoints Fri, 27 Apr 2012 12:38:41 GMT lkevin [9119] * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc (added) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h (added) added DamageBoostPickup files too Fri, 27 Apr 2012 12:36:52 GMT lkevin [9118] * code/branches/pickup2012/data/levels/pickups.oxw (modified) * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) First working version. Default damage increase is currently set to ... 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 Sun, 22 Apr 2012 08:41:02 GMT landauf [9115] * code/branches/testing/test/BoostTest.cc (deleted) * code/branches/testing/test/CMakeLists.txt (modified) * code/branches/testing/test/SampleTest.cc (deleted) * code/branches/testing/test/gtest_samples (deleted) removed sample tests Sun, 22 Apr 2012 08:36:09 GMT landauf [9114] * code/branches/testing/src/libraries/util/SignalHandler.cc (modified) * code/branches/testing/src/libraries/util/SignalHandler.h (modified) * code/branches/testing/test/CMakeLists.txt (modified) * code/branches/testing/test/CTestCustom.cmake (modified) * code/branches/testing/test/util/CMakeLists.txt (modified) * code/branches/testing/test/util/ConvertTest.cc (added) * code/branches/testing/test/util/MathTest.cc (modified) * code/branches/testing/test/util/ScopeTest.cc (added) * code/branches/testing/test/util/SharedPtrTest.cc (added) * code/branches/testing/test/util/SingletonTest.cc (added) * code/branches/testing/test/util/SmallObjectAllocatorTest.cc (added) * code/branches/testing/test/util/StringUtilsTest.cc (added) * code/branches/testing/test/util/SubStringTest.cc (added) * code/branches/testing/test/util/VA_NARGSTest.cc (added) * code/branches/testing/test/util/mboolTest.cc (added) added tests for several classes and functions in util 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:47 GMT laumerf [9107] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) Created course 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:31:00 GMT scmoritz [9105] * code/branches/waypoints/src/orxonox/controllers/FormationController.cc (modified) Movement to Waypoint fixed. Speed still has to get adjusted 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 14:19:27 GMT huttemat [9101] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.h (modified) changing xml files Fri, 20 Apr 2012 14:06:09 GMT lkevin [9099] * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup2012/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.h (modified) Found a way to implement damage modifiers by adding a flag to the ... 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, 20 Apr 2012 11:11:30 GMT scmoritz [9093] * code/branches/waypoints/src/orxonox/controllers/FormationController.cc (modified) Movement to Waypoint fixed. Speed still has to get adjusted Tue, 17 Apr 2012 21:51:21 GMT jo [9092] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/CMakeLists.txt (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisScore.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisScore.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) Tetris on the way to get completed. I fixed some bugs concerning ... Mon, 16 Apr 2012 20:42:57 GMT jo [9091] * code/branches/pCuts/src/modules/tetris/TetrisScore.cc (added) * code/branches/pCuts/src/modules/tetris/TetrisScore.h (added) Adding missing files. Mon, 16 Apr 2012 20:29:49 GMT jo [9090] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/pong/Pong.cc (modified) * code/branches/pCuts/src/modules/pong/Pong.h (modified) * code/branches/pCuts/src/modules/pong/PongScore.cc (modified) * code/branches/pCuts/src/modules/tetris/CMakeLists.txt (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisPrereqs.h (modified) Fighting with the controller. 'Undefined reference to ... Sat, 14 Apr 2012 20:03:54 GMT jo [9089] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (modified) Almost playable :-) Two obvious bugs are remaining concerning ... Sat, 14 Apr 2012 16:07:44 GMT jo [9088] * code/branches/pCuts/data/levels/tetris.oxw (modified) Still a long way to go. A short todo list can be found at the ... Sat, 14 Apr 2012 15:45:44 GMT jo [9087] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) Still a long way to go. A short todo list can be found at the ... Sat, 14 Apr 2012 13:32:56 GMT jo [9086] * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) Tetris contais almost the same features as before introducing bricks. ... Fri, 13 Apr 2012 15:44:29 GMT jo [9085] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) backup checkin - still the same bugs experiencable Thu, 12 Apr 2012 17:05:57 GMT jo [9084] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (modified) * code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc (modified) Rotating bricks works. Next step: repairing the collision detection. Wed, 11 Apr 2012 16:35:15 GMT jo [9083] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc (modified) Camera works. Wed, 11 Apr 2012 13:53:43 GMT jo [9082] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/CMakeLists.txt (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (added) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (added) * code/branches/pCuts/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisCenterpoint.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisPrereqs.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.h (modified) Trying to create tetris bricks. Rough implementation done. Still ... Thu, 05 Apr 2012 09:12:08 GMT jo [9081] * code/branches/pCuts/src/modules/pong/Pong.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.h (modified) Added rotation to the TetrisStones. Mon, 02 Apr 2012 18:40:25 GMT dafrick [9079] * code/branches/questlog (copied) New branch to work on questlog/questmenu. Sun, 01 Apr 2012 19:05:30 GMT landauf [9078] * code/branches/testing/src/external/gtest/src/gtest.cc (modified) small fix in google-test that seems to prevent a windows dialog from ... Sun, 01 Apr 2012 16:48:06 GMT landauf [9077] * code/branches/testing/cmake/LibraryConfig.cmake (modified) * code/branches/testing/src/libraries/util/Math.h (modified) * code/branches/testing/test/CMakeLists.txt (modified) * code/branches/testing/test/CTestCustom.cmake (modified) reverted changes of r9020 in LibraryConfig.cmake fixed warning in ... Sun, 01 Apr 2012 09:07:02 GMT landauf [9076] * code/branches/testing/src/libraries/util/StringUtils.cc (modified) * code/branches/testing/src/libraries/util/StringUtils.h (modified) small fixes and adjustments of code and documentation Fri, 30 Mar 2012 14:28:52 GMT huttemat [9074] * code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) test