#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 11, 2024, 7:41:24 AM

Mon, 26 Nov 2012 15:08:25 GMT moralelastix [9469]
	* code/branches/turret/data/levels/turretTest.oxw (added)
	* code/branches/turret/src/modules/objects/Turret.cc (modified)
	* code/branches/turret/src/modules/objects/Turret.h (modified)

	preparations


Mon, 26 Nov 2012 15:06:46 GMT mottetb [9468]
	* code/branches/spaceNavigation/data/defaultConfig/keybindings.ini (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified)

	shortcuts don't work


Mon, 26 Nov 2012 14:58:05 GMT davidsa [9466]
	* code/branches/shaders/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.h (modified)

	WIP: fixing max pixel calculation and size scaling of the billboards


Sun, 25 Nov 2012 18:43:59 GMT davidsa [9464]
	* code/branches/shaders/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.h (modified)

	Updated orxonox::LensFlare, the effect has been expanded by several ...


Tue, 20 Nov 2012 17:47:28 GMT davidsa [9462]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	Added additional LensFlare parameters to the Shader-Test level


Tue, 20 Nov 2012 17:46:03 GMT davidsa [9461]
	* code/branches/shaders/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/Billboard.h (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.h (modified)

	Updated orxonox::Billboard so you can disable FrustumCulling. Also ...


Mon, 19 Nov 2012 15:25:11 GMT moralelastix [9460]
	* code/branches/turret/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/turret/src/modules/objects/ObjectsPrereqs.h (modified)
	* code/branches/turret/src/modules/objects/Turret.cc (added)
	* code/branches/turret/src/modules/objects/Turret.h (added)

	Empty Class


Mon, 19 Nov 2012 15:19:27 GMT purgham [9459]
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceBot.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceBot.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified)

	working Version 19.11.2012 - Bots can create virtual Checkpoints but ...


Mon, 19 Nov 2012 15:06:56 GMT mottetb [9457]
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/spaceNavigation/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/spaceNavigation/src/orxonox/interfaces/RadarViewable.h (modified)

	getTeam doesn't work, have to find sth else


Mon, 19 Nov 2012 14:45:57 GMT keuschr [9455]
	* code/branches/largeShip1/data/levels/collateralDamageDemo.oxw (added)
	* code/branches/largeShip1/data/levels/includes/weaponSettingsCollateral.oxi (added)

	forgot some files


Mon, 19 Nov 2012 14:44:38 GMT keuschr [9454]
	* code/branches/largeShip1/data/levels/templates/spaceshipCollateralDamage.oxt (added)

	Added new ship template. Materials to follow.


Mon, 19 Nov 2012 12:24:19 GMT purgham [9451]
	* code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified)

	working Version 19.11.2012 - Bots can allways be included


Mon, 19 Nov 2012 06:25:00 GMT jo [9450]
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)

	Cleanup.


Wed, 14 Nov 2012 20:16:18 GMT davidsa [9448]
	* code/branches/shaders/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/shaders/src/orxonox/RenderQueueListener.h (modified)
	* code/branches/shaders/src/orxonox/Scene.cc (modified)
	* code/branches/shaders/src/orxonox/Scene.h (modified)
	* code/branches/shaders/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/Billboard.h (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.h (modified)

	Added Hardware Occlusion Query Capabilities for use in dynamic flare ...


Tue, 13 Nov 2012 15:56:49 GMT davidsa [9446]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	Slightly modified shader test level, to see orxonox::LensFlare ...


Tue, 13 Nov 2012 15:54:24 GMT davidsa [9445]
	* code/branches/shaders/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.cc (added)
	* code/branches/shaders/src/orxonox/graphics/LensFlare.h (added)

	Added orxonox::LensFlare, to add LensFlare effects, this is still ...


Mon, 12 Nov 2012 22:07:01 GMT jo [9444]
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)

	The time seems correct. The marker positioning also seems to be ok. ...


Mon, 12 Nov 2012 15:37:08 GMT mottetb [9443]
	* code/branches/spaceNavigation/data/levels/missionOne.oxw (modified)
	* code/branches/spaceNavigation/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified)

	was fuer einen Fortschritt heute!


Mon, 12 Nov 2012 15:13:27 GMT purgham [9441]
	* code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (modified)

	BUG 12.11.2012 Error if create Bots after start


Thu, 08 Nov 2012 21:58:11 GMT jo [9437]
	* code/branches/soundEffects/src/modules/portals/PortalEndPoint.cc (modified)
	* code/branches/soundEffects/src/modules/portals/PortalEndPoint.h (modified)

	Rough example on how to add sound to existing orxonox objects. A ...


Mon, 05 Nov 2012 15:21:40 GMT purgham [9436]
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified)

	working Version 5.11.2012 - Bots can be included after starting the
	level


Mon, 05 Nov 2012 15:11:29 GMT mottetb [9435]
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDAimAssistant.cc (deleted)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDAimAssistant.h (deleted)

	Removed old files


Mon, 05 Nov 2012 15:06:21 GMT mottetb [9434]
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified)

	aimMarkerSize aendert nichts im Spiel


Mon, 05 Nov 2012 15:05:31 GMT davidsa [9433]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	Modified shader test level, added proper collision shape and changed ...


Mon, 05 Nov 2012 14:58:03 GMT purgham [9432]
	* code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt (modified)
	* code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceBot.cc (added)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceBot.h (added)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified)

	first working Version


Mon, 05 Nov 2012 13:30:37 GMT mottetb [9429]
	* code/branches/spaceNavigation/data/overlays/HUD.oxo (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified)

	aimMarkerSize Problem


Mon, 05 Nov 2012 13:15:34 GMT davidsa [9428]
	* code/branches/shaders/src/orxonox/graphics/Model.cc (modified)

	FIX: changed standard render group to main, this prevents that ...


Sun, 04 Nov 2012 12:51:48 GMT davidsa [9426]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	Changed shader test level so that it uses a round object, since you ...


Mon, 29 Oct 2012 16:02:47 GMT davidsa [9423]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	Slightly modified the shader test level to use the new XML Port and ...


Mon, 29 Oct 2012 16:00:19 GMT davidsa [9422]
	* code/branches/shaders/src/orxonox/graphics/Model.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/Model.h (modified)

	Added some documentation to orxonox::Model and refined the XML Port ...


Mon, 29 Oct 2012 15:22:11 GMT mottetb [9421]
	* code/branches/spaceNavigation/data/overlays/HUD.oxo (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified)

	Oct 29th, works pretty well!


Mon, 29 Oct 2012 15:16:17 GMT davidsa [9420]
	* code/branches/shaders/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/shaders/src/orxonox/Scene.cc (modified)
	* code/branches/shaders/src/orxonox/Scene.h (modified)

	Added some documentation to orxonox::Scene


Mon, 29 Oct 2012 14:48:20 GMT davidsa [9419]
	* code/branches/shaders/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/shaders/src/orxonox/RenderQueueListener.h (modified)

	Added documentation to orxonox::RenderQueueListener


Mon, 22 Oct 2012 15:05:14 GMT purgham [9412]
	* code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h (modified)

	Made SpaceRace-Mode usable for more then 1 Spaceship


Sun, 21 Oct 2012 15:51:47 GMT davidsa [9409]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	Modified Shader Test Level to use the newly added shader, so stencil ...


Sun, 21 Oct 2012 15:32:00 GMT davidsa [9407]
	* code/branches/shaders/src/orxonox/CMakeLists.txt (modified)
	* code/branches/shaders/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/shaders/src/orxonox/RenderQueueListener.cc (added)
	* code/branches/shaders/src/orxonox/RenderQueueListener.h (added)
	* code/branches/shaders/src/orxonox/Scene.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/Model.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/Model.h (modified)

	orxonox::RenderQueueListener: Implemented a rudimentary ...


Tue, 16 Oct 2012 14:48:57 GMT davidsa [9403]
	* code/branches/shaders/data/levels/shadertest.oxw (added)

	Showcase: Added Level 'Shader Test' to test the XML-Port ...


Tue, 16 Oct 2012 13:32:20 GMT davidsa [9402]
	* code/branches/shaders/src/orxonox/graphics/Model.cc (modified)
	* code/branches/shaders/src/orxonox/graphics/Model.h (modified)

	Orxonox::Model: added XMLPort 'material' to easily attach a ...


Tue, 16 Oct 2012 13:30:20 GMT davidsa [9401]
	* code/branches/shaders/src/libraries/tools/Mesh.cc (modified)
	* code/branches/shaders/src/libraries/tools/Mesh.h (modified)

	Orxonox::Mesh: Added functions setMaterial() and getMaterial() to ...


Mon, 15 Oct 2012 14:33:52 GMT mottetb [9400]
	* code/branches/spaceNavigation/data/overlays/HUD.oxo (modified)
	* code/branches/spaceNavigation/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDAimAssistant.cc (added)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDAimAssistant.h (added)
	* code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified)

	first checkin


Mon, 15 Oct 2012 14:21:44 GMT purgham [9399]
	* code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt (modified)
	* code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (added)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (added)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h (modified)

	Created new SpaceRaceController and added a function to
	SpaceRaceManager


Mon, 15 Oct 2012 13:43:47 GMT soroa [9396]
	* code/branches/SpaceshipNavigation2/data/overlays/HUD.oxo (modified)
	* code/branches/SpaceshipNavigation2/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/SpaceshipNavigation2/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/SpaceshipNavigation2/src/modules/overlays/hud/HUDFindClosestEnemy.cc (added)
	* code/branches/SpaceshipNavigation2/src/modules/overlays/hud/HUDFindClosestEnemy.h (added)
	* code/branches/SpaceshipNavigation2/src/orxonox/worldentities/ControllableEntity.cc (modified)

	Created a new class called FindClosestEnemy


Mon, 15 Oct 2012 13:12:13 GMT davidsa [9395]
	* code/branches/shaders/src/libraries/core/Resource.cc (modified)

	FIX: dynamic_cast from const to non-const is prohibited in newer ...


Mon, 08 Oct 2012 12:31:39 GMT jo [9388]
	* code/branches/Racingbot (copied)

	Racebot branch.


Mon, 08 Oct 2012 12:12:55 GMT jo [9385]
	* code/branches/SpaceshipNavigation2 (copied)

	Space Ship Navigation Branch 2 - for SoroA


Mon, 08 Oct 2012 12:06:14 GMT jo [9384]
	* code/branches/largeShip1 (copied)

	LargeShips branch


Mon, 08 Oct 2012 11:51:28 GMT jo [9383]
	* code/branches/LevelLoader (copied)

	Creating new branch.


Mon, 08 Oct 2012 11:50:35 GMT jo [9382]
	* code/branches/soundEffects (copied)

	Creating new branch.


Mon, 08 Oct 2012 11:50:07 GMT jo [9381]
	* code/branches/spaceNavigation (copied)

	Creating new branch.


Mon, 08 Oct 2012 11:47:04 GMT jo [9380]
	* code/branches/turret (copied)

	Creating new branch.


Mon, 08 Oct 2012 11:46:35 GMT jo [9379]
	* code/branches/shaders (copied)

	Creating new branch.


Mon, 01 Oct 2012 11:08:19 GMT smerkli [9378]
	* code/branches/tutorial2/data/levels/tutorial.oxw (modified)

	Fixed skybox to be something that works in tutorial.oxw


Wed, 12 Sep 2012 06:18:56 GMT jo [9377]
	* code/branches/release2012/data/levels/missionOne.oxw (modified)
	* code/branches/release2012/data/levels/spaceRace.oxw (modified)

	Renaming some level descriptions.


Fri, 07 Sep 2012 22:09:38 GMT jo [9376]
	* code/branches/release2012/data/gui/scripts/MiscConfigMenu.lua (modified)

	I added the new configValue from TeamDeathmatch to the Miscellaneous ...


Fri, 07 Sep 2012 15:06:14 GMT jo [9375]
	* code/branches/release2012/data/gui/layouts/CreditsMenu.layout (modified)

	Updated Credits: We should mention AMIV as promised in the GV.


Thu, 06 Sep 2012 14:47:26 GMT jo [9374]
	* code/branches/release2012/data/gui/scripts/HostMenu.lua (modified)

	Fixing logic error and removing preselection of the showall button.


Thu, 06 Sep 2012 14:40:00 GMT jo [9373]
	* code/branches/release2012/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/release2012/data/levels/asteroids.oxw (modified)
	* code/branches/release2012/data/levels/missionOne.oxw (modified)
	* code/branches/release2012/data/levels/spaceRace.oxw (modified)
	* code/branches/release2012/data/levels/surfaceRace.oxw (modified)
	* code/branches/release2012/data/levels/tetris.oxw (modified)
	* code/branches/release2012/data/levels/theTimeMachine.oxw (modified)
	* code/branches/release2012/src/orxonox/LevelInfo.cc (modified)

	On the way to adjust multiplayermenue. Levels tagged with ...


Thu, 06 Sep 2012 13:00:38 GMT jo [9372]
	* code/branches/release2012/data/levels/underAttack.oxw (modified)
	* code/branches/release2012/src/orxonox/gametypes/UnderAttack.cc (modified)

	Small improvements; adjusting values for better playfeeling. An ...


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