#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 3:26:18 AM

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 06:57:23 GMT jo [9351]
	* code/branches/release2012 (copied)

	Creating a new branch in order to remove all unnecessary files.


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 <br> ...


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: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


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 ...


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: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: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)


Sun, 03 Jun 2012 15:17:18 GMT landauf [9271]
	* code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake (modified)
	* code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (modified)
	* code/branches/presentation2012merge/data/gui/layouts/SingleplayerConfigMenu.layout (modified)
	* code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified)
	* code/branches/presentation2012merge/data/gui/scripts/SingleplayerConfigMenu.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/includes/asteroidField.lua (modified)
	* code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (modified)
	* code/branches/presentation2012merge/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/branches/presentation2012merge/data/levels/missionOne.oxw (modified)
	* code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified)
	* code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipSpacecruiser.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/tower.oxt (modified)
	* code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified)
	* code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/presentation2012merge/doc/api/groups/Portals.dox (modified)
	* code/branches/presentation2012merge/doc/api/groups/Weapons.dox (modified)
	* code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake (modified)
	* code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake (modified)
	* code/branches/presentation2012merge/src/external/enet/VERSION (modified)
	* code/branches/presentation2012merge/src/external/tolua/README_ORXONOX (modified)
	* code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.h (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.h (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.h (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.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/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/TowerDefenseController.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.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/modules/towerdefense/towerdefensereadme.txt (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.h (modified)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/Mission.h (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.h (modified)

	svn:eol-style native (no changes in code)


Sun, 03 Jun 2012 14:56:07 GMT landauf [9270]
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified)

	fixed warning


Sun, 03 Jun 2012 14:33:13 GMT landauf [9269]
	* code/branches/presentation2012merge (modified)
	* code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (copied)
	* code/branches/presentation2012merge/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (copied)
	* code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (copied)
	* code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/presentation2012merge/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012merge/data/levels/portals.oxw (modified)
	* code/branches/presentation2012merge/data/levels/surfaceRace.oxw (copied)
	* code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (copied)
	* code/branches/presentation2012merge/data/levels/templates/tower.oxt (copied)
	* code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012merge/data/levels/towerDefense.oxw (copied)
	* code/branches/presentation2012merge/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/presentation2012merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense (copied)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.cc (copied)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.h (copied)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged presentation2012 to presentation2012merge


Sun, 03 Jun 2012 13:51:50 GMT landauf [9268]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/.project (deleted)

	corrected svn:mergeinfo
	removed .project and added it to ignore-list


Sun, 03 Jun 2012 13:44:44 GMT landauf [9267]
	* code/branches/dialogsystem2012 (deleted)
	* code/branches/spacegate (deleted)

	removed branches that weren't used


Sun, 03 Jun 2012 13:38:49 GMT landauf [9266]
	* code/branches/presentation2012merge (copied)

	created branch from trunk to merge the cleanup of presentation2011 ...


Sun, 27 May 2012 20:17:17 GMT landauf [9250]
	* code/branches/presentation2012/src/modules/towerdefense/Tower.h (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.h (modified)

	fixed build for msvc


Sun, 27 May 2012 17:59:29 GMT landauf [9249]
	* code/branches/environment3 (deleted)
	* code/branches/formation (deleted)
	* code/branches/gamecontent (deleted)
	* code/branches/hud (deleted)
	* code/branches/masterserver2 (deleted)
	* code/branches/masterserverfix (deleted)
	* code/branches/menue (deleted)
	* code/branches/spaceraceTwo (deleted)

	removed old branches from fall 2011


Thu, 24 May 2012 22:55:33 GMT decapitb [9248]
	* code/branches/presentation2012/data/levels/SurfaceRacePresentation.oxw (modified)

	added space junk and portals (with new mesh\!)


Thu, 24 May 2012 22:10:01 GMT decapitb [9247]
	* code/branches/presentation2012/data/levels/SurfaceRacePresentation.oxw (added)
	* code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (modified)

	surfacerace presentation level added. changed template name of ...


Thu, 24 May 2012 21:43:25 GMT decapitb [9246]
	* code/branches/presentation2012/data/gui/scripts/ShipSelectionMenu.lua (modified)

	'ls [path] -l' caused crash, changed to 'ls -l [path]'


Thu, 24 May 2012 20:07:43 GMT landauf [9245]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi (modified)
	* code/branches/presentation2012/data/levels/templates/tower.oxt (modified)
	* code/branches/presentation2012/data/levels/towerDefense.oxw (modified)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.h (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)

	tower defense update (again, now hopefully successful)


Thu, 24 May 2012 20:01:01 GMT landauf [9244]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.cc (deleted)
	* code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.h (deleted)
	* code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc (deleted)
	* code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h (deleted)

	reverted the rest of r9241


Thu, 24 May 2012 19:33:31 GMT landauf [9243]
	* code/branches/presentation2012/CMakeLists.txt (modified)
	* code/branches/presentation2012/INSTALL (modified)
	* code/branches/presentation2012/LICENSE (modified)
	* code/branches/presentation2012/README (modified)
	* code/branches/presentation2012/bin (modified)
	* code/branches/presentation2012/cmake (modified)
	* code/branches/presentation2012/contrib (modified)
	* code/branches/presentation2012/data (modified)
	* code/branches/presentation2012/data/levels (modified)
	* code/branches/presentation2012/data/levels/FPSTest.oxw (modified)
	* code/branches/presentation2012/data/levels/Spacerace2.oxw (modified)
	* code/branches/presentation2012/data/levels/asteroidField.oxw (modified)
	* code/branches/presentation2012/data/levels/asteroids.oxw (modified)
	* code/branches/presentation2012/data/levels/docking.oxw (modified)
	* code/branches/presentation2012/data/levels/dynamicMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/earth.oxw (modified)
	* code/branches/presentation2012/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentation2012/data/levels/events.oxw (modified)
	* code/branches/presentation2012/data/levels/fightInOurBack.oxw (modified)
	* code/branches/presentation2012/data/levels/includes (modified)
	* code/branches/presentation2012/data/levels/includes/CuboidSpaceStation.lua (modified)
	* code/branches/presentation2012/data/levels/includes/asteroidField.lua (modified)
	* code/branches/presentation2012/data/levels/includes/notifications.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsFPS.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsGhost.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsH2.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsHXY.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsImmTest.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsPirate.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsSwallow.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsTransporter.oxi (modified)
	* code/branches/presentation2012/data/levels/lastManStanding.oxw (modified)
	* code/branches/presentation2012/data/levels/lastTeamStanding.oxw (modified)
	* code/branches/presentation2012/data/levels/lastTeamStandingII.oxw (modified)
	* code/branches/presentation2012/data/levels/missionOne.oxw (modified)
	* code/branches/presentation2012/data/levels/myTestLevel.oxw (modified)
	* code/branches/presentation2012/data/levels/notifications.oxw (modified)
	* code/branches/presentation2012/data/levels/old (modified)
	* code/branches/presentation2012/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012/data/levels/pirateAttack.oxw (modified)
	* code/branches/presentation2012/data/levels/planets.oxw (modified)
	* code/branches/presentation2012/data/levels/pong.oxw (modified)
	* code/branches/presentation2012/data/levels/portals.oxw (modified)
	* code/branches/presentation2012/data/levels/presentation.oxw (modified)
	* code/branches/presentation2012/data/levels/presentation09.oxw (modified)
	* code/branches/presentation2012/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationDM.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS10.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS102.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS10Ed.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS11.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationHS11.oxw (modified)
	* code/branches/presentation2012/data/levels/princessAeryn.oxw (modified)
	* code/branches/presentation2012/data/levels/quests.oxw (modified)
	* code/branches/presentation2012/data/levels/screenshot.oxw (modified)
	* code/branches/presentation2012/data/levels/shieldTest.oxw (modified)
	* code/branches/presentation2012/data/levels/sound.oxw (modified)
	* code/branches/presentation2012/data/levels/spaceRace.oxw (modified)
	* code/branches/presentation2012/data/levels/surfaceRace.oxw (modified)
	* code/branches/presentation2012/data/levels/teamBaseMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/templates (modified)
	* code/branches/presentation2012/data/levels/templates/FPS.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/lodInformation.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt (modified)
	* code/branches/presentation2012/data/levels/testStars.oxw (modified)
	* code/branches/presentation2012/data/levels/testSwallow.oxw (modified)
	* code/branches/presentation2012/data/levels/tetris.oxw (modified)
	* code/branches/presentation2012/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012/data/levels/underAttack.oxw (modified)
	* code/branches/presentation2012/data/levels/waypoints.oxw (modified)
	* code/branches/presentation2012/data/overlays (modified)
	* code/branches/presentation2012/data/overlays/HUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentation2012/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/branches/presentation2012/data/overlays/debug.oxo (modified)
	* code/branches/presentation2012/data/overlays/dynamicMatchHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/lastManStandingHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/pongHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/stats.oxo (modified)
	* code/branches/presentation2012/data/overlays/teamBaseMatchHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/underAttackHUD.oxo (modified)
	* code/branches/presentation2012/doc (modified)
	* code/branches/presentation2012/src (modified)
	* code/branches/presentation2012/src/modules (modified)
	* code/branches/presentation2012/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012/src/modules/designtools (modified)
	* code/branches/presentation2012/src/modules/docking (modified)
	* code/branches/presentation2012/src/modules/gametypes (modified)
	* code/branches/presentation2012/src/modules/notifications (modified)
	* code/branches/presentation2012/src/modules/objects (modified)
	* code/branches/presentation2012/src/modules/overlays (modified)
	* code/branches/presentation2012/src/modules/pickup (modified)
	* code/branches/presentation2012/src/modules/pong (modified)
	* code/branches/presentation2012/src/modules/portals (modified)
	* code/branches/presentation2012/src/modules/questsystem (modified)
	* code/branches/presentation2012/src/modules/tetris (modified)
	* code/branches/presentation2012/src/modules/weapons (modified)

	removed accidental svn:mergeinfo from r9241


Thu, 24 May 2012 19:24:58 GMT landauf [9242]
	* code/branches/captureTheFlag/.project (deleted)
	* code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi (deleted)
	* code/branches/captureTheFlag/data/levels/templates/tower.oxt (deleted)
	* code/branches/captureTheFlag/data/levels/towerDefense.oxw (deleted)
	* code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo (deleted)
	* code/branches/captureTheFlag/src/modules/towerdefense (deleted)

	reverted accidental changes from r9241


Thu, 24 May 2012 18:49:19 GMT decapitb [9241]
	* code/branches/captureTheFlag/.project (copied)
	* code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/captureTheFlag/data/levels/templates/tower.oxt (copied)
	* code/branches/captureTheFlag/data/levels/towerDefense.oxw (copied)
	* code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/CMakeLists.txt (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TDEnemy.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/Tower.cc (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/Tower.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefense.cc (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefense.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseCenterpoint.cc (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseCenterpoint.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseController.cc (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseController.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseHUDController.cc (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseHUDController.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefensePlayerStats.cc (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefensePlayerStats.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/TowerDefensePrereqs.h (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/tower (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/tower/Tower.blend (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/tower/Tower.material (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/tower/Tower.mesh (copied)
	* code/branches/captureTheFlag/src/modules/towerdefense/towerdefensereadme.txt (copied)
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/CMakeLists.txt (modified)
	* code/branches/presentation2012/INSTALL (modified)
	* code/branches/presentation2012/LICENSE (modified)
	* code/branches/presentation2012/README (modified)
	* code/branches/presentation2012/bin (modified)
	* code/branches/presentation2012/cmake (modified)
	* code/branches/presentation2012/contrib (modified)
	* code/branches/presentation2012/data (modified)
	* code/branches/presentation2012/data/levels (modified)
	* code/branches/presentation2012/data/levels/FPSTest.oxw (modified)
	* code/branches/presentation2012/data/levels/Spacerace2.oxw (modified)
	* code/branches/presentation2012/data/levels/asteroidField.oxw (modified)
	* code/branches/presentation2012/data/levels/asteroids.oxw (modified)
	* code/branches/presentation2012/data/levels/docking.oxw (modified)
	* code/branches/presentation2012/data/levels/dynamicMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/earth.oxw (modified)
	* code/branches/presentation2012/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentation2012/data/levels/events.oxw (modified)
	* code/branches/presentation2012/data/levels/fightInOurBack.oxw (modified)
	* code/branches/presentation2012/data/levels/includes (modified)
	* code/branches/presentation2012/data/levels/includes/CuboidSpaceStation.lua (modified)
	* code/branches/presentation2012/data/levels/includes/asteroidField.lua (modified)
	* code/branches/presentation2012/data/levels/includes/notifications.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsFPS.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsGhost.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsH2.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsHXY.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsImmTest.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsPirate.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsSwallow.oxi (modified)
	* code/branches/presentation2012/data/levels/includes/weaponSettingsTransporter.oxi (modified)
	* code/branches/presentation2012/data/levels/lastManStanding.oxw (modified)
	* code/branches/presentation2012/data/levels/lastTeamStanding.oxw (modified)
	* code/branches/presentation2012/data/levels/lastTeamStandingII.oxw (modified)
	* code/branches/presentation2012/data/levels/missionOne.oxw (modified)
	* code/branches/presentation2012/data/levels/myTestLevel.oxw (modified)
	* code/branches/presentation2012/data/levels/notifications.oxw (modified)
	* code/branches/presentation2012/data/levels/old (modified)
	* code/branches/presentation2012/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012/data/levels/pirateAttack.oxw (modified)
	* code/branches/presentation2012/data/levels/planets.oxw (modified)
	* code/branches/presentation2012/data/levels/pong.oxw (modified)
	* code/branches/presentation2012/data/levels/portals.oxw (modified)
	* code/branches/presentation2012/data/levels/presentation.oxw (modified)
	* code/branches/presentation2012/data/levels/presentation09.oxw (modified)
	* code/branches/presentation2012/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationDM.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS10.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS102.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS10Ed.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationFS11.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation2012/data/levels/presentationHS11.oxw (modified)
	* code/branches/presentation2012/data/levels/princessAeryn.oxw (modified)
	* code/branches/presentation2012/data/levels/quests.oxw (modified)
	* code/branches/presentation2012/data/levels/screenshot.oxw (modified)
	* code/branches/presentation2012/data/levels/shieldTest.oxw (modified)
	* code/branches/presentation2012/data/levels/sound.oxw (modified)
	* code/branches/presentation2012/data/levels/spaceRace.oxw (modified)
	* code/branches/presentation2012/data/levels/surfaceRace.oxw (modified)
	* code/branches/presentation2012/data/levels/teamBaseMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/templates (modified)
	* code/branches/presentation2012/data/levels/templates/FPS.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/lodInformation.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt (modified)
	* code/branches/presentation2012/data/levels/testStars.oxw (modified)
	* code/branches/presentation2012/data/levels/testSwallow.oxw (modified)
	* code/branches/presentation2012/data/levels/tetris.oxw (modified)
	* code/branches/presentation2012/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012/data/levels/underAttack.oxw (modified)
	* code/branches/presentation2012/data/levels/waypoints.oxw (modified)
	* code/branches/presentation2012/data/overlays (modified)
	* code/branches/presentation2012/data/overlays/HUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentation2012/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/branches/presentation2012/data/overlays/debug.oxo (modified)
	* code/branches/presentation2012/data/overlays/dynamicMatchHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/lastManStandingHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/pongHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/stats.oxo (modified)
	* code/branches/presentation2012/data/overlays/teamBaseMatchHUD.oxo (modified)
	* code/branches/presentation2012/data/overlays/underAttackHUD.oxo (modified)
	* code/branches/presentation2012/doc (modified)
	* code/branches/presentation2012/src (modified)
	* code/branches/presentation2012/src/modules (modified)
	* code/branches/presentation2012/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012/src/modules/designtools (modified)
	* code/branches/presentation2012/src/modules/docking (modified)
	* code/branches/presentation2012/src/modules/gametypes (modified)
	* code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.cc (copied)
	* code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.h (copied)
	* code/branches/presentation2012/src/modules/notifications (modified)
	* code/branches/presentation2012/src/modules/objects (modified)
	* code/branches/presentation2012/src/modules/overlays (modified)
	* code/branches/presentation2012/src/modules/pickup (modified)
	* code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc (copied)
	* code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h (copied)
	* code/branches/presentation2012/src/modules/pong (modified)
	* code/branches/presentation2012/src/modules/portals (modified)
	* code/branches/presentation2012/src/modules/questsystem (modified)
	* code/branches/presentation2012/src/modules/tetris (modified)
	* code/branches/presentation2012/src/modules/weapons (modified)

	tower defense update


Thu, 24 May 2012 13:06:56 GMT mpalic [9237]
	* code/branches/spacebomb/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/spacebomb/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	Modified SimpleRocket to be able to use it for the SpaceBomb


Thu, 24 May 2012 08:00:06 GMT mentzerf [9236]
	* code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified)
	* code/branches/newlevel2012/data/levels/templates/tower.oxt (modified)
	* code/branches/newlevel2012/data/levels/towerDefense.oxw (modified)
	* code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified)
	* code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)

	* Changed waypoint scale so that they are not visible anymore
	* ...


Wed, 23 May 2012 15:59:03 GMT decapitb [9234]
	* code/branches/captureTheFlag/src/modules/gametypes/CaptureTheFlag.cc (added)
	* code/branches/captureTheFlag/src/modules/gametypes/CaptureTheFlag.h (added)

	resolving conflict... i hope


Wed, 23 May 2012 15:58:17 GMT decapitb [9233]
	* code/branches/captureTheFlag/src/modules/gametypes/captureTheFlag.cc (deleted)
	* code/branches/captureTheFlag/src/modules/gametypes/captureTheFlag.h (deleted)




Wed, 23 May 2012 15:56:57 GMT decapitb [9232]
	* code/branches/captureTheFlag (modified)
	* code/branches/captureTheFlag/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/captureTheFlag/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.cc (copied)
	* code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (copied)
	* code/branches/captureTheFlag/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/captureTheFlag/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/captureTheFlag/src/orxonox/worldentities/pawns/Pawn.h (modified)

	safety checkin


Wed, 23 May 2012 15:56:32 GMT decapitb [9231]
	* code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (deleted)

	conflict...


Wed, 23 May 2012 15:55:49 GMT decapitb [9230]
	* code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.cc (deleted)

	conflict...


Wed, 23 May 2012 11:07:29 GMT decapitb [9229]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/.project (copied)
	* code/branches/presentation2012/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/presentation2012/data/levels/portals.oxw (modified)
	* code/branches/presentation2012/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/tower.oxt (copied)
	* code/branches/presentation2012/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012/data/levels/towerDefense.oxw (copied)
	* code/branches/presentation2012/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/presentation2012/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012/src/modules/towerdefense (copied)
	* code/branches/presentation2012/src/modules/towerdefense/CMakeLists.txt (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TDEnemy.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseHUDController.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseHUDController.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePrereqs.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower/Tower.blend (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower/Tower.material (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower/Tower.mesh (copied)
	* code/branches/presentation2012/src/modules/towerdefense/towerdefensereadme.txt (copied)
	* code/branches/presentation2012/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012/src/orxonox/controllers/WaypointController.cc (modified)
	* code/branches/presentation2012/src/orxonox/worldentities/WorldEntity.cc (modified)

	merged towerdefense


Sat, 19 May 2012 22:52:15 GMT landauf [9226]
	* code/branches/testing/src/libraries/util/MultiType.h (modified)
	* code/branches/testing/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/testing/test/util/MultiTypeTest.cc (modified)

	changed hasDefaultValue() to lastConversionSuccessful() (inverted ...


Sat, 19 May 2012 21:24:18 GMT landauf [9225]
	* code/branches/testing/src/libraries/core/command/Shell.cc (modified)
	* code/branches/testing/src/libraries/util/MultiType.cc (modified)
	* code/branches/testing/src/libraries/util/MultiType.h (modified)
	* code/branches/testing/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/testing/src/orxonox/graphics/ParticleEmitter.cc (modified)
	* code/branches/testing/test/util/MultiTypeTest.cc (modified)

	a lot of refactoring in the internals of MultiType
	renamed set<T>() ...


Sat, 19 May 2012 13:03:02 GMT landauf [9224]
	* code/branches/testing/src/libraries/core/CommandLineParser.cc (modified)
	* code/branches/testing/src/libraries/core/CommandLineParser.h (modified)
	* code/branches/testing/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/branches/testing/src/libraries/core/Core.cc (modified)
	* code/branches/testing/src/libraries/core/PathConfig.cc (modified)
	* code/branches/testing/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/branches/testing/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/branches/testing/src/libraries/core/command/TclBind.cc (modified)
	* code/branches/testing/src/libraries/network/Client.cc (modified)
	* code/branches/testing/src/libraries/tools/Shader.cc (modified)
	* code/branches/testing/src/libraries/util/MultiType.h (modified)
	* code/branches/testing/src/orxonox/LevelManager.cc (modified)
	* code/branches/testing/src/orxonox/Main.cc (modified)
	* code/branches/testing/test/util/MultiTypeTest.cc (modified)

	renamed set and get functions in MultiType:
	 - setValue() -> set()
	 ...


Sat, 19 May 2012 09:35:32 GMT landauf [9223]
	* code/branches/testing/src/libraries/util/MultiType.h (modified)
	* code/branches/testing/test/util/MultiTypeTest.cc (modified)

	renamed setType<T>() to reset<T>()


Sat, 19 May 2012 09:27:07 GMT landauf [9222]
	* code/branches/testing/src/libraries/core/CommandLineParser.cc (modified)
	* code/branches/testing/src/libraries/core/CommandLineParser.h (modified)
	* code/branches/testing/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/branches/testing/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/branches/testing/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/branches/testing/src/libraries/core/command/Executor.cc (modified)
	* code/branches/testing/src/libraries/core/command/Executor.h (modified)
	* code/branches/testing/src/libraries/core/command/Functor.h (modified)
	* code/branches/testing/src/libraries/tools/Shader.cc (modified)
	* code/branches/testing/src/libraries/tools/Shader.h (modified)
	* code/branches/testing/src/libraries/util/MultiType.cc (modified)
	* code/branches/testing/src/libraries/util/MultiType.h (modified)
	* code/branches/testing/src/libraries/util/MultiTypeValue.h (modified)

	renamed MT_Value as MultiType::Type and removed it from the public ...


Fri, 18 May 2012 21:17:31 GMT landauf [9221]
	* code/branches/testing/src/libraries/util/MultiType.h (modified)
	* code/branches/testing/test/util/CMakeLists.txt (modified)
	* code/branches/testing/test/util/MultiTypeTest.cc (added)

	added tests for MultiType
	added isType<void>() which is equivalent ...


Fri, 18 May 2012 15:46:57 GMT ninow [9220]
	* code/branches/captureTheFlag/data/levels/captureTheFlag.oxw (modified)
	* code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt (modified)
	* code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (modified)

	fixed some errors