# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 17, 2024, 4:24:56 AM Thu, 06 Sep 2012 12:16:41 GMT jo [9371] * code/branches/release2012/data/levels/underAttack.oxw (modified) * code/branches/release2012/src/modules/objects/SpaceBoundaries.cc (modified) The UnderAttack level was improved. The defender's spawnpoints have ... Tue, 04 Sep 2012 16:13:03 GMT jo [9370] * code/branches/release2012/data/levels/underAttack.oxw (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.h (modified) * code/branches/release2012/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/release2012/src/orxonox/gametypes/UnderAttack.h (modified) The transporter's life is now set depending on the number of players. Tue, 04 Sep 2012 09:07:26 GMT jo [9369] * code/branches/release2012/data/defaultConfig/keybindings.ini (modified) Gotcha. I edited the wrong keybindings.ini file before. Tue, 04 Sep 2012 08:47:49 GMT jo [9368] * code/branches/release2012/src/orxonox/controllers/HumanController.cc (modified) * code/branches/release2012/src/orxonox/controllers/HumanController.h (modified) * code/branches/release2012/src/orxonox/controllers/NewHumanController.cc (modified) Trying to change the mouselook keybinding according to the suggestion ... Tue, 04 Sep 2012 07:39:04 GMT jo [9367] * code/branches/release2012/src/orxonox/controllers/NewHumanController.cc (modified) Disabling free aiming. Sun, 02 Sep 2012 20:54:30 GMT landauf [9366] * code/archive/animated_space_boundaries (moved) moved presentation branch from spring 2011 to archive because of the ... Sun, 02 Sep 2012 20:52:17 GMT landauf [9365] * code/archive/environment2 (moved) moved environment2 branch to archive Sun, 02 Sep 2012 20:51:21 GMT landauf [9364] * code/branches/dockingsystem2 (deleted) removed dockingsystem2 branch Sun, 02 Sep 2012 16:45:40 GMT jo [9363] * code/branches/release2012/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.h (modified) Teamdeathmatch ends if a certain number of opponents have been ... Sun, 02 Sep 2012 11:58:43 GMT jo [9362] * data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg (added) * data/branches/dataRelease2012/audio/ambient/metal (deleted) * data/branches/dataRelease2012/materials/planet.material (added) I removed metal music theme, updated the mainmenu music and re-added ... Sun, 02 Sep 2012 11:55:27 GMT jo [9361] * code/branches/release2012/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/release2012/data/gui/scripts/AudioMenu.lua (modified) Modified music menusheet and credits menusheet. Sat, 01 Sep 2012 15:07:19 GMT jo [9360] * data/branches/dataRelease2012/images/levelpreviews/asteroidFieldTest.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/codingtutorial.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/earthdemonstration.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/emptylevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/eventsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/fpstestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/mytestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/notificationsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/pickupsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/planetdemonstration.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/portals.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentation.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationdm.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationfs11.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx1st.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx2.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx2nd.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx3rd.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationxi.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationxifps1st.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationxifps2nd.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/questsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/screenshot.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/shieldtestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/soundshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/starstestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/swallowtestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/waypointstestlevel.png (deleted) * data/branches/dataRelease2012/images/overlay/DroneBanner.png (deleted) * data/branches/dataRelease2012/images/overlay/Formation.png (deleted) * data/branches/dataRelease2012/images/overlay/Pickups.png (deleted) * data/branches/dataRelease2012/images/textures/can.png (deleted) * data/branches/dataRelease2012/images/textures/cokelabel.jpg (deleted) * data/branches/dataRelease2012/images/textures/playfield_top.png (deleted) * data/branches/dataRelease2012/images/textures/stunweapon.png (deleted) * data/branches/dataRelease2012/images/textures/tiled_floor.jpg (deleted) * data/branches/dataRelease2012/materials/Playfield.material (deleted) * data/branches/dataRelease2012/materials/Spacebomb.material (deleted) * data/branches/dataRelease2012/materials/Tower.material (deleted) * data/branches/dataRelease2012/materials/axes.material (deleted) * data/branches/dataRelease2012/materials/can.material (deleted) * data/branches/dataRelease2012/materials/cokebottle.material (deleted) * data/branches/dataRelease2012/materials/plane.material (deleted) * data/branches/dataRelease2012/materials/planet.material (deleted) * data/branches/dataRelease2012/materials/stunweapon.material (deleted) * data/branches/dataRelease2012/models/Playfield_ME.mesh (deleted) * data/branches/dataRelease2012/models/Spacebomb.mesh (deleted) * data/branches/dataRelease2012/models/Spacegate.mesh (added) * data/branches/dataRelease2012/models/Tower.mesh (deleted) * data/branches/dataRelease2012/models/Tower_ME.mesh (deleted) * data/branches/dataRelease2012/models/axes.mesh (deleted) * data/branches/dataRelease2012/models/can.mesh (deleted) * data/branches/dataRelease2012/models/cokebottle.mesh (deleted) * data/branches/dataRelease2012/models/plane.mesh (deleted) * data/branches/dataRelease2012/models/planet.mesh (deleted) * data/branches/dataRelease2012/models/stunweapon.mesh (deleted) I removed all models+materials+textures that seem unneccesary to me. ... Sat, 01 Sep 2012 15:04:18 GMT jo [9359] * code/branches/release2012/data/levels/FPSTest.oxw (deleted) * code/branches/release2012/data/levels/Spacerace2.oxw (deleted) * code/branches/release2012/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/release2012/data/levels/asteroidField.oxw (deleted) * code/branches/release2012/data/levels/docking.oxw (deleted) * code/branches/release2012/data/levels/earth.oxw (deleted) * code/branches/release2012/data/levels/emptyLevel.oxw (deleted) * code/branches/release2012/data/levels/events.oxw (deleted) * code/branches/release2012/data/levels/fightInOurBack.oxw (deleted) * code/branches/release2012/data/levels/gallery.oxw (deleted) * code/branches/release2012/data/levels/includes/weaponSettingsAssff2.oxi (deleted) * code/branches/release2012/data/levels/myTestLevel.oxw (deleted) * code/branches/release2012/data/levels/notifications.oxw (deleted) * code/branches/release2012/data/levels/old (deleted) * code/branches/release2012/data/levels/pickups.oxw (deleted) * code/branches/release2012/data/levels/pirateAttack.oxw (deleted) * code/branches/release2012/data/levels/planets.oxw (deleted) * code/branches/release2012/data/levels/portals.oxw (deleted) * code/branches/release2012/data/levels/presentation.oxw (deleted) * code/branches/release2012/data/levels/presentation09.oxw (deleted) * code/branches/release2012/data/levels/presentation09b.oxw (deleted) * code/branches/release2012/data/levels/presentationDM.oxw (deleted) * code/branches/release2012/data/levels/presentationFS10.oxw (deleted) * code/branches/release2012/data/levels/presentationFS102.oxw (deleted) * code/branches/release2012/data/levels/presentationFS10Ed.oxw (deleted) * code/branches/release2012/data/levels/presentationFS11.oxw (deleted) * code/branches/release2012/data/levels/presentationHS09.oxw (deleted) * code/branches/release2012/data/levels/presentationHS09b.oxw (deleted) * code/branches/release2012/data/levels/presentationHS11.oxw (deleted) * code/branches/release2012/data/levels/princessAeryn.oxw (deleted) * code/branches/release2012/data/levels/quests.oxw (deleted) * code/branches/release2012/data/levels/screenshot.oxw (deleted) * code/branches/release2012/data/levels/shieldTest.oxw (deleted) * code/branches/release2012/data/levels/sound.oxw (deleted) * code/branches/release2012/data/levels/templates/spaceshipAssff2.oxt (deleted) * code/branches/release2012/data/levels/templates/tower.oxt (deleted) * code/branches/release2012/data/levels/testStars.oxw (deleted) * code/branches/release2012/data/levels/testSwallow.oxw (deleted) * code/branches/release2012/data/levels/towerDefense.oxw (deleted) * code/branches/release2012/data/levels/tutorial.oxw (deleted) * code/branches/release2012/data/levels/waypoints.oxw (deleted) * code/branches/release2012/src/modules/CMakeLists.txt (modified) * code/branches/release2012/src/modules/towerdefense (deleted) * code/branches/release2012/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/release2012/src/orxonox/controllers/ScriptController.cc (deleted) * code/branches/release2012/src/orxonox/controllers/ScriptController.h (deleted) I removed most levels, towerdefence and the script controller since ... Sat, 01 Sep 2012 09:35:44 GMT landauf [9358] * code/archive/sound5 (moved) moved sound5 branch to archive Sat, 01 Sep 2012 09:34:56 GMT landauf [9357] * code/branches/enviroment (deleted) * code/branches/sound6 (deleted) removed unused branches Sat, 01 Sep 2012 09:32:20 GMT landauf [9356] * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/test/util/ConvertTest.cc (modified) details Sat, 01 Sep 2012 08:38:27 GMT landauf [9355] * code/archive/waypoints (moved) moved waypoints branch to archive Sat, 01 Sep 2012 08:37:19 GMT landauf [9354] * code/branches/presentation2011 (deleted) removed presentation branch from pps fall 2011 Sat, 01 Sep 2012 08:28:07 GMT landauf [9353] * code/branches/captureTheFlag (deleted) * code/branches/newlevel2012 (deleted) * code/branches/pCuts (deleted) * code/branches/pickup2012 (deleted) * code/branches/presentation2012 (deleted) * code/branches/presentation2012merge (deleted) * code/branches/shipSelection (deleted) * code/branches/sound2012 (deleted) * code/branches/spacebomb (deleted) * code/branches/surfaceRace (deleted) removed branches from pps spring 2012 Sat, 01 Sep 2012 07:02:12 GMT jo [9352] * data/branches/dataRelease2012 (copied) Creating a data release branch. Uneccesary files will be removed. Sat, 01 Sep 2012 06:57:23 GMT jo [9351] * code/branches/release2012 (copied) Creating a new branch in order to remove all unnecessary files. Fri, 31 Aug 2012 15:44:30 GMT jo [9350] * code/trunk/data/levels/gallery.oxw (modified) Added some billboards and a particle emitter. Fri, 31 Aug 2012 15:05:21 GMT jo [9349] * code/trunk/data/levels/gallery.oxw (added) Adding a gallery level. A place to present all important models. Thu, 30 Aug 2012 21:08:17 GMT landauf [9348] * code/trunk (modified) * code/trunk/cmake/tools/BuildUnits.cmake (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (modified) * code/trunk/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * 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/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/asteroidField.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * 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/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (modified) * code/trunk/data/levels/old/princessAeryn.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/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/presentationHS11.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/tower.oxt (copied) * 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/towerDefense.oxw (copied) * 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/dynamicMatchHUD.oxo (modified) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/data/overlays/tetrisHUD.oxo (copied) * code/trunk/data/overlays/towerdefenseHUD.oxo (copied) * code/trunk/data/overlays/underAttackHUD.oxo (deleted) * code/trunk/data/particle/smoke1.particle (deleted) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/doc/api/groups/Weapons.dox (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (modified) * code/trunk/src/BuildUnitsConfigMSVC.cmake (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/tolua/README_ORXONOX (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (deleted) * code/trunk/src/modules/pickup/DroppedPickup.h (deleted) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (copied) * code/trunk/src/modules/tetris/TetrisBrick.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisPrereqs.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (copied) * code/trunk/src/modules/tetris/TetrisScore.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * 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/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/pickup (deleted) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (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/SpaceShip.cc (modified) merged branch presentation2012merge back to trunk Thu, 30 Aug 2012 20:32:58 GMT landauf [9347] * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h (modified) removed unused function adjusted refactored code also in commented ... Thu, 30 Aug 2012 15:11:07 GMT jo [9346] * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo (modified) Bugfix: Previously the LastManStandingHUD wasn't displayed properly ... Thu, 30 Aug 2012 14:03:12 GMT jo [9345] * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) Small improvements on presentationHS11. Thu, 30 Aug 2012 12:39:35 GMT jo [9344] * code/branches/presentation2012merge/data/levels/pong.oxw (modified) Fixing pong's error message. Firstly the WorldSound's path wasn't ... Thu, 30 Aug 2012 09:53:01 GMT jo [9343] * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/pong.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) XML fixes: LastManStanding: wrong OverlayGroup name \n
... Thu, 30 Aug 2012 09:15:33 GMT jo [9342] * code/branches/presentation2012merge/data/levels/asteroids.oxw (modified) Adjusting timers of the Asteroid-Race level to the spaceships current ... Tue, 21 Aug 2012 17:28:51 GMT jo [9341] * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h (modified) Corrected getNumberOfPlayers(). Mon, 20 Aug 2012 14:46:52 GMT jo [9340] * code/branches/presentation2012merge/data/overlays/dynamicMatchHUD.oxo (modified) * code/branches/presentation2012merge/src/modules/pong/Pong.cc (modified) * code/branches/presentation2012merge/src/modules/pong/Pong.h (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Deathmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Deathmatch.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.h (modified) On the way of repairing a bug that was caused by manual refactoring ... Mon, 30 Jul 2012 20:41:03 GMT jo [9339] * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h (modified) Found reason why players are not always detected correctly: ... Mon, 30 Jul 2012 19:25:47 GMT jo [9338] * code/branches/presentation2012merge/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.h (modified) Trying to find quick fixes for dynamic match. Somehow gametypes ... Sun, 29 Jul 2012 21:02:13 GMT landauf [9337] * code/branches/presentation2012merge/src/modules/docking/DockingController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) fixed "quivering" movement also for DockingController and in the 2nd ... Sun, 29 Jul 2012 20:44:11 GMT landauf [9336] * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) fixed weird AI movement introduced in waypoints branch Sun, 22 Jul 2012 20:44:22 GMT landauf [9335] * data/pool/materials/AUTHORS (modified) * data/pool/materials/Tower.material (copied) * data/pool/models/AUTHORS (modified) * data/pool/models/towerdefense (added) * data/pool/models/towerdefense/field (moved) * code/branches/presentation2012merge/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (deleted) * data/pool/models/towerdefense/tower (moved) * code/branches/presentation2012merge/src/modules/towerdefense/tower/Tower.material (deleted) moved tower defense blender files to pool Sun, 22 Jul 2012 20:21:36 GMT landauf [9334] * code/branches/presentation2012merge/data/levels/underAttack.oxw (modified) * code/branches/presentation2012merge/data/overlays/underAttackHUD.oxo (deleted) * code/branches/presentation2012merge/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/branches/presentation2012merge/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/branches/presentation2012merge/src/orxonox/gametypes/UnderAttack.cc (modified) removed UnderAttackHealthBar which is not needed anymore because of ... Sun, 22 Jul 2012 20:04:10 GMT landauf [9333] * code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/presentation2012merge/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h (modified) added const qualifier to all message-sending functions in ... Sun, 22 Jul 2012 19:54:48 GMT landauf [9332] * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified) removed strange function Sun, 22 Jul 2012 19:35:54 GMT landauf [9331] * code/branches/presentation2012merge/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/presentation2012merge/src/libraries/core/command/ConsoleCommand.h (modified) removed const_cast and some const qualifiers from ConsoleCommand and ... Sun, 22 Jul 2012 17:23:51 GMT landauf [9330] * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified) added deterministic stop criterion to end tetris match (independent ... Sun, 22 Jul 2012 16:46:05 GMT landauf [9329] * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified) fixed collision bug in tetris which made stones overlap in some cases ... Sun, 22 Jul 2012 15:57:54 GMT landauf [9328] * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc (modified) fixed two possible crashes Sun, 22 Jul 2012 15:12:29 GMT landauf [9327] * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h (modified) changed parent of TetrisStone from Pawn to MovableEntity which is ... Sun, 22 Jul 2012 15:06:56 GMT landauf [9326] * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.h (modified) small refactoring of tetris gametype, fixed memory leak Sat, 21 Jul 2012 21:24:47 GMT landauf [9325] * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h (modified) removed obsolete code Sat, 21 Jul 2012 21:20:16 GMT landauf [9324] * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc (modified) fixed dropping and picking up again a PickupCollection Sat, 21 Jul 2012 16:32:02 GMT landauf [9323] * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) replaced tabs with spaces Sat, 21 Jul 2012 16:29:07 GMT landauf [9322] * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) fixed some warnings Sat, 21 Jul 2012 16:16:19 GMT landauf [9321] * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h (modified) detail: moved functions from .h to .cc Sat, 21 Jul 2012 13:51:06 GMT landauf [9320] * code/branches/presentation2012merge/src/libraries/core/Super.h (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) removed Pickupable::clone() because it is not needed anymore Sat, 21 Jul 2012 13:34:45 GMT landauf [9319] * code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (modified) * code/branches/presentation2012merge/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/missionOne.oxw (modified) * code/branches/presentation2012merge/data/levels/pickups.oxw (modified) * code/branches/presentation2012merge/data/levels/portals.oxw (modified) * code/branches/presentation2012merge/data/levels/presentation09b.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS10.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS11.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/src/modules/pickup/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/pickup/DroppedPickup.cc (deleted) * code/branches/presentation2012merge/src/modules/pickup/DroppedPickup.h (deleted) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.h (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) refactored PickupSpawner - it doesn't clone a sample-pickup anymore, ... Wed, 18 Jul 2012 20:36:24 GMT landauf [9318] * code/branches/presentation2012merge/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified) * code/branches/presentation2012merge/data/levels/pickups.oxw (modified) * code/branches/presentation2012merge/data/levels/presentation09b.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS10.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/src/modules/pickup/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/branches/presentation2012merge/src/modules/pickup/PickupManager.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012merge/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/presentation2012merge/src/orxonox/pickup (deleted) removed PickupIdentifier for a number of reasons (I talked to Damian ... Mon, 09 Jul 2012 21:48:16 GMT dafrick [9317] * data/trunk/AUTHORS (modified) * data/trunk/audio/sounds/laser1.wav (deleted) * data/trunk/audio/sounds/pong_bat.wav (deleted) * data/trunk/audio/sounds/pong_score.wav (deleted) * data/trunk/audio/sounds/pong_side.wav (deleted) * data/trunk/fonts/console.fontdef (deleted) * data/trunk/fonts/typewriter.ttf (deleted) * data/trunk/gui/imagesets/DriveIcons.imageset (deleted) * data/trunk/gui/imagesets/FairChar.imageset (deleted) * data/trunk/images/effects/smokecolors.png (deleted) * data/trunk/images/gui/DriveIcons.png (deleted) * data/trunk/images/gui/FairChar.png (deleted) * data/trunk/images/gui/OrxonoxLook.png (modified) * data/trunk/images/skyboxes/skypanoramagen1_bk.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen1_dn.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen1_fr.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen1_lf.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen1_rt.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen1_up.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen2_bk.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen2_dn.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen2_fr.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen2_lf.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen2_rt.jpg (deleted) * data/trunk/images/skyboxes/skypanoramagen2_up.jpg (deleted) * data/trunk/materials/OrxonoxSky.material (modified) Removing files that do not comply with our license. Mon, 09 Jul 2012 21:47:59 GMT dafrick [9316] * code/branches/presentation2012merge/data/levels/FPSTest.oxw (modified) * code/branches/presentation2012merge/data/levels/docking.oxw (modified) * code/branches/presentation2012merge/data/levels/events.oxw (modified) * code/branches/presentation2012merge/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2012merge/data/levels/notifications.oxw (modified) * code/branches/presentation2012merge/data/levels/old/presentationPhysics.oxw (modified) * code/branches/presentation2012merge/data/levels/old/princessAeryn.oxw (modified) * code/branches/presentation2012merge/data/levels/pirateAttack.oxw (modified) * code/branches/presentation2012merge/data/levels/planets.oxw (modified) * code/branches/presentation2012merge/data/levels/pong.oxw (modified) * code/branches/presentation2012merge/data/levels/portals.oxw (modified) * code/branches/presentation2012merge/data/levels/presentation09.oxw (modified) * code/branches/presentation2012merge/data/levels/presentation09b.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationDM.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS102.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2012merge/data/levels/princessAeryn.oxw (modified) * code/branches/presentation2012merge/data/levels/screenshot.oxw (modified) * code/branches/presentation2012merge/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2012merge/data/levels/testSwallow.oxw (modified) * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation2012merge/data/levels/tutorial.oxw (modified) * code/branches/presentation2012merge/data/levels/underAttack.oxw (modified) * code/branches/presentation2012merge/data/levels/waypoints.oxw (modified) * code/branches/presentation2012merge/data/particle/smoke1.particle (deleted) Replacing unlicend skyboxes Mon, 09 Jul 2012 21:47:32 GMT dafrick [9315] * data/pool/audio/sounds/AUTHORS (modified) * data/pool/audio/sounds/laser1.wav (deleted) * data/pool/audio/sounds/pong_bat.wav (deleted) * data/pool/audio/sounds/pong_score.wav (deleted) * data/pool/audio/sounds/pong_side.wav (deleted) * data/pool/fonts/AUTHORS (modified) * data/pool/fonts/console.fontdef (deleted) * data/pool/fonts/typewriter.ttf (deleted) * data/pool/gui/imagesets/AUTHORS (modified) * data/pool/gui/imagesets/DriveIcons.imageset (deleted) * data/pool/gui/imagesets/FairChar.imageset (deleted) * data/pool/images/effects/AUTHORS (modified) * data/pool/images/effects/smokecolors.png (deleted) * data/pool/images/gui/AUTHORS (modified) * data/pool/images/gui/DriveIcons.png (deleted) * data/pool/images/gui/FairChar.png (deleted) * data/pool/images/skyboxes/AUTHORS (modified) * data/pool/images/skyboxes/skypanoramagen1_bk.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen1_dn.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen1_fr.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen1_lf.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen1_rt.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen1_up.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen2_bk.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen2_dn.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen2_fr.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen2_lf.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen2_rt.jpg (deleted) * data/pool/images/skyboxes/skypanoramagen2_up.jpg (deleted) * data/pool/materials/OrxonoxSky.material (modified) * data/pool/materials/planets.material (modified) Removing files that do not comply with our license. Sun, 08 Jul 2012 16:31:46 GMT landauf [9314] * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc (modified) probably a bugfix: PickupIdentifier compared only the first parameter ... Sun, 08 Jul 2012 15:33:03 GMT landauf [9313] * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) found some more functions to rename Sun, 08 Jul 2012 15:26:04 GMT landauf [9312] * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h (modified) renamed some functions where enums are converted to/from strings for ... Tue, 03 Jul 2012 21:46:06 GMT dafrick [9311] * data/pool/images/effects/AUTHORS (modified) * data/pool/images/effects/TODO (added) * data/pool/images/effects/pickup/damageLarge.png (added) * data/pool/images/effects/pickup/damageMedium.png (added) * data/pool/images/effects/pickup/damageSmall.png (added) * data/pool/images/effects/pickup/info.xml (modified) * data/pool/images/effects/planets/info.xml (modified) * data/pool/images/gui/AUTHORS (modified) * data/pool/images/overlay/AUTHORS (modified) * data/pool/images/overlay/console2.png (modified) * data/pool/images/overlay/console3.png (modified) * data/pool/images/skyboxes/AUTHORS (modified) Working on images Tue, 03 Jul 2012 21:36:48 GMT dafrick [9310] * data/pool/gui/looknfeels/OrxonoxLook.looknfeel (modified) Update looknfeel Tue, 03 Jul 2012 21:15:43 GMT dafrick [9309] * data/pool/gui/imagesets/AUTHORS (modified) Updating imagesets AUTHORS file Tue, 03 Jul 2012 21:15:19 GMT dafrick [9308] * data/pool/gui/looknfeels/AUTHORS (modified) * data/pool/gui/looknfeels/TODO (deleted) Updating looknfeels AUTHORS file Tue, 03 Jul 2012 20:56:54 GMT dafrick [9307] * data/pool/audio/ambient/metal (added) * data/pool/audio/ambient/metal/AUTHORS (added) * data/pool/audio/ambient/metal/Earth.ogg (added) * data/pool/audio/ambient/metal/Fight1.ogg (added) * data/pool/audio/ambient/metal/Jupiter.ogg (added) * data/pool/audio/ambient/metal/Mars.ogg (added) * data/pool/audio/ambient/metal/mainmenu.ogg (added) Adding metal mood to pool. Thu, 28 Jun 2012 12:39:05 GMT jo [9306] * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc (modified) Tetris: Level update Mon, 18 Jun 2012 19:54:49 GMT landauf [9305] * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.h (modified) simplified code a little by using MultiType instead of explicit ... Sun, 17 Jun 2012 21:04:25 GMT jo [9304] * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo (added) Added tetris HUD template and some eye candy for the level. Sun, 17 Jun 2012 16:38:14 GMT landauf [9303] * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/src/libraries/core/Template.cc (modified) added warning if a template is used on a different type than it was ... Sun, 17 Jun 2012 16:24:06 GMT landauf [9302] * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) small cleanup. calling addTemplate() only once instead of twice Sat, 16 Jun 2012 13:23:01 GMT jo [9301] * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc (modified) Quick fix: Suppress default bots in racing gametypes, since so far we ... Sat, 16 Jun 2012 08:13:18 GMT jo [9300] * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo (modified) Fixed LastTeamStanding HUD and level. Sat, 16 Jun 2012 07:57:22 GMT jo [9299] * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) LastManStanding HUD cleanup. Sat, 16 Jun 2012 07:49:40 GMT jo [9298] * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) Quick fix; the missing file is on another machine. Thu, 14 Jun 2012 21:10:06 GMT landauf [9297] * code/branches/presentation2012merge/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) - fixed crash on closing pickup inventory. happened if pickup ... Tue, 12 Jun 2012 21:47:59 GMT landauf [9296] * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) remove dropped pickups from their collection Tue, 12 Jun 2012 21:42:43 GMT landauf [9295] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) removed fancy counters because they will get out of sync way too ... Tue, 12 Jun 2012 21:05:15 GMT landauf [9294] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.h (modified) removed 2 lines from ~PickupCollection() again because they don't ... Mon, 11 Jun 2012 20:57:40 GMT dafrick [9293] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) Should fix internal warnig (and compile error introduced in last commit) Mon, 11 Jun 2012 20:40:01 GMT dafrick [9292] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) Looked through recten changes in pickup module, should be fine! Sun, 10 Jun 2012 21:02:29 GMT landauf [9291] * code/branches/presentation2012merge/data/levels/pickups.oxw (modified) moved box which was on top of the spawn point Sun, 10 Jun 2012 21:01:40 GMT landauf [9290] * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.h (modified) Fixed crash with MSVC if a PickupCollection was used A depleted ... Sun, 10 Jun 2012 17:58:42 GMT jo [9289] * data/releaseData (deleted) Data branch is in wrong location. Sun, 10 Jun 2012 17:57:17 GMT jo [9288] * code/branches/releaseGame (deleted) Started new branch too early. Sun, 10 Jun 2012 16:08:44 GMT landauf [9287] * code/branches/presentation2012merge/src/orxonox/CameraManager.cc (modified) CameraManager inherits from OrxonoxClass, should call RegisterRootObject Sun, 10 Jun 2012 15:13:00 GMT jo [9286] * code/branches/presentation2012merge (modified) * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/src/modules/tetris/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.h (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisCenterpoint.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisScore.cc (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisScore.h (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h (modified) * code/branches/presentation2012merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified) Merged pCuts branch. Sun, 10 Jun 2012 15:03:16 GMT jo [9285] * 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) Adaptions for easier merge. Sun, 10 Jun 2012 12:09:14 GMT jo [9284] * data/releaseData (copied) Creating a new data-branch for the upcoming release. Sun, 10 Jun 2012 12:04:58 GMT jo [9283] * code/branches/releaseGame (copied) Creating a new branch for the upcoming release of the code. Sat, 09 Jun 2012 14:42:19 GMT landauf [9282] * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) quick fix: use tcl instead of shell commands to find ship templates ... Sat, 09 Jun 2012 13:51:51 GMT landauf [9281] * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (deleted) * code/branches/presentation2012merge/src/orxonox/ShipManager.h (deleted) small cleanup in ship selection: - renamed some functions - moved ... Tue, 05 Jun 2012 20:29:17 GMT landauf [9280] * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.h (modified) reformatted HUDNavigation... wtf happened here? do people know we ... Mon, 04 Jun 2012 20:50:28 GMT landauf [9279] * code/branches/presentation2012merge/src/libraries/core/Super.h (modified) * code/branches/presentation2012merge/src/libraries/core/XMLPort.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc (modified) use orxonox_cast instead of dynamic_cast wherever possible Mon, 04 Jun 2012 20:14:08 GMT landauf [9278] * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) forgot that originator can be NULL Mon, 04 Jun 2012 19:40:54 GMT landauf [9277] * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified) small cleanup of damage multiplier: added 'const' to getter and ... Sun, 03 Jun 2012 20:38:57 GMT landauf [9276] * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) fixed surfaceRace.oxw level Sun, 03 Jun 2012 19:53:24 GMT landauf [9275] * code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified) fixed spaceship engines in theTimeMachine.oxw Sun, 03 Jun 2012 19:51:59 GMT landauf [9274] * code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified) reverted more random stuff in level files Sun, 03 Jun 2012 19:25:48 GMT landauf [9273] * code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2012merge/src/orxonox/Scene.cc (modified) reverted wrong skybox in teamDeathMatch.oxw added try-catch to avoid ... Sun, 03 Jun 2012 16:05:24 GMT landauf [9272] * code/branches/presentation2012merge/data/gui/layouts/GUILayout.xsd (modified) * code/branches/presentation2012merge/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2012merge/data/levels/Spacerace2.oxw (modified) * code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (modified) * code/branches/presentation2012merge/data/levels/asteroidField.oxw (modified) * code/branches/presentation2012merge/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2012merge/data/levels/includes/CuboidSpaceStation.lua (modified) * code/branches/presentation2012merge/data/levels/includes/asteroidField.lua (modified) * code/branches/presentation2012merge/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentation2012merge/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/old/CuboidSpaceStation.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/FPS.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/tower.oxt (modified) * code/branches/presentation2012merge/data/levels/testStars.oxw (modified) * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc (modified) * code/branches/presentation2012merge/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) replaced tabs with spaces (no code changed)