# # ChangeLog for code/trunk/data/gui/layouts # # Generated by Trac 1.0.9 # Dec 30, 2024, 8:09:32 PM Fri, 03 Jan 2014 11:45:21 GMT landauf [9943] * code/trunk/data/gui/layouts/UndockingDialog.layout (modified) * code/trunk/data/gui/scripts/UndockingDialog.lua (modified) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/InsideSpaceStation.oxw (modified) * code/trunk/data/levels/Invaders.oxw (modified) * code/trunk/data/levels/_temp.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (modified) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/trunk/data/levels/includes/HeavyCruiserParts.lua (modified) * code/trunk/data/levels/includes/invaderWeapon.oxi (modified) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/radar3D_test.oxw (modified) * code/trunk/data/levels/templates/.shipmodels (modified) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/trunk/data/levels/templates/enemyInvader.oxt (modified) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (modified) * code/trunk/data/levels/templates/spaceshipInvader.oxt (modified) * code/trunk/data/overlays/InvaderHUD.oxo (modified) * code/trunk/src/modules/invader/CMakeLists.txt (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.h (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.h (modified) * code/trunk/src/modules/invader/InvaderPrereqs.h (modified) * code/trunk/src/modules/invader/InvaderShip.cc (modified) * code/trunk/src/modules/invader/InvaderShip.h (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/invader/InvaderWeapon.h (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (modified) * code/trunk/src/modules/overlays/hud/CountDown.h (modified) eol-style native Sun, 29 Dec 2013 19:06:44 GMT jo [9941] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) Adding most of the changes that were proposed in the release2012 branch. Sat, 21 Dec 2013 22:16:54 GMT jo [9939] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/UndockingDialog.layout (copied) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/UndockingDialog.lua (copied) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/HeavyCruiser.oxw (copied) * code/trunk/data/levels/InsideSpaceStation.oxw (copied) * code/trunk/data/levels/Invaders.oxw (copied) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/_temp.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (copied) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (copied) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (copied) * code/trunk/data/levels/includes/HeavyCruiserParts.lua (copied) * code/trunk/data/levels/includes/invaderWeapon.oxi (copied) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/maxim.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS13.oxw (copied) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/radar3D_test.oxw (copied) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/.shipmodels (copied) * code/trunk/data/levels/templates/HeavyCruiser.oxt (copied) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (copied) * code/trunk/data/levels/templates/enemyInvader.oxt (copied) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (copied) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipInvader.oxt (copied) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/InvaderHUD.oxo (copied) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/Dock.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified) * code/trunk/src/modules/invader (copied) * code/trunk/src/modules/invader/CMakeLists.txt (copied) * code/trunk/src/modules/invader/Invader.cc (copied) * code/trunk/src/modules/invader/Invader.h (copied) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (copied) * code/trunk/src/modules/invader/InvaderCenterPoint.h (copied) * code/trunk/src/modules/invader/InvaderEnemy.cc (copied) * code/trunk/src/modules/invader/InvaderEnemy.h (copied) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (copied) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (copied) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (copied) * code/trunk/src/modules/invader/InvaderHUDinfo.h (copied) * code/trunk/src/modules/invader/InvaderPrereqs.h (copied) * code/trunk/src/modules/invader/InvaderShip.cc (copied) * code/trunk/src/modules/invader/InvaderShip.h (copied) * code/trunk/src/modules/invader/InvaderWeapon.cc (copied) * code/trunk/src/modules/invader/InvaderWeapon.h (copied) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (copied) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (copied) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/debugging/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (copied) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (copied) * code/trunk/src/modules/overlays/hud/CountDown.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) presentationHS13 branch merged into trunk Mon, 11 Nov 2013 16:45:53 GMT bknecht [9782] * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) Level description GUI element now wraps text nicely Sun, 25 Aug 2013 08:05:37 GMT landauf [9665] * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) removed svn:executable property Thu, 30 Aug 2012 21:08:17 GMT landauf [9348] * code/trunk (modified) * code/trunk/cmake/tools/BuildUnits.cmake (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (modified) * code/trunk/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/asteroidField.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (modified) * code/trunk/data/levels/old/princessAeryn.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/tower.oxt (copied) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicMatchHUD.oxo (modified) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/data/overlays/tetrisHUD.oxo (copied) * code/trunk/data/overlays/towerdefenseHUD.oxo (copied) * code/trunk/data/overlays/underAttackHUD.oxo (deleted) * code/trunk/data/particle/smoke1.particle (deleted) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/doc/api/groups/Weapons.dox (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (modified) * code/trunk/src/BuildUnitsConfigMSVC.cmake (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/tolua/README_ORXONOX (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (deleted) * code/trunk/src/modules/pickup/DroppedPickup.h (deleted) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (copied) * code/trunk/src/modules/tetris/TetrisBrick.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisPrereqs.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (copied) * code/trunk/src/modules/tetris/TetrisScore.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/pickup (deleted) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) merged branch presentation2012merge back to trunk Wed, 15 Feb 2012 22:51:58 GMT jo [9016] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (copied) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/asteroidField.lua (copied) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (copied) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/underAttackHUD.oxo (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (copied) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (copied) * code/trunk/src/orxonox/controllers/FormationController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (copied) * code/trunk/src/orxonox/gametypes/Mission.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (copied) * code/trunk/src/orxonox/gametypes/TeamGametype.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merging presentation2011 branch to trunk. Please check for possible bugs. Wed, 12 Oct 2011 12:06:35 GMT smerkli [8888] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) Improved file formatting for better readability and reduced eyestrain :D Tue, 14 Jun 2011 18:53:28 GMT dafrick [8706] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/DockingDialog.layout (copied) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/scripts/DockingDialog.lua (copied) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/notifications.oxi (copied) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (copied) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (copied) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (copied) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipImmTest.oxt (copied) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (copied) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/particle/RingExp.particle (copied) * code/trunk/data/particle/RingExp2.particle (copied) * code/trunk/data/particle/RingExp3.particle (copied) * code/trunk/data/particle/Shield.particle (copied) * code/trunk/data/particle/weaponflare.particle (copied) * code/trunk/data/particle/weaponshoot.particle (copied) * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/groups/Portals.dox (copied) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/ThreadWin.cc (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking (copied) * code/trunk/src/modules/docking/CMakeLists.txt (copied) * code/trunk/src/modules/docking/Dock.cc (copied) * code/trunk/src/modules/docking/Dock.h (copied) * code/trunk/src/modules/docking/DockToShip.cc (copied) * code/trunk/src/modules/docking/DockToShip.h (copied) * code/trunk/src/modules/docking/DockingAnimation.cc (copied) * code/trunk/src/modules/docking/DockingAnimation.h (copied) * code/trunk/src/modules/docking/DockingController.cc (copied) * code/trunk/src/modules/docking/DockingController.h (copied) * code/trunk/src/modules/docking/DockingEffect.cc (copied) * code/trunk/src/modules/docking/DockingEffect.h (copied) * code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/trunk/src/modules/docking/DockingPrereqs.h (copied) * code/trunk/src/modules/docking/DockingTarget.cc (copied) * code/trunk/src/modules/docking/DockingTarget.h (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.h (copied) * code/trunk/src/modules/gametypes (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (copied) * code/trunk/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/SpaceRace.cc (copied) * code/trunk/src/modules/gametypes/SpaceRace.h (copied) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (deleted) * code/trunk/src/modules/notifications/Notification.h (deleted) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (copied) * code/trunk/src/modules/objects/SpaceBoundaries.h (copied) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (copied) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (copied) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/portals/CMakeLists.txt (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (modified) * code/trunk/src/modules/portals/PortalsPrereqs.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/tetris (copied) * code/trunk/src/modules/tetris/CMakeLists.txt (copied) * code/trunk/src/modules/tetris/Tetris.cc (copied) * code/trunk/src/modules/tetris/Tetris.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (copied) * code/trunk/src/modules/tetris/TetrisPrereqs.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (copied) * code/trunk/src/modules/tetris/TetrisStone.h (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (copied) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (deleted) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.h (deleted) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging presentation branch back into trunk. There are many new ... Tue, 15 Mar 2011 20:47:11 GMT landauf [8079] * code/trunk (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/configs/CEGUIConfig.xsd (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/schemes/GUIScheme.xsd (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HostMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/external/enet/win32.c (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/ViewportEventListener.cc (copied) * code/trunk/src/libraries/core/ViewportEventListener.h (copied) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclBind.h (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/Keyboard.cc (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.cc (copied) * code/trunk/src/modules/overlays/hud/PauseNotice.h (copied) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/ChatInputHandler.h (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.cc (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) merged usability branch back to trunk incomplete summary of the ... Mon, 14 Feb 2011 18:59:51 GMT landauf [7888] * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) fixed title of miscellaneous settings Mon, 14 Feb 2011 17:20:03 GMT landauf [7887] * code/trunk/data/gui/layouts/HostMenu.layout (modified) * code/trunk/data/gui/layouts/NotificationLayer.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/trunk/data/gui/scripts/HostMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) eol-style native Wed, 22 Dec 2010 18:24:24 GMT dafrick [7801] * code/trunk (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/masterserver.bat.in (copied) * code/trunk/bin/masterserver.in (copied) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (deleted) * code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (deleted) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/ClientInformation.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateClient.h (modified) * code/trunk/src/libraries/network/GamestateHandler.cc (modified) * code/trunk/src/libraries/network/GamestateHandler.h (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (copied) * code/trunk/src/libraries/network/MasterServer.h (copied) * code/trunk/src/libraries/network/MasterServerComm.cc (copied) * code/trunk/src/libraries/network/MasterServerComm.h (copied) * code/trunk/src/libraries/network/MasterServerProtocol.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/PeerList.cc (copied) * code/trunk/src/libraries/network/PeerList.h (copied) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/ServerList.cc (copied) * code/trunk/src/libraries/network/ServerList.h (copied) * code/trunk/src/libraries/network/WANDiscoverable.cc (copied) * code/trunk/src/libraries/network/WANDiscoverable.h (copied) * code/trunk/src/libraries/network/WANDiscovery.cc (copied) * code/trunk/src/libraries/network/WANDiscovery.h (copied) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.h (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.h (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.h (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.h (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified) * code/trunk/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/trunk/src/orxonox/gamestates/GSMasterServer.h (copied) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging presentation2 branch back to trunk. Wed, 08 Dec 2010 14:29:28 GMT konrad [7732] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) Credits Menu is now scrollable Wed, 01 Dec 2010 14:00:19 GMT dafrick [7689] * code/trunk (modified) * code/trunk/data/gui/layouts/HostMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HostMenu.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) Merging menu branch to trunk. Sat, 13 Nov 2010 22:55:23 GMT dafrick [7648] * code/trunk (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fps_test.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_FS10.oxw (modified) * code/trunk/data/levels/presentation_FS10_ed.oxw (modified) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/teamdeathmatch.oxw (modified) * code/trunk/data/levels/test_stars.oxw (modified) * code/trunk/data/levels/test_swallow.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (copied) * code/trunk/src/orxonox/LevelInfo.h (copied) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) Merged releasetodo, containing a new way to describe and tag levels, ... Thu, 04 Nov 2010 09:57:19 GMT dafrick [7612] * code/trunk/data/gui/layouts/ChatBox.layout (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) Reverting a change that I made some time ago. It turns out, that ... Wed, 29 Sep 2010 12:52:47 GMT dafrick [7500] * code/trunk/data/gui/layouts/ChatBox.layout (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) Fixing same issue as in tutorial2 branch. Error only occurs (as far ... Sat, 11 Sep 2010 08:20:44 GMT dafrick [7403] * code/trunk (modified) * code/trunk/data/gui/layouts/NotificationLayer.layout (copied) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (copied) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/questsystem.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationOverlay.cc (deleted) * code/trunk/src/modules/notifications/NotificationOverlay.h (deleted) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/QuestNotification.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) Merged notifications branch back to trunk. Wed, 11 Aug 2010 06:55:13 GMT dafrick [7163] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/README (modified) * code/trunk/cmake/CapitaliseName.cmake (deleted) * code/trunk/cmake/CheckOGREPlugins.cmake (deleted) * code/trunk/cmake/CompareVersionStrings.cmake (deleted) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/DetermineVersion.cmake (deleted) * code/trunk/cmake/FindALUT.cmake (deleted) * code/trunk/cmake/FindCEGUI.cmake (deleted) * code/trunk/cmake/FindDirectX.cmake (deleted) * code/trunk/cmake/FindENet.cmake (deleted) * code/trunk/cmake/FindLua.cmake (deleted) * code/trunk/cmake/FindOGRE.cmake (deleted) * code/trunk/cmake/FindOgg.cmake (deleted) * code/trunk/cmake/FindPackageHandleAdvancedArgs.cmake (deleted) * code/trunk/cmake/FindVorbis.cmake (deleted) * code/trunk/cmake/FlagUtilities.cmake (deleted) * code/trunk/cmake/GenerateToluaBindings.cmake (deleted) * code/trunk/cmake/GetGCCCompilerFlags.cmake (deleted) * code/trunk/cmake/HandleLibraryTypes.cmake (deleted) * code/trunk/cmake/InstallConfig.cmake (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/ParseMacroArguments.cmake (deleted) * code/trunk/cmake/PrecompiledHeaderFiles.cmake (deleted) * code/trunk/cmake/SeparateFlags.cmake (deleted) * code/trunk/cmake/SetCacheAdvanced.cmake (deleted) * code/trunk/cmake/SourceFileUtilities.cmake (deleted) * code/trunk/cmake/TargetUtilities.cmake (deleted) * code/trunk/cmake/tools (copied) * code/trunk/cmake/tools/CapitaliseName.cmake (copied) * code/trunk/cmake/tools/CheckOGREPlugins.cmake (copied) * code/trunk/cmake/tools/CompareVersionStrings.cmake (copied) * code/trunk/cmake/tools/DetermineVersion.cmake (copied) * code/trunk/cmake/tools/FindALUT.cmake (copied) * code/trunk/cmake/tools/FindCEGUI.cmake (copied) * code/trunk/cmake/tools/FindDirectX.cmake (copied) * code/trunk/cmake/tools/FindENet.cmake (copied) * code/trunk/cmake/tools/FindLua.cmake (copied) * code/trunk/cmake/tools/FindOGRE.cmake (copied) * code/trunk/cmake/tools/FindOgg.cmake (copied) * code/trunk/cmake/tools/FindPackageHandleAdvancedArgs.cmake (copied) * code/trunk/cmake/tools/FindVorbis.cmake (copied) * code/trunk/cmake/tools/FlagUtilities.cmake (copied) * code/trunk/cmake/tools/GenerateToluaBindings.cmake (copied) * code/trunk/cmake/tools/GetGCCCompilerFlags.cmake (copied) * code/trunk/cmake/tools/HandleLibraryTypes.cmake (copied) * code/trunk/cmake/tools/ParseMacroArguments.cmake (copied) * code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake (copied) * code/trunk/cmake/tools/SeparateFlags.cmake (copied) * code/trunk/cmake/tools/SetCacheAdvanced.cmake (copied) * code/trunk/cmake/tools/SourceFileUtilities.cmake (copied) * code/trunk/cmake/tools/TargetUtilities.cmake (copied) * code/trunk/data/CMakeLists.txt (modified) * code/trunk/data/DataInstallScript.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/ChatBox-inputonly.layout (copied) * code/trunk/data/gui/layouts/ChatBox.layout (copied) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (copied) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (copied) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (copied) * code/trunk/data/gui/scripts/ChatBox.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/HUDSheet.lua (modified) * code/trunk/data/gui/scripts/InGamePickupHUD.lua (copied) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (copied) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (copied) * code/trunk/data/levels/Quest_PirateAttack.oxw (copied) * code/trunk/data/levels/The Time Machine.oxw (copied) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fps_test.oxw (copied) * code/trunk/data/levels/gametype_asteroids.oxw (modified) * code/trunk/data/levels/gametype_dynamicmatch.oxw (copied) * code/trunk/data/levels/gametype_underattack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/weaponsettings3.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_H2.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_HXY.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_fps.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_pirate.oxi (modified) * code/trunk/data/levels/old/presentationLOD.oxw (copied) * code/trunk/data/levels/pickup.oxw (deleted) * code/trunk/data/levels/pickup_pps_invi.oxw (deleted) * code/trunk/data/levels/pickup_ppstest1.oxw (deleted) * code/trunk/data/levels/pickups.oxw (copied) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (copied) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_FS10.oxw (copied) * code/trunk/data/levels/presentation_FS10_ed.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/presentation_pong.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/quest_test.oxw (deleted) * code/trunk/data/levels/questsystem2.oxw (deleted) * code/trunk/data/levels/screenshot.oxw (copied) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/teamdeathmatch.oxw (modified) * code/trunk/data/levels/templates/fps.oxt (copied) * code/trunk/data/levels/templates/lodinformation.oxt (copied) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/levels/templates/spaceship_pirate.oxt (modified) * code/trunk/data/levels/test_ghost.oxw (deleted) * code/trunk/data/levels/test_stars.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicmatchhud.oxo (copied) * code/trunk/data/overlays/hudtamplates_fps.oxo (copied) * code/trunk/data/particle/fog.particle (copied) * code/trunk/data/particle/rocketfire2.particle (copied) * code/trunk/data/particle/simplerocketfire.particle (copied) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/external/ceguilua/CMakeLists.txt (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.h (modified) * code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff (modified) * code/trunk/src/external/ois/OISPrereqs.h (modified) * code/trunk/src/external/ois/changes_orxonox.diff (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tolua/CMakeLists.txt (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/Executor.cc (modified) * code/trunk/src/libraries/core/Executor.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/ChatListener.cc (modified) * code/trunk/src/libraries/network/ChatListener.h (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (copied) * code/trunk/src/libraries/network/LANDiscoverable.h (copied) * code/trunk/src/libraries/network/LANDiscovery.cc (copied) * code/trunk/src/libraries/network/LANDiscovery.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/packet/CMakeLists.txt (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.h (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (copied) * code/trunk/src/libraries/network/packet/ServerInformation.h (copied) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/libraries/tools/bsp (copied) * code/trunk/src/libraries/tools/bsp/CMakeLists.txt (copied) * code/trunk/src/libraries/tools/bsp/DemoApp.cpp (copied) * code/trunk/src/libraries/tools/bsp/DemoApp.hpp (copied) * code/trunk/src/libraries/tools/bsp/ExampleApplication.h (copied) * code/trunk/src/libraries/tools/bsp/ExampleFrameListener.h (copied) * code/trunk/src/libraries/tools/bsp/OgreFramework.cpp (copied) * code/trunk/src/libraries/tools/bsp/OgreFramework.hpp (copied) * code/trunk/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp (copied) * code/trunk/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map.cpp (copied) * code/trunk/src/libraries/tools/bsp/Q3Map.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_Bezier.cpp (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_Bezier.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_BspVertex.cpp (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_BspVertex.h (copied) * code/trunk/src/libraries/tools/bsp/Q3Map_misc.h (copied) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Convert.cc (copied) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/designtools (copied) * code/trunk/src/modules/designtools/CMakeLists.txt (copied) * code/trunk/src/modules/designtools/CreateStars.cc (copied) * code/trunk/src/modules/designtools/CreateStars.h (copied) * code/trunk/src/modules/designtools/DesignToolsPrereqs.h (copied) * code/trunk/src/modules/designtools/ScreenshotManager.cc (copied) * code/trunk/src/modules/designtools/ScreenshotManager.h (copied) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (copied) * code/trunk/src/modules/designtools/SkyboxGenerator.h (copied) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) * code/trunk/src/modules/overlays/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc (copied) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (copied) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc (copied) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h (copied) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (copied) * code/trunk/src/modules/pickup/CollectiblePickup.h (copied) * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (copied) * code/trunk/src/modules/pickup/items/DronePickup.h (copied) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (copied) * code/trunk/src/modules/pickup/items/ShieldPickup.h (copied) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/pong/PongPrereqs.h (modified) * code/trunk/src/modules/questsystem/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/AddReward.cc (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (deleted) * code/trunk/src/modules/questsystem/QuestGUI.h (deleted) * code/trunk/src/modules/questsystem/QuestGUINode.cc (deleted) * code/trunk/src/modules/questsystem/QuestGUINode.h (deleted) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/QuestNotification.h (modified) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/modules/questsystem/notifications/Notification.cc (modified) * code/trunk/src/modules/questsystem/notifications/Notification.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationOverlay.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationOverlay.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/weapons/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/RocketController.cc (copied) * code/trunk/src/modules/weapons/RocketController.h (copied) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (copied) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (copied) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/ChatHistory.cc (copied) * code/trunk/src/orxonox/ChatHistory.h (copied) * code/trunk/src/orxonox/ChatInputHandler.cc (copied) * code/trunk/src/orxonox/ChatInputHandler.h (copied) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (copied) * code/trunk/src/orxonox/controllers/DroneController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (copied) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (copied) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.cc (copied) * code/trunk/src/orxonox/graphics/AnimatedModel.h (copied) * code/trunk/src/orxonox/graphics/Backlight.h (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/graphics/CEGuiSample.cc (copied) * code/trunk/src/orxonox/graphics/CEGuiSample.h (copied) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Light.h (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.cc (copied) * code/trunk/src/orxonox/graphics/MeshLodInformation.h (copied) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/GametypeMessageListener.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarListener.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/interfaces/Rewardable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (modified) * code/trunk/src/orxonox/overlays/Map.cc (deleted) * code/trunk/src/orxonox/overlays/Map.h (deleted) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (modified) * code/trunk/src/orxonox/sound/SoundStreamer.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/Drone.cc (copied) * code/trunk/src/orxonox/worldentities/Drone.h (copied) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) Merged presentation3 branch into trunk. Fri, 16 Apr 2010 12:50:16 GMT rgrieder [6746] * code/trunk (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/data/gui/configs/Falagard.xsd (deleted) * code/trunk/data/gui/configs/Font.xsd (deleted) * code/trunk/data/gui/configs/GUILayout.xsd (deleted) * code/trunk/data/gui/configs/GUIScheme.xsd (deleted) * code/trunk/data/gui/configs/Imageset.xsd (deleted) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CompositorDemo.layout (deleted) * code/trunk/data/gui/layouts/Console.wnd (deleted) * code/trunk/data/gui/layouts/ControlsMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/CrowdDemo.layout (deleted) * code/trunk/data/gui/layouts/DecisionPopup.layout (modified) * code/trunk/data/gui/layouts/Demo7Windows.layout (deleted) * code/trunk/data/gui/layouts/Demo8.layout (deleted) * code/trunk/data/gui/layouts/DragDropDemo.layout (deleted) * code/trunk/data/gui/layouts/FontDemo.layout (deleted) * code/trunk/data/gui/layouts/GameplayMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/InGameTest.layout (modified) * code/trunk/data/gui/layouts/InfoPopup.layout (modified) * code/trunk/data/gui/layouts/InstancingDemo.layout (deleted) * code/trunk/data/gui/layouts/KeyBindMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MouseControlsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/layouts/TabControlDemo.layout (deleted) * code/trunk/data/gui/layouts/TabPage.layout (deleted) * code/trunk/data/gui/layouts/TabPage1.layout (deleted) * code/trunk/data/gui/layouts/TabPage2.layout (deleted) * code/trunk/data/gui/layouts/TextDemo.layout (deleted) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/trunk/data/gui/layouts/VanillaConsole.layout (deleted) * code/trunk/data/gui/layouts/VanillaWindows.layout (deleted) * code/trunk/data/gui/layouts/cegui8.layout (deleted) * code/trunk/data/gui/layouts/facial.layout (deleted) * code/trunk/data/gui/layouts/ogregui.layout (deleted) * code/trunk/data/gui/layouts/shadows.layout (deleted) * code/trunk/data/gui/schemes/Demo8.scheme (deleted) * code/trunk/data/gui/schemes/Looks.txt (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceLook.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaLook.scheme (copied) * code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (deleted) * code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (modified) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/BasicGUI.lua (deleted) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GameplayMenu.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HUDSheet.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/InfoPopup.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (copied) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/lua/Debugger.lua (copied) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/lua/Strict.lua (copied) * code/trunk/data/lua/Tools.lua (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (modified) * code/trunk/src/libraries/core/IOConsole.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/TriBool.h (copied) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (copied) * code/trunk/src/orxonox/overlays/GUISheet.h (copied) Merged gamestates2 branch back to trunk. This brings in some heavy ... Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711] * code/trunk (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/overlays/hudtemplates3.oxo (modified) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged pickup4 branch back to trunk. Fri, 25 Dec 2009 21:23:58 GMT rgrieder [6417] * code/trunk (modified) * code/trunk/README (modified) * code/trunk/bin/dedicatedClient.bat.in (modified) * code/trunk/bin/dedicatedClient.in (modified) * code/trunk/cmake/FindLua.cmake (modified) * code/trunk/cmake/FindPackageHandleAdvancedArgs.cmake (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/LibraryConfigApple.cmake (modified) * code/trunk/cmake/PrecompiledHeaderFiles.cmake (modified) * code/trunk/cmake/SourceFileUtilities.cmake (modified) * code/trunk/data/DataInstallScript.cmake (modified) * code/trunk/data/DefaultResources.oxr (copied) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/AudioMenu.layout (copied) * code/trunk/data/gui/layouts/ControlsMenu.layout (copied) * code/trunk/data/gui/layouts/CreditsMenu.layout (copied) * code/trunk/data/gui/layouts/DecisionPopup.layout (copied) * code/trunk/data/gui/layouts/GameplayMenu.layout (copied) * code/trunk/data/gui/layouts/GraphicsMenu.layout (copied) * code/trunk/data/gui/layouts/InGameMenu.layout (copied) * code/trunk/data/gui/layouts/InfoPopup.layout (copied) * code/trunk/data/gui/layouts/KeyBindMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenuBackground.layout (copied) * code/trunk/data/gui/layouts/MouseControlsMenu.layout (copied) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (copied) * code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (copied) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (copied) * code/trunk/data/gui/scripts/AudioMenu.lua (copied) * code/trunk/data/gui/scripts/ControlsMenu.lua (copied) * code/trunk/data/gui/scripts/CreditsMenu.lua (copied) * code/trunk/data/gui/scripts/DecisionPopup.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (copied) * code/trunk/data/gui/scripts/GameplayMenu.lua (copied) * code/trunk/data/gui/scripts/GraphicsMenu.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (copied) * code/trunk/data/gui/scripts/InfoPopup.lua (copied) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (copied) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (copied) * code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (copied) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (copied) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/gametype_asteroids.oxw (modified) * code/trunk/data/levels/includes/weaponsettings3.oxi (modified) * code/trunk/data/levels/includes/weaponsettings_HXY.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_Transporter.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/trunk/data/levels/old/physicstest.oxw (modified) * code/trunk/data/levels/old/physicstest2.oxw (modified) * code/trunk/data/levels/old/presentation_physics.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/questsystem.oxw (modified) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (modified) * code/trunk/data/levels/old/tutorial_hs08.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (copied) * code/trunk/data/levels/presentationHS09b.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/questsystem2.oxw (modified) * code/trunk/data/levels/sound.oxw (copied) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/templates/spaceship_HXY.oxt (copied) * code/trunk/data/levels/templates/spaceship_HXY_SL.oxt (copied) * code/trunk/data/levels/templates/spaceship_Transporter.oxt (copied) * code/trunk/data/levels/templates/spaceship_Transporter_SL.oxt (copied) * code/trunk/data/levels/templates/spaceship_assff.oxt (modified) * code/trunk/data/levels/templates/spaceship_ghost.oxt (modified) * code/trunk/data/levels/test_ghost.oxw (modified) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/overlays/OrxonoxLoading.overlay (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/overlays/stats.oxo (modified) * code/trunk/data/particle/Steam.particle (copied) * code/trunk/data/particle/bigexplosion.particle (copied) * code/trunk/data/particle/explosion4.particle (copied) * code/trunk/data/particle/laser.particle (copied) * code/trunk/data/particle/load.particle (copied) * code/trunk/data/particle/particlecanon.particle (copied) * code/trunk/data/particle/rocketfire.particle (copied) * code/trunk/data/particle/smoke.particle (copied) * code/trunk/data/particle/tes3.particle (copied) * code/trunk/data/resources.oxr (deleted) * code/trunk/doc/CMakeLists.txt (modified) * code/trunk/doc/api/CMakeLists.txt (modified) * code/trunk/doc/api/main.dox (modified) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/external/ceguilua/CMakeLists.txt (modified) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/CommandExecutor.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.h (modified) * code/trunk/src/libraries/core/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/Event.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/Executor.cc (modified) * code/trunk/src/libraries/core/Executor.h (modified) * code/trunk/src/libraries/core/Functor.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameMode.h (modified) * code/trunk/src/libraries/core/GameState.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (modified) * code/trunk/src/libraries/core/IOConsole.h (modified) * code/trunk/src/libraries/core/IRC.cc (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (modified) * code/trunk/src/libraries/core/MemoryArchive.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/NamespaceNode.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/core/Shell.cc (modified) * code/trunk/src/libraries/core/Shell.h (modified) * code/trunk/src/libraries/core/SmartPtr.h (modified) * code/trunk/src/libraries/core/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/TclBind.cc (modified) * code/trunk/src/libraries/core/TclBind.h (modified) * code/trunk/src/libraries/core/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/TclThreadManager.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/Thread.cc (modified) * code/trunk/src/libraries/core/Thread.h (modified) * code/trunk/src/libraries/core/ThreadPool.cc (modified) * code/trunk/src/libraries/core/ThreadPool.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/XMLFile.h (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/Button.h (modified) * code/trunk/src/libraries/core/input/InputBuffer.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.h (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Keyboard.cc (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateHandler.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/TrafficControl.cc (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.h (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.h (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallback.h (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (copied) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableSpecialisations.cc (deleted) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/BillboardSet.cc (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/TextureGenerator.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/Clipboard.cc (modified) * code/trunk/src/libraries/util/Clock.cc (modified) * code/trunk/src/libraries/util/Clock.h (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (modified) * code/trunk/src/libraries/util/DisplayStringConversions.h (copied) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/ExprParser.cc (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MathConvert.h (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/OutputHandler.cc (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/UTFStringConversions.h (deleted) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/mbool.h (modified) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/OverlayText.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/trunk/src/modules/overlays/stats/CreateLines.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/questsystem/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/AddReward.cc (modified) * code/trunk/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.h (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/notifications/Notification.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (copied) * code/trunk/src/modules/weapons/projectiles/Rocket.h (copied) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/MoodManager.cc (copied) * code/trunk/src/orxonox/MoodManager.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/Controller.cc (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (copied) * code/trunk/src/orxonox/controllers/NewHumanController.h (copied) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (deleted) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc (deleted) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/Rewardable.h (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/Map.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/pickup/DroppedItem.cc (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.cc (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupCollection.cc (modified) * code/trunk/src/orxonox/pickup/PickupInventory.cc (modified) * code/trunk/src/orxonox/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/pickup/UsableItem.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/CMakeLists.txt (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (copied) * code/trunk/src/orxonox/sound/SoundBuffer.h (copied) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (copied) * code/trunk/src/orxonox/sound/SoundStreamer.h (copied) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.cc (copied) * code/trunk/src/orxonox/worldentities/EffectContainer.h (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) Merged presentation2 branch back to trunk. Major new features: - ... Thu, 24 Sep 2009 09:02:42 GMT rgrieder [5781] * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/client1.bat.in (copied) * code/trunk/bin/client1.in (copied) * code/trunk/bin/client2.bat.in (copied) * code/trunk/bin/client2.in (copied) * code/trunk/bin/dedicated.bat.in (copied) * code/trunk/bin/dedicated.in (copied) * code/trunk/bin/server.bat.in (copied) * code/trunk/bin/server.in (copied) * code/trunk/bin/standalone.bat.in (copied) * code/trunk/bin/standalone.in (copied) * code/trunk/cmake/CheckOGREPlugins.cmake (copied) * code/trunk/cmake/CompilerConfig.cmake (modified) * code/trunk/cmake/FindALUT.cmake (copied) * code/trunk/cmake/FindCEGUI.cmake (copied) * code/trunk/cmake/FindDirectX.cmake (copied) * code/trunk/cmake/FindENet.cmake (copied) * code/trunk/cmake/FindOgg.cmake (copied) * code/trunk/cmake/FindVorbis.cmake (copied) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/LibraryConfigApple.cmake (copied) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/data/CMakeLists.txt (modified) * code/trunk/data/DataInstallScript.cmake (copied) * code/trunk/data/defaultConfig/keybindings.ini (copied) * code/trunk/data/defaultConfig/masterKeybindings.ini (copied) * code/trunk/data/gui (copied) * code/trunk/data/gui/configs (copied) * code/trunk/data/gui/configs/CEGUIConfig.xsd (copied) * code/trunk/data/gui/configs/Falagard.xsd (copied) * code/trunk/data/gui/configs/Font.xsd (copied) * code/trunk/data/gui/configs/GUILayout.xsd (copied) * code/trunk/data/gui/configs/GUIScheme.xsd (copied) * code/trunk/data/gui/configs/Imageset.xsd (copied) * code/trunk/data/gui/layouts (copied) * code/trunk/data/gui/layouts/CompositorDemo.layout (copied) * code/trunk/data/gui/layouts/Console.wnd (copied) * code/trunk/data/gui/layouts/CrowdDemo.layout (copied) * code/trunk/data/gui/layouts/Demo7Windows.layout (copied) * code/trunk/data/gui/layouts/Demo8.layout (copied) * code/trunk/data/gui/layouts/DragDropDemo.layout (copied) * code/trunk/data/gui/layouts/FontDemo.layout (copied) * code/trunk/data/gui/layouts/GUILayout.xsd (copied) * code/trunk/data/gui/layouts/InGameTest.layout (copied) * code/trunk/data/gui/layouts/InstancingDemo.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (copied) * code/trunk/data/gui/layouts/PickupInventory.layout (copied) * code/trunk/data/gui/layouts/QuestGUI.layout (copied) * code/trunk/data/gui/layouts/TabControlDemo.layout (copied) * code/trunk/data/gui/layouts/TabPage.layout (copied) * code/trunk/data/gui/layouts/TabPage1.layout (copied) * code/trunk/data/gui/layouts/TabPage2.layout (copied) * code/trunk/data/gui/layouts/TextDemo.layout (copied) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (copied) * code/trunk/data/gui/layouts/VanillaConsole.layout (copied) * code/trunk/data/gui/layouts/VanillaWindows.layout (copied) * code/trunk/data/gui/layouts/cegui8.layout (copied) * code/trunk/data/gui/layouts/facial.layout (copied) * code/trunk/data/gui/layouts/ogregui.layout (copied) * code/trunk/data/gui/layouts/shadows.layout (copied) * code/trunk/data/gui/schemes (copied) * code/trunk/data/gui/schemes/Demo8.scheme (copied) * code/trunk/data/gui/schemes/GUIScheme.xsd (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (copied) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (copied) * code/trunk/data/gui/scripts (copied) * code/trunk/data/gui/scripts/BasicGUI.lua (copied) * code/trunk/data/gui/scripts/InitialiseGUI.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (copied) * code/trunk/data/gui/scripts/PickupInventory.lua (copied) * code/trunk/data/gui/scripts/QuestGUI.lua (copied) * code/trunk/data/levels (copied) * code/trunk/data/levels/empty_level.oxw (copied) * code/trunk/data/levels/gametype_asteroids.oxw (copied) * code/trunk/data/levels/gametype_underattack.oxw (copied) * code/trunk/data/levels/includes (copied) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (copied) * code/trunk/data/levels/includes/weaponsettings1.oxi (copied) * code/trunk/data/levels/includes/weaponsettings2.oxi (copied) * code/trunk/data/levels/includes/weaponsettings3.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_H2.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_pirate.oxi (copied) * code/trunk/data/levels/old (copied) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (copied) * code/trunk/data/levels/old/physicstest.oxw (copied) * code/trunk/data/levels/old/physicstest2.oxw (copied) * code/trunk/data/levels/old/planettest.oxw (copied) * code/trunk/data/levels/old/presentation_physics.oxw (copied) * code/trunk/data/levels/old/princessaeryn.oxw (copied) * code/trunk/data/levels/old/questsystem.oxw (copied) * code/trunk/data/levels/old/sample4.oxw (copied) * code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (copied) * code/trunk/data/levels/old/tutorial_hs08.oxw (copied) * code/trunk/data/levels/pickuptest.oxw (copied) * code/trunk/data/levels/presentation.oxw (copied) * code/trunk/data/levels/presentation09.oxw (copied) * code/trunk/data/levels/presentation09b.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (copied) * code/trunk/data/levels/presentation_pong.oxw (copied) * code/trunk/data/levels/princessaeryn.oxw (copied) * code/trunk/data/levels/teambasematchlevel.oxw (copied) * code/trunk/data/levels/teamdeathmatch.oxw (copied) * code/trunk/data/levels/templates (copied) * code/trunk/data/levels/templates/spaceship_H2.oxt (copied) * code/trunk/data/levels/templates/spaceship_assff.oxt (copied) * code/trunk/data/levels/templates/spaceship_pirate.oxt (copied) * code/trunk/data/levels/tutorial.oxw (copied) * code/trunk/data/levels/waypoints.oxw (copied) * code/trunk/data/overlays (copied) * code/trunk/data/overlays/OrxonoxLoading.overlay (copied) * code/trunk/data/overlays/debug.oxo (copied) * code/trunk/data/overlays/hud.oxo (copied) * code/trunk/data/overlays/hudtemplates3.oxo (copied) * code/trunk/data/overlays/ponghud.oxo (copied) * code/trunk/data/overlays/stats.oxo (copied) * code/trunk/data/overlays/teambasematchhud.oxo (copied) * code/trunk/data/overlays/underattackhud.oxo (copied) * code/trunk/data/particle (copied) * code/trunk/data/particle/Example-Water.particle (copied) * code/trunk/data/particle/Example.particle (copied) * code/trunk/data/particle/ExplosionComp1.particle (copied) * code/trunk/data/particle/ExplosionComp2.particle (copied) * code/trunk/data/particle/ExplosionComp4.particle (copied) * code/trunk/data/particle/FireComp2.particle (copied) * code/trunk/data/particle/LaserGun.particle (copied) * code/trunk/data/particle/ThrusterFire.particle (copied) * code/trunk/data/particle/bigexplosion1part1.particle (copied) * code/trunk/data/particle/bigexplosion1part2.particle (copied) * code/trunk/data/particle/bigexplosion1part3.particle (copied) * code/trunk/data/particle/emitted_emitter.particle (copied) * code/trunk/data/particle/engineglow.particle (copied) * code/trunk/data/particle/explosion1.particle (copied) * code/trunk/data/particle/explosion2.particle (copied) * code/trunk/data/particle/explosion2b.particle (copied) * code/trunk/data/particle/explosion3.particle (copied) * code/trunk/data/particle/fairytwirl.particle (copied) * code/trunk/data/particle/fire3.particle (copied) * code/trunk/data/particle/fire4.particle (copied) * code/trunk/data/particle/forcefield.particle (copied) * code/trunk/data/particle/ray1.particle (copied) * code/trunk/data/particle/ray2.particle (copied) * code/trunk/data/particle/repairGold.particle (copied) * code/trunk/data/particle/repairSilver.particle (copied) * code/trunk/data/particle/shot1.particle (copied) * code/trunk/data/particle/shot2.particle (copied) * code/trunk/data/particle/shot2_small.particle (copied) * code/trunk/data/particle/shot3_small.particle (copied) * code/trunk/data/particle/shotTest.particle (copied) * code/trunk/data/particle/smoke1.particle (copied) * code/trunk/data/particle/smoke2.particle (copied) * code/trunk/data/particle/smoke3.particle (copied) * code/trunk/data/particle/smoke4.particle (copied) * code/trunk/data/particle/smoke5.particle (copied) * code/trunk/data/particle/smoke6.particle (copied) * code/trunk/data/particle/smoke7.particle (copied) * code/trunk/data/particle/sparks.particle (copied) * code/trunk/data/particle/thruster1.particle (copied) * code/trunk/data/particle/thruster2.particle (copied) * code/trunk/data/particle/thruster3.particle (copied) * code/trunk/data/resources.oxr (copied) * code/trunk/data/tcl (copied) * code/trunk/data/tcl/init.tcl (copied) * code/trunk/data/tcl/irc.tcl (copied) * code/trunk/data/tcl/irk (copied) * code/trunk/data/tcl/irk/README (copied) * code/trunk/data/tcl/irk/docs (copied) * code/trunk/data/tcl/irk/docs/changes.txt (copied) * code/trunk/data/tcl/irk/docs/todo.txt (copied) * code/trunk/data/tcl/irk/docs/usage.txt (copied) * code/trunk/data/tcl/irk/examples (copied) * code/trunk/data/tcl/irk/examples/fortunebot.tcl (copied) * code/trunk/data/tcl/irk/examples/mysaint.tcl (copied) * code/trunk/data/tcl/irk/irk.tcl (copied) * code/trunk/data/tcl/irk/lib (copied) * code/trunk/data/tcl/irk/lib/irkauth.tcl (copied) * code/trunk/data/tcl/irk/lib/irkcommand.tcl (copied) * code/trunk/data/tcl/irk/lib/irkconnect.tcl (copied) * code/trunk/data/tcl/irk/lib/irkctcptcl.tcl (copied) * code/trunk/data/tcl/irk/lib/irkdispatch.tcl (copied) * code/trunk/data/tcl/irk/lib/irkflow.tcl (copied) * code/trunk/data/tcl/irk/lib/irkqueue.tcl (copied) * code/trunk/data/tcl/irk/lib/irkreceive.tcl (copied) * code/trunk/data/tcl/irk/lib/irkservers.tcl (copied) * code/trunk/data/tcl/irk/lib/irkstate.tcl (copied) * code/trunk/data/tcl/irk/lib/irkutil.tcl (copied) * code/trunk/data/tcl/irk/pkgIndex.tcl (copied) * code/trunk/data/tcl/irk/socks (copied) * code/trunk/data/tcl/irk/socks/socks.tcl (copied) * code/trunk/data/tcl/remote.tcl (copied) * code/trunk/data/tcl/telnet_server.tcl (copied) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/external/CMakeLists.txt (modified) * code/trunk/src/external/bullet (copied) * code/trunk/src/external/bullet/AUTHORS (copied) * code/trunk/src/external/bullet/Bullet-C-Api.h (copied) * code/trunk/src/external/bullet/BulletCollision (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (copied) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMaterial.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btBoxCollision.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btClipPolygon.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btContactProcessing.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btContactProcessing.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactBvh.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGImpactShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btGeometryOperations.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btQuantization.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btTriangleShapeEx.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_array.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_basic_geometry_operations.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_bitset.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_box_collision.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_box_set.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_box_set.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_clip_polygon.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_contact.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_contact.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_geom_types.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_geometry.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_hash_table.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_linear_math.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_math.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_memory.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_memory.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_radixsort.h (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_tri_collision.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/Gimpact/gim_tri_collision.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (copied) * code/trunk/src/external/bullet/BulletDynamics (copied) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (copied) * code/trunk/src/external/bullet/BulletDynamics/Character (copied) * code/trunk/src/external/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btActionInterface.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Vehicle (copied) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btWheelInfo.h (copied) * code/trunk/src/external/bullet/BulletLicense.txt (copied) * code/trunk/src/external/bullet/BulletPrecompiledHeaders.h (copied) * code/trunk/src/external/bullet/CMakeLists.txt (copied) * code/trunk/src/external/bullet/ChangeLog (copied) * code/trunk/src/external/bullet/LICENSE (copied) * code/trunk/src/external/bullet/LinearMath (copied) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (copied) * code/trunk/src/external/bullet/LinearMath/btAabbUtil2.h (copied) * code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp (copied) * code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.h (copied) * code/trunk/src/external/bullet/LinearMath/btAlignedObjectArray.h (copied) * code/trunk/src/external/bullet/LinearMath/btConvexHull.cpp (copied) * code/trunk/src/external/bullet/LinearMath/btConvexHull.h (copied) * code/trunk/src/external/bullet/LinearMath/btDefaultMotionState.h (copied) * code/trunk/src/external/bullet/LinearMath/btGeometryUtil.cpp (copied) * code/trunk/src/external/bullet/LinearMath/btGeometryUtil.h (copied) * code/trunk/src/external/bullet/LinearMath/btHashMap.h (copied) * code/trunk/src/external/bullet/LinearMath/btIDebugDraw.h (copied) * code/trunk/src/external/bullet/LinearMath/btList.h (copied) * code/trunk/src/external/bullet/LinearMath/btMatrix3x3.h (copied) * code/trunk/src/external/bullet/LinearMath/btMinMax.h (copied) * code/trunk/src/external/bullet/LinearMath/btMotionState.h (copied) * code/trunk/src/external/bullet/LinearMath/btPoolAllocator.h (copied) * code/trunk/src/external/bullet/LinearMath/btQuadWord.h (copied) * code/trunk/src/external/bullet/LinearMath/btQuaternion.h (copied) * code/trunk/src/external/bullet/LinearMath/btQuickprof.cpp (copied) * code/trunk/src/external/bullet/LinearMath/btQuickprof.h (copied) * code/trunk/src/external/bullet/LinearMath/btRandom.h (copied) * code/trunk/src/external/bullet/LinearMath/btScalar.h (copied) * code/trunk/src/external/bullet/LinearMath/btStackAlloc.h (copied) * code/trunk/src/external/bullet/LinearMath/btTransform.h (copied) * code/trunk/src/external/bullet/LinearMath/btTransformUtil.h (copied) * code/trunk/src/external/bullet/LinearMath/btVector3.h (copied) * code/trunk/src/external/bullet/NEWS (copied) * code/trunk/src/external/bullet/README (copied) * code/trunk/src/external/bullet/VERSION (copied) * code/trunk/src/external/bullet/btBulletCollisionCommon.h (copied) * code/trunk/src/external/bullet/btBulletDynamicsCommon.h (copied) * code/trunk/src/external/bullet/changes_orxonox.diff (copied) * code/trunk/src/external/ceguilua (copied) * code/trunk/src/external/ceguilua/AUTHORS_CEGUI (copied) * code/trunk/src/external/ceguilua/CMakeLists.txt (copied) * code/trunk/src/external/ceguilua/COPYING (copied) * code/trunk/src/external/ceguilua/ChangeLog (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0 (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/CEGUILua.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/CEGUILua.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/CEGUILuaFunctor.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/CEGUILuaFunctor.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/changes_orxonox.diff (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/required.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/required.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Basic.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/CEGUI.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/CoordConverter.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/EventSet.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Font.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/FontManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/HelperFunctions.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Image.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Imageset.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/ImagesetManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/InputEvent.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Iterators.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Key.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Logger.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/MouseCursor.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/OutStream.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/PropertyHelper.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Renderer.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Scheme.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/SchemeManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/System.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Texture.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/UnifiedCoordSystem.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/Window.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/WindowFactoryManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/WindowManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ButtonBase.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Checkbox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ComboDropList.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Combobox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/DragContainer.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Editbox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/FrameWindow.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/GUISheet.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ItemEntry.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ItemListBase.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ItemListbox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ListHeader.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ListHeaderSegment.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Listbox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ListboxItem.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ListboxTextItem.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/MenuBase.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/MenuItem.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Menubar.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/MultiColumnList.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/MultiLineEditbox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/PopupMenu.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ProgressBar.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/PushButton.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/RadioButton.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ScrollablePane.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Scrollbar.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ScrolledContainer.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/ScrolledItemListBase.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Slider.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Spinner.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/TabButton.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/TabControl.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Thumb.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Titlebar.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/elements/Tooltip.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/exceptions.lua (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/Dimension.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/Enums.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/FalagardComponentBase.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/FrameComponent.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/ImageryComponent.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/ImagerySection.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/LayerSpecification.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/NamedArea.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/PropertyDefinition.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/PropertyDefinitionBase.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/PropertyInitialiser.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/PropertyLinkDefinition.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/SectionSpecification.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/StateImagery.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/TextComponent.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/WidgetComponent.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/WidgetLookFeel.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.5.0/package/falagard/WidgetLookManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0 (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/CMakeLists.txt (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILuaFunctor.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILuaFunctor.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/required.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/ceguilua/required.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/CEGUI.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/Logger.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/ScriptWindowHelper.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/WindowManager.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/elements (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/elements/GroupBox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/elements/MultiLineEditbox.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/elements/Tree.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.0/package/elements/TreeItem.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1 (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/CMakeLists.txt (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/required.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/ceguilua/required.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/package (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.1/package/Window.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2 (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/CMakeLists.txt (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILuaFunctor.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILuaFunctor.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/required.cpp (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/required.h (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/package (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/package/EventSet.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/package/HelperFunctions.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/package/InputEvent.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/package/Window.pkg (copied) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/package/WindowManager.pkg (copied) * code/trunk/src/external/cpptcl (copied) * code/trunk/src/external/cpptcl/CHANGES (copied) * code/trunk/src/external/cpptcl/CMakeLists.txt (copied) * code/trunk/src/external/cpptcl/CREDITS (copied) * code/trunk/src/external/cpptcl/LICENSE (copied) * code/trunk/src/external/cpptcl/README (copied) * code/trunk/src/external/cpptcl/changes_orxonox.diff (copied) * code/trunk/src/external/cpptcl/cpptcl.cc (copied) * code/trunk/src/external/cpptcl/cpptcl.h (copied) * code/trunk/src/external/cpptcl/details (copied) * code/trunk/src/external/cpptcl/details/callbacks.h (copied) * code/trunk/src/external/cpptcl/details/callbacks_v.h (copied) * code/trunk/src/external/cpptcl/details/constructors.h (copied) * code/trunk/src/external/cpptcl/details/conversions.h (copied) * code/trunk/src/external/cpptcl/details/dispatchers.h (copied) * code/trunk/src/external/cpptcl/details/metahelpers.h (copied) * code/trunk/src/external/cpptcl/details/methods.h (copied) * code/trunk/src/external/cpptcl/details/methods_v.h (copied) * code/trunk/src/external/ogreceguirenderer (copied) * code/trunk/src/external/ogreceguirenderer/AUTHORS (copied) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (copied) * code/trunk/src/external/ogreceguirenderer/COPYING (copied) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp (copied) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.h (copied) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIResourceProvider.cpp (copied) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIResourceProvider.h (copied) * code/trunk/src/external/ogreceguirenderer/OgreCEGUITexture.cpp (copied) * code/trunk/src/external/ogreceguirenderer/OgreCEGUITexture.h (copied) * code/trunk/src/external/ogreceguirenderer/VERSION (copied) * code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff (copied) * code/trunk/src/external/ois (copied) * code/trunk/src/external/ois/CMakeLists.txt (copied) * code/trunk/src/external/ois/OIS.h (copied) * code/trunk/src/external/ois/OISConfig.h (copied) * code/trunk/src/external/ois/OISEffect.cpp (copied) * code/trunk/src/external/ois/OISEffect.h (copied) * code/trunk/src/external/ois/OISEvents.h (copied) * code/trunk/src/external/ois/OISException.cpp (copied) * code/trunk/src/external/ois/OISException.h (copied) * code/trunk/src/external/ois/OISFactoryCreator.h (copied) * code/trunk/src/external/ois/OISForceFeedback.cpp (copied) * code/trunk/src/external/ois/OISForceFeedback.h (copied) * code/trunk/src/external/ois/OISInputManager.cpp (copied) * code/trunk/src/external/ois/OISInputManager.h (copied) * code/trunk/src/external/ois/OISInterface.h (copied) * code/trunk/src/external/ois/OISJoyStick.cpp (copied) * code/trunk/src/external/ois/OISJoyStick.h (copied) * code/trunk/src/external/ois/OISKeyboard.cpp (copied) * code/trunk/src/external/ois/OISKeyboard.h (copied) * code/trunk/src/external/ois/OISMouse.h (copied) * code/trunk/src/external/ois/OISObject.cpp (copied) * code/trunk/src/external/ois/OISObject.h (copied) * code/trunk/src/external/ois/OISPrereqs.h (copied) * code/trunk/src/external/ois/ReadMe.txt (copied) * code/trunk/src/external/ois/VERSION (copied) * code/trunk/src/external/ois/changes_orxonox.diff (copied) * code/trunk/src/external/ois/linux (copied) * code/trunk/src/external/ois/linux/CMakeLists.txt (copied) * code/trunk/src/external/ois/linux/EventHelpers.cpp (copied) * code/trunk/src/external/ois/linux/EventHelpers.h (copied) * code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp (copied) * code/trunk/src/external/ois/linux/LinuxForceFeedback.h (copied) * code/trunk/src/external/ois/linux/LinuxInputManager.cpp (copied) * code/trunk/src/external/ois/linux/LinuxInputManager.h (copied) * code/trunk/src/external/ois/linux/LinuxJoyStickEvents.cpp (copied) * code/trunk/src/external/ois/linux/LinuxJoyStickEvents.h (copied) * code/trunk/src/external/ois/linux/LinuxKeyboard.cpp (copied) * code/trunk/src/external/ois/linux/LinuxKeyboard.h (copied) * code/trunk/src/external/ois/linux/LinuxMouse.cpp (copied) * code/trunk/src/external/ois/linux/LinuxMouse.h (copied) * code/trunk/src/external/ois/linux/LinuxPrereqs.h (copied) * code/trunk/src/external/ois/mac (copied) * code/trunk/src/external/ois/mac/CMakeLists.txt (copied) * code/trunk/src/external/ois/mac/MacHIDManager.cpp (copied) * code/trunk/src/external/ois/mac/MacHIDManager.h (copied) * code/trunk/src/external/ois/mac/MacHelpers.cpp (copied) * code/trunk/src/external/ois/mac/MacHelpers.h (copied) * code/trunk/src/external/ois/mac/MacInputManager.cpp (copied) * code/trunk/src/external/ois/mac/MacInputManager.h (copied) * code/trunk/src/external/ois/mac/MacKeyboard.cpp (copied) * code/trunk/src/external/ois/mac/MacKeyboard.h (copied) * code/trunk/src/external/ois/mac/MacMouse.cpp (copied) * code/trunk/src/external/ois/mac/MacMouse.h (copied) * code/trunk/src/external/ois/mac/MacPrereqs.h (copied) * code/trunk/src/external/ois/win32 (copied) * code/trunk/src/external/ois/win32/CMakeLists.txt (copied) * code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp (copied) * code/trunk/src/external/ois/win32/Win32ForceFeedback.h (copied) * code/trunk/src/external/ois/win32/Win32InputManager.cpp (copied) * code/trunk/src/external/ois/win32/Win32InputManager.h (copied) * code/trunk/src/external/ois/win32/Win32JoyStick.cpp (copied) * code/trunk/src/external/ois/win32/Win32JoyStick.h (copied) * code/trunk/src/external/ois/win32/Win32KeyBoard.cpp (copied) * code/trunk/src/external/ois/win32/Win32KeyBoard.h (copied) * code/trunk/src/external/ois/win32/Win32Mouse.cpp (copied) * code/trunk/src/external/ois/win32/Win32Mouse.h (copied) * code/trunk/src/external/ois/win32/Win32Prereqs.h (copied) * code/trunk/src/external/tinyxml (copied) * code/trunk/src/external/tinyxml/CMakeLists.txt (copied) * code/trunk/src/external/tinyxml/VERSION (copied) * code/trunk/src/external/tinyxml/changes.txt (copied) * code/trunk/src/external/tinyxml/changes_orxonox.diff (copied) * code/trunk/src/external/tinyxml/readme.txt (copied) * code/trunk/src/external/tinyxml/ticpp.cpp (copied) * code/trunk/src/external/tinyxml/ticpp.h (copied) * code/trunk/src/external/tinyxml/ticpprc.h (copied) * code/trunk/src/external/tinyxml/tinystr.cpp (copied) * code/trunk/src/external/tinyxml/tinystr.h (copied) * code/trunk/src/external/tinyxml/tinyxml.cpp (copied) * code/trunk/src/external/tinyxml/tinyxml.h (copied) * code/trunk/src/external/tinyxml/tinyxmlerror.cpp (copied) * code/trunk/src/external/tinyxml/tinyxmlparser.cpp (copied) * code/trunk/src/libraries/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ArgumentCompleter.h (copied) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (copied) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.h (copied) * code/trunk/src/libraries/core/ArgumentCompletionListElement.h (copied) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (copied) * code/trunk/src/libraries/core/ClassTreeMask.h (copied) * code/trunk/src/libraries/core/Clock.h (modified) * code/trunk/src/libraries/core/CommandEvaluation.cc (copied) * code/trunk/src/libraries/core/CommandEvaluation.h (copied) * code/trunk/src/libraries/core/CommandExecutor.cc (copied) * code/trunk/src/libraries/core/CommandExecutor.h (copied) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConsoleCommand.cc (copied) * code/trunk/src/libraries/core/ConsoleCommand.h (copied) * code/trunk/src/libraries/core/ConsoleCommandCompilation.cc (copied) * code/trunk/src/libraries/core/ConsoleCommandCompilation.h (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrecompiledHeaders.h (modified) * code/trunk/src/libraries/core/Event.cc (copied) * code/trunk/src/libraries/core/Event.h (copied) * code/trunk/src/libraries/core/EventIncludes.h (copied) * code/trunk/src/libraries/core/Factory.cc (modified) * code/trunk/src/libraries/core/Factory.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (copied) * code/trunk/src/libraries/core/GUIManager.h (copied) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GameMode.cc (copied) * code/trunk/src/libraries/core/GameMode.h (copied) * code/trunk/src/libraries/core/GraphicsManager.cc (copied) * code/trunk/src/libraries/core/GraphicsManager.h (copied) * code/trunk/src/libraries/core/IRC.cc (copied) * code/trunk/src/libraries/core/IRC.h (copied) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Loader.cc (copied) * code/trunk/src/libraries/core/Loader.h (copied) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (copied) * code/trunk/src/libraries/core/MemoryArchive.h (copied) * code/trunk/src/libraries/core/Namespace.cc (copied) * code/trunk/src/libraries/core/Namespace.h (copied) * code/trunk/src/libraries/core/NamespaceNode.cc (copied) * code/trunk/src/libraries/core/NamespaceNode.h (copied) * code/trunk/src/libraries/core/Resource.cc (copied) * code/trunk/src/libraries/core/Resource.h (copied) * code/trunk/src/libraries/core/Shell.cc (copied) * code/trunk/src/libraries/core/Shell.h (copied) * code/trunk/src/libraries/core/Super.h (copied) * code/trunk/src/libraries/core/TclBind.cc (copied) * code/trunk/src/libraries/core/TclBind.h (copied) * code/trunk/src/libraries/core/TclThreadList.h (copied) * code/trunk/src/libraries/core/TclThreadManager.cc (copied) * code/trunk/src/libraries/core/TclThreadManager.h (copied) * code/trunk/src/libraries/core/Template.cc (copied) * code/trunk/src/libraries/core/Template.h (copied) * code/trunk/src/libraries/core/WindowEventListener.cc (copied) * code/trunk/src/libraries/core/WindowEventListener.h (copied) * code/trunk/src/libraries/core/XMLFile.h (copied) * code/trunk/src/libraries/core/XMLNameListener.cc (copied) * code/trunk/src/libraries/core/XMLNameListener.h (copied) * code/trunk/src/libraries/core/XMLPort.cc (copied) * code/trunk/src/libraries/core/XMLPort.h (copied) * code/trunk/src/libraries/core/input (copied) * code/trunk/src/libraries/core/input/Button.cc (copied) * code/trunk/src/libraries/core/input/Button.h (copied) * code/trunk/src/libraries/core/input/CMakeLists.txt (copied) * code/trunk/src/libraries/core/input/HalfAxis.cc (copied) * code/trunk/src/libraries/core/input/HalfAxis.h (copied) * code/trunk/src/libraries/core/input/InputBuffer.cc (copied) * code/trunk/src/libraries/core/input/InputBuffer.h (copied) * code/trunk/src/libraries/core/input/InputCommands.cc (copied) * code/trunk/src/libraries/core/input/InputCommands.h (copied) * code/trunk/src/libraries/core/input/InputDevice.h (copied) * code/trunk/src/libraries/core/input/InputHandler.h (copied) * code/trunk/src/libraries/core/input/InputManager.cc (copied) * code/trunk/src/libraries/core/input/InputManager.h (copied) * code/trunk/src/libraries/core/input/InputPrereqs.h (copied) * code/trunk/src/libraries/core/input/InputState.cc (copied) * code/trunk/src/libraries/core/input/InputState.h (copied) * code/trunk/src/libraries/core/input/JoyStick.cc (copied) * code/trunk/src/libraries/core/input/JoyStick.h (copied) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (copied) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (copied) * code/trunk/src/libraries/core/input/KeyBinder.cc (copied) * code/trunk/src/libraries/core/input/KeyBinder.h (copied) * code/trunk/src/libraries/core/input/KeyDetector.cc (copied) * code/trunk/src/libraries/core/input/KeyDetector.h (copied) * code/trunk/src/libraries/core/input/Keyboard.cc (copied) * code/trunk/src/libraries/core/input/Keyboard.h (copied) * code/trunk/src/libraries/core/input/Mouse.cc (copied) * code/trunk/src/libraries/core/input/Mouse.h (copied) * code/trunk/src/libraries/network (copied) * code/trunk/src/libraries/network/CMakeLists.txt (copied) * code/trunk/src/libraries/network/ChatListener.cc (copied) * code/trunk/src/libraries/network/ChatListener.h (copied) * code/trunk/src/libraries/network/Client.cc (copied) * code/trunk/src/libraries/network/Client.h (copied) * code/trunk/src/libraries/network/ClientConnection.cc (copied) * code/trunk/src/libraries/network/ClientConnection.h (copied) * code/trunk/src/libraries/network/ClientConnectionListener.cc (copied) * code/trunk/src/libraries/network/ClientConnectionListener.h (copied) * code/trunk/src/libraries/network/ClientInformation.cc (copied) * code/trunk/src/libraries/network/ClientInformation.h (copied) * code/trunk/src/libraries/network/Connection.cc (copied) * code/trunk/src/libraries/network/Connection.h (copied) * code/trunk/src/libraries/network/FunctionCallManager.cc (copied) * code/trunk/src/libraries/network/FunctionCallManager.h (copied) * code/trunk/src/libraries/network/GamestateClient.cc (copied) * code/trunk/src/libraries/network/GamestateClient.h (copied) * code/trunk/src/libraries/network/GamestateHandler.cc (copied) * code/trunk/src/libraries/network/GamestateHandler.h (copied) * code/trunk/src/libraries/network/GamestateManager.cc (copied) * code/trunk/src/libraries/network/GamestateManager.h (copied) * code/trunk/src/libraries/network/Host.cc (copied) * code/trunk/src/libraries/network/Host.h (copied) * code/trunk/src/libraries/network/NetworkFunction.cc (copied) * code/trunk/src/libraries/network/NetworkFunction.h (copied) * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (copied) * code/trunk/src/libraries/network/Server.cc (copied) * code/trunk/src/libraries/network/Server.h (copied) * code/trunk/src/libraries/network/ServerConnection.cc (copied) * code/trunk/src/libraries/network/ServerConnection.h (copied) * code/trunk/src/libraries/network/TODO (copied) * code/trunk/src/libraries/network/TrafficControl.cc (copied) * code/trunk/src/libraries/network/TrafficControl.h (copied) * code/trunk/src/libraries/network/packet (copied) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (copied) * code/trunk/src/libraries/network/packet/Acknowledgement.h (copied) * code/trunk/src/libraries/network/packet/CMakeLists.txt (copied) * code/trunk/src/libraries/network/packet/Chat.cc (copied) * code/trunk/src/libraries/network/packet/Chat.h (copied) * code/trunk/src/libraries/network/packet/ClassID.cc (copied) * code/trunk/src/libraries/network/packet/ClassID.h (copied) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (copied) * code/trunk/src/libraries/network/packet/DeleteObjects.h (copied) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (copied) * code/trunk/src/libraries/network/packet/FunctionCalls.h (copied) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (copied) * code/trunk/src/libraries/network/packet/FunctionIDs.h (copied) * code/trunk/src/libraries/network/packet/Gamestate.cc (copied) * code/trunk/src/libraries/network/packet/Gamestate.h (copied) * code/trunk/src/libraries/network/packet/Packet.cc (copied) * code/trunk/src/libraries/network/packet/Packet.h (copied) * code/trunk/src/libraries/network/packet/Welcome.cc (copied) * code/trunk/src/libraries/network/packet/Welcome.h (copied) * code/trunk/src/libraries/network/synchronisable (copied) * code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (copied) * code/trunk/src/libraries/network/synchronisable/NetworkCallback.h (copied) * code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.cc (copied) * code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.h (copied) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (copied) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (copied) * code/trunk/src/libraries/network/synchronisable/SynchronisableSpecialisations.cc (copied) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.cc (copied) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (copied) * code/trunk/src/libraries/tools (copied) * code/trunk/src/libraries/tools/BillboardSet.cc (copied) * code/trunk/src/libraries/tools/BillboardSet.h (copied) * code/trunk/src/libraries/tools/BulletConversions.h (copied) * code/trunk/src/libraries/tools/CMakeLists.txt (copied) * code/trunk/src/libraries/tools/DynamicLines.cc (copied) * code/trunk/src/libraries/tools/DynamicLines.h (copied) * code/trunk/src/libraries/tools/DynamicRenderable.cc (copied) * code/trunk/src/libraries/tools/DynamicRenderable.h (copied) * code/trunk/src/libraries/tools/Mesh.cc (copied) * code/trunk/src/libraries/tools/Mesh.h (copied) * code/trunk/src/libraries/tools/ParticleInterface.cc (copied) * code/trunk/src/libraries/tools/ParticleInterface.h (copied) * code/trunk/src/libraries/tools/ResourceCollection.cc (copied) * code/trunk/src/libraries/tools/ResourceCollection.h (copied) * code/trunk/src/libraries/tools/ResourceLocation.cc (copied) * code/trunk/src/libraries/tools/ResourceLocation.h (copied) * code/trunk/src/libraries/tools/Shader.cc (copied) * code/trunk/src/libraries/tools/Shader.h (copied) * code/trunk/src/libraries/tools/TextureGenerator.cc (copied) * code/trunk/src/libraries/tools/TextureGenerator.h (copied) * code/trunk/src/libraries/tools/Timer.cc (copied) * code/trunk/src/libraries/tools/Timer.h (copied) * code/trunk/src/libraries/tools/ToolsPrecompiledHeaders.h (copied) * code/trunk/src/libraries/tools/ToolsPrereqs.h (copied) * code/trunk/src/libraries/tools/interfaces (copied) * code/trunk/src/libraries/tools/interfaces/CMakeLists.txt (copied) * code/trunk/src/libraries/tools/interfaces/Tickable.h (copied) * code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (copied) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (copied) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Clipboard.cc (copied) * code/trunk/src/libraries/util/Clipboard.h (copied) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/OgreForwardRefs.h (copied) * code/trunk/src/libraries/util/UTFStringConversions.h (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/gamestates (copied) * code/trunk/src/modules/gamestates/CMakeLists.txt (copied) * code/trunk/src/modules/gamestates/GSClient.cc (copied) * code/trunk/src/modules/gamestates/GSClient.h (copied) * code/trunk/src/modules/gamestates/GSDedicated.cc (copied) * code/trunk/src/modules/gamestates/GSDedicated.h (copied) * code/trunk/src/modules/gamestates/GSGraphics.cc (copied) * code/trunk/src/modules/gamestates/GSGraphics.h (copied) * code/trunk/src/modules/gamestates/GSIOConsole.cc (copied) * code/trunk/src/modules/gamestates/GSIOConsole.h (copied) * code/trunk/src/modules/gamestates/GSLevel.cc (copied) * code/trunk/src/modules/gamestates/GSLevel.h (copied) * code/trunk/src/modules/gamestates/GSMainMenu.cc (copied) * code/trunk/src/modules/gamestates/GSMainMenu.h (copied) * code/trunk/src/modules/gamestates/GSRoot.cc (copied) * code/trunk/src/modules/gamestates/GSRoot.h (copied) * code/trunk/src/modules/gamestates/GSServer.cc (copied) * code/trunk/src/modules/gamestates/GSServer.h (copied) * code/trunk/src/modules/gamestates/GSStandalone.cc (copied) * code/trunk/src/modules/gamestates/GSStandalone.h (copied) * code/trunk/src/modules/gamestates/GameStatesPrecompiledHeaders.h (copied) * code/trunk/src/modules/gamestates/GameStatesPrereqs.h (copied) * code/trunk/src/modules/objects (copied) * code/trunk/src/modules/objects/Attacher.cc (copied) * code/trunk/src/modules/objects/Attacher.h (copied) * code/trunk/src/modules/objects/CMakeLists.txt (copied) * code/trunk/src/modules/objects/ForceField.cc (copied) * code/trunk/src/modules/objects/ForceField.h (copied) * code/trunk/src/modules/objects/ObjectsPrecompiledHeaders.h (copied) * code/trunk/src/modules/objects/ObjectsPrereqs.h (copied) * code/trunk/src/modules/objects/Planet.cc (copied) * code/trunk/src/modules/objects/Planet.h (copied) * code/trunk/src/modules/objects/Script.cc (copied) * code/trunk/src/modules/objects/Script.h (copied) * code/trunk/src/modules/objects/collisionshapes (copied) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (copied) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (copied) * code/trunk/src/modules/objects/collisionshapes/CMakeLists.txt (copied) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (copied) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (copied) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (copied) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (copied) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (copied) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (copied) * code/trunk/src/modules/objects/eventsystem (copied) * code/trunk/src/modules/objects/eventsystem/CMakeLists.txt (copied) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (copied) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventListener.h (copied) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (copied) * code/trunk/src/modules/objects/triggers (copied) * code/trunk/src/modules/objects/triggers/CMakeLists.txt (copied) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (copied) * code/trunk/src/modules/objects/triggers/CheckPoint.h (copied) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (copied) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (copied) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (copied) * code/trunk/src/modules/objects/triggers/EventTrigger.h (copied) * code/trunk/src/modules/objects/triggers/Trigger.cc (copied) * code/trunk/src/modules/objects/triggers/Trigger.h (copied) * code/trunk/src/modules/overlays (copied) * code/trunk/src/modules/overlays/CMakeLists.txt (copied) * code/trunk/src/modules/overlays/FadeoutText.cc (copied) * code/trunk/src/modules/overlays/FadeoutText.h (copied) * code/trunk/src/modules/overlays/GUIOverlay.cc (copied) * code/trunk/src/modules/overlays/GUIOverlay.h (copied) * code/trunk/src/modules/overlays/OverlayText.cc (copied) * code/trunk/src/modules/overlays/OverlayText.h (copied) * code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h (copied) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (copied) * code/trunk/src/modules/overlays/debugging (copied) * code/trunk/src/modules/overlays/debugging/CMakeLists.txt (copied) * code/trunk/src/modules/overlays/debugging/DebugFPSText.cc (copied) * code/trunk/src/modules/overlays/debugging/DebugFPSText.h (copied) * code/trunk/src/modules/overlays/debugging/DebugRTRText.cc (copied) * code/trunk/src/modules/overlays/debugging/DebugRTRText.h (copied) * code/trunk/src/modules/overlays/hud (copied) * code/trunk/src/modules/overlays/hud/AnnounceMessage.cc (copied) * code/trunk/src/modules/overlays/hud/AnnounceMessage.h (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (copied) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (copied) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (copied) * code/trunk/src/modules/overlays/hud/DeathMessage.cc (copied) * code/trunk/src/modules/overlays/hud/DeathMessage.h (copied) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (copied) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (copied) * code/trunk/src/modules/overlays/hud/HUDBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (copied) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDRadar.h (copied) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDTimer.cc (copied) * code/trunk/src/modules/overlays/hud/HUDTimer.h (copied) * code/trunk/src/modules/overlays/hud/KillMessage.cc (copied) * code/trunk/src/modules/overlays/hud/KillMessage.h (copied) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (copied) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.h (copied) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (copied) * code/trunk/src/modules/overlays/stats (copied) * code/trunk/src/modules/overlays/stats/CMakeLists.txt (copied) * code/trunk/src/modules/overlays/stats/CreateLines.cc (copied) * code/trunk/src/modules/overlays/stats/CreateLines.h (copied) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (copied) * code/trunk/src/modules/overlays/stats/Scoreboard.h (copied) * code/trunk/src/modules/overlays/stats/Stats.cc (copied) * code/trunk/src/modules/overlays/stats/Stats.h (copied) * code/trunk/src/modules/pong (copied) * code/trunk/src/modules/pong/CMakeLists.txt (copied) * code/trunk/src/modules/pong/Pong.cc (copied) * code/trunk/src/modules/pong/Pong.h (copied) * code/trunk/src/modules/pong/PongAI.cc (copied) * code/trunk/src/modules/pong/PongAI.h (copied) * code/trunk/src/modules/pong/PongBall.cc (copied) * code/trunk/src/modules/pong/PongBall.h (copied) * code/trunk/src/modules/pong/PongBat.cc (copied) * code/trunk/src/modules/pong/PongBat.h (copied) * code/trunk/src/modules/pong/PongBot.cc (copied) * code/trunk/src/modules/pong/PongBot.h (copied) * code/trunk/src/modules/pong/PongCenterpoint.cc (copied) * code/trunk/src/modules/pong/PongCenterpoint.h (copied) * code/trunk/src/modules/pong/PongPrecompiledHeaders.h (copied) * code/trunk/src/modules/pong/PongPrereqs.h (copied) * code/trunk/src/modules/pong/PongScore.cc (copied) * code/trunk/src/modules/pong/PongScore.h (copied) * code/trunk/src/modules/questsystem (copied) * code/trunk/src/modules/questsystem/AddQuest.cc (copied) * code/trunk/src/modules/questsystem/AddQuest.h (copied) * code/trunk/src/modules/questsystem/AddQuestHint.cc (copied) * code/trunk/src/modules/questsystem/AddQuestHint.h (copied) * code/trunk/src/modules/questsystem/AddReward.cc (copied) * code/trunk/src/modules/questsystem/AddReward.h (copied) * code/trunk/src/modules/questsystem/CMakeLists.txt (copied) * code/trunk/src/modules/questsystem/ChangeQuestStatus.cc (copied) * code/trunk/src/modules/questsystem/ChangeQuestStatus.h (copied) * code/trunk/src/modules/questsystem/CompleteQuest.cc (copied) * code/trunk/src/modules/questsystem/CompleteQuest.h (copied) * code/trunk/src/modules/questsystem/FailQuest.cc (copied) * code/trunk/src/modules/questsystem/FailQuest.h (copied) * code/trunk/src/modules/questsystem/GlobalQuest.cc (copied) * code/trunk/src/modules/questsystem/GlobalQuest.h (copied) * code/trunk/src/modules/questsystem/LocalQuest.cc (copied) * code/trunk/src/modules/questsystem/LocalQuest.h (copied) * code/trunk/src/modules/questsystem/Quest.cc (copied) * code/trunk/src/modules/questsystem/Quest.h (copied) * code/trunk/src/modules/questsystem/QuestDescription.cc (copied) * code/trunk/src/modules/questsystem/QuestDescription.h (copied) * code/trunk/src/modules/questsystem/QuestEffect.cc (copied) * code/trunk/src/modules/questsystem/QuestEffect.h (copied) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (copied) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (copied) * code/trunk/src/modules/questsystem/QuestGUI.cc (copied) * code/trunk/src/modules/questsystem/QuestGUI.h (copied) * code/trunk/src/modules/questsystem/QuestGUINode.cc (copied) * code/trunk/src/modules/questsystem/QuestGUINode.h (copied) * code/trunk/src/modules/questsystem/QuestHint.cc (copied) * code/trunk/src/modules/questsystem/QuestHint.h (copied) * code/trunk/src/modules/questsystem/QuestItem.cc (copied) * code/trunk/src/modules/questsystem/QuestItem.h (copied) * code/trunk/src/modules/questsystem/QuestListener.cc (copied) * code/trunk/src/modules/questsystem/QuestListener.h (copied) * code/trunk/src/modules/questsystem/QuestManager.cc (copied) * code/trunk/src/modules/questsystem/QuestManager.h (copied) * code/trunk/src/modules/questsystem/QuestNotification.cc (copied) * code/trunk/src/modules/questsystem/QuestNotification.h (copied) * code/trunk/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (copied) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (copied) * code/trunk/src/modules/questsystem/notifications (copied) * code/trunk/src/modules/questsystem/notifications/CMakeLists.txt (copied) * code/trunk/src/modules/questsystem/notifications/Notification.cc (copied) * code/trunk/src/modules/questsystem/notifications/Notification.h (copied) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (copied) * code/trunk/src/modules/questsystem/notifications/NotificationManager.h (copied) * code/trunk/src/modules/questsystem/notifications/NotificationOverlay.cc (copied) * code/trunk/src/modules/questsystem/notifications/NotificationOverlay.h (copied) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (copied) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.h (copied) * code/trunk/src/modules/weapons (copied) * code/trunk/src/modules/weapons/CMakeLists.txt (copied) * code/trunk/src/modules/weapons/MuzzleFlash.cc (copied) * code/trunk/src/modules/weapons/MuzzleFlash.h (copied) * code/trunk/src/modules/weapons/WeaponsPrecompiledHeaders.h (copied) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (copied) * code/trunk/src/modules/weapons/munitions (copied) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (copied) * code/trunk/src/modules/weapons/munitions/FusionMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/FusionMunition.h (copied) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/LaserMunition.h (copied) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (copied) * code/trunk/src/modules/weapons/projectiles (copied) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (copied) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/Projectile.h (copied) * code/trunk/src/modules/weapons/weaponmodes (copied) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (copied) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (copied) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.h (copied) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (copied) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.h (copied) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (copied) * code/trunk/src/orxonox/CameraManager.h (copied) * code/trunk/src/orxonox/GSRoot.cc (deleted) * code/trunk/src/orxonox/GSRoot.h (deleted) * code/trunk/src/orxonox/Level.cc (copied) * code/trunk/src/orxonox/Level.h (copied) * code/trunk/src/orxonox/LevelManager.cc (copied) * code/trunk/src/orxonox/LevelManager.h (copied) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrecompiledHeaders.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (copied) * code/trunk/src/orxonox/PawnManager.h (copied) * code/trunk/src/orxonox/PlayerManager.cc (copied) * code/trunk/src/orxonox/PlayerManager.h (copied) * code/trunk/src/orxonox/Radar.cc (copied) * code/trunk/src/orxonox/Radar.h (copied) * code/trunk/src/orxonox/Scene.cc (copied) * code/trunk/src/orxonox/Scene.h (copied) * code/trunk/src/orxonox/Test.cc (copied) * code/trunk/src/orxonox/Test.h (copied) * code/trunk/src/orxonox/collisionshapes (copied) * code/trunk/src/orxonox/collisionshapes/CMakeLists.txt (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (copied) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (copied) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (copied) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (copied) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (copied) * code/trunk/src/orxonox/controllers (copied) * code/trunk/src/orxonox/controllers/AIController.cc (copied) * code/trunk/src/orxonox/controllers/AIController.h (copied) * code/trunk/src/orxonox/controllers/ArtificialController.cc (copied) * code/trunk/src/orxonox/controllers/ArtificialController.h (copied) * code/trunk/src/orxonox/controllers/CMakeLists.txt (copied) * code/trunk/src/orxonox/controllers/Controller.cc (copied) * code/trunk/src/orxonox/controllers/Controller.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (copied) * code/trunk/src/orxonox/controllers/HumanController.h (copied) * code/trunk/src/orxonox/controllers/ScriptController.cc (copied) * code/trunk/src/orxonox/controllers/ScriptController.h (copied) * code/trunk/src/orxonox/controllers/WaypointController.cc (copied) * code/trunk/src/orxonox/controllers/WaypointController.h (copied) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (copied) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (copied) * code/trunk/src/orxonox/gametypes (copied) * code/trunk/src/orxonox/gametypes/Asteroids.cc (copied) * code/trunk/src/orxonox/gametypes/Asteroids.h (copied) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (copied) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (copied) * code/trunk/src/orxonox/gametypes/Deathmatch.h (copied) * code/trunk/src/orxonox/gametypes/Gametype.cc (copied) * code/trunk/src/orxonox/gametypes/Gametype.h (copied) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (copied) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.h (copied) * code/trunk/src/orxonox/graphics (copied) * code/trunk/src/orxonox/graphics/Backlight.cc (copied) * code/trunk/src/orxonox/graphics/Backlight.h (copied) * code/trunk/src/orxonox/graphics/Billboard.cc (copied) * code/trunk/src/orxonox/graphics/Billboard.h (copied) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (copied) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (copied) * code/trunk/src/orxonox/graphics/CMakeLists.txt (copied) * code/trunk/src/orxonox/graphics/Camera.cc (copied) * code/trunk/src/orxonox/graphics/Camera.h (copied) * code/trunk/src/orxonox/graphics/FadingBillboard.cc (copied) * code/trunk/src/orxonox/graphics/FadingBillboard.h (copied) * code/trunk/src/orxonox/graphics/GlobalShader.cc (copied) * code/trunk/src/orxonox/graphics/GlobalShader.h (copied) * code/trunk/src/orxonox/graphics/Light.cc (copied) * code/trunk/src/orxonox/graphics/Light.h (copied) * code/trunk/src/orxonox/graphics/Model.cc (copied) * code/trunk/src/orxonox/graphics/Model.h (copied) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (copied) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (copied) * code/trunk/src/orxonox/graphics/ParticleSpawner.cc (copied) * code/trunk/src/orxonox/graphics/ParticleSpawner.h (copied) * code/trunk/src/orxonox/infos (copied) * code/trunk/src/orxonox/infos/Bot.cc (copied) * code/trunk/src/orxonox/infos/Bot.h (copied) * code/trunk/src/orxonox/infos/CMakeLists.txt (copied) * code/trunk/src/orxonox/infos/GametypeInfo.cc (copied) * code/trunk/src/orxonox/infos/GametypeInfo.h (copied) * code/trunk/src/orxonox/infos/HumanPlayer.cc (copied) * code/trunk/src/orxonox/infos/HumanPlayer.h (copied) * code/trunk/src/orxonox/infos/Info.cc (copied) * code/trunk/src/orxonox/infos/Info.h (copied) * code/trunk/src/orxonox/infos/PlayerInfo.cc (copied) * code/trunk/src/orxonox/infos/PlayerInfo.h (copied) * code/trunk/src/orxonox/interfaces (copied) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (copied) * code/trunk/src/orxonox/interfaces/GametypeMessageListener.h (copied) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (copied) * code/trunk/src/orxonox/interfaces/NotificationListener.h (copied) * code/trunk/src/orxonox/interfaces/PawnListener.h (copied) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (copied) * code/trunk/src/orxonox/interfaces/RadarListener.h (copied) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (copied) * code/trunk/src/orxonox/interfaces/RadarViewable.h (copied) * code/trunk/src/orxonox/interfaces/Rewardable.h (copied) * code/trunk/src/orxonox/interfaces/TeamColourable.h (copied) * code/trunk/src/orxonox/items (copied) * code/trunk/src/orxonox/items/CMakeLists.txt (copied) * code/trunk/src/orxonox/items/Engine.cc (copied) * code/trunk/src/orxonox/items/Engine.h (copied) * code/trunk/src/orxonox/items/Item.cc (copied) * code/trunk/src/orxonox/items/Item.h (copied) * code/trunk/src/orxonox/items/MultiStateEngine.cc (copied) * code/trunk/src/orxonox/items/MultiStateEngine.h (copied) * code/trunk/src/orxonox/overlays (copied) * code/trunk/src/orxonox/overlays/CMakeLists.txt (copied) * code/trunk/src/orxonox/overlays/InGameConsole.cc (copied) * code/trunk/src/orxonox/overlays/InGameConsole.h (copied) * code/trunk/src/orxonox/overlays/Map.cc (copied) * code/trunk/src/orxonox/overlays/Map.h (copied) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (copied) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (copied) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (copied) * code/trunk/src/orxonox/overlays/OverlayGroup.h (copied) * code/trunk/src/orxonox/pickup (copied) * code/trunk/src/orxonox/pickup/BaseItem.cc (copied) * code/trunk/src/orxonox/pickup/BaseItem.h (copied) * code/trunk/src/orxonox/pickup/CMakeLists.txt (copied) * code/trunk/src/orxonox/pickup/DroppedItem.cc (copied) * code/trunk/src/orxonox/pickup/DroppedItem.h (copied) * code/trunk/src/orxonox/pickup/EquipmentItem.cc (copied) * code/trunk/src/orxonox/pickup/EquipmentItem.h (copied) * code/trunk/src/orxonox/pickup/ModifierPickup.cc (copied) * code/trunk/src/orxonox/pickup/ModifierPickup.h (copied) * code/trunk/src/orxonox/pickup/ModifierType.h (copied) * code/trunk/src/orxonox/pickup/PassiveItem.cc (copied) * code/trunk/src/orxonox/pickup/PassiveItem.h (copied) * code/trunk/src/orxonox/pickup/PickupCollection.cc (copied) * code/trunk/src/orxonox/pickup/PickupCollection.h (copied) * code/trunk/src/orxonox/pickup/PickupInventory.cc (copied) * code/trunk/src/orxonox/pickup/PickupInventory.h (copied) * code/trunk/src/orxonox/pickup/PickupSpawner.cc (copied) * code/trunk/src/orxonox/pickup/PickupSpawner.h (copied) * code/trunk/src/orxonox/pickup/UsableItem.cc (copied) * code/trunk/src/orxonox/pickup/UsableItem.h (copied) * code/trunk/src/orxonox/pickup/items (copied) * code/trunk/src/orxonox/pickup/items/CMakeLists.txt (copied) * code/trunk/src/orxonox/pickup/items/HealthImmediate.cc (copied) * code/trunk/src/orxonox/pickup/items/HealthImmediate.h (copied) * code/trunk/src/orxonox/pickup/items/HealthUsable.cc (copied) * code/trunk/src/orxonox/pickup/items/HealthUsable.h (copied) * code/trunk/src/orxonox/pickup/items/Jump.cc (copied) * code/trunk/src/orxonox/pickup/items/Jump.h (copied) * code/trunk/src/orxonox/sound (copied) * code/trunk/src/orxonox/sound/CMakeLists.txt (copied) * code/trunk/src/orxonox/sound/SoundBase.cc (copied) * code/trunk/src/orxonox/sound/SoundBase.h (copied) * code/trunk/src/orxonox/sound/SoundMainMenu.cc (copied) * code/trunk/src/orxonox/sound/SoundMainMenu.h (copied) * code/trunk/src/orxonox/sound/SoundManager.cc (copied) * code/trunk/src/orxonox/sound/SoundManager.h (copied) * code/trunk/src/orxonox/weaponsystem (copied) * code/trunk/src/orxonox/weaponsystem/CMakeLists.txt (copied) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc (copied) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h (copied) * code/trunk/src/orxonox/weaponsystem/Munition.cc (copied) * code/trunk/src/orxonox/weaponsystem/Munition.h (copied) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (copied) * code/trunk/src/orxonox/weaponsystem/Weapon.h (copied) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (copied) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (copied) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (copied) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (copied) * code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (copied) * code/trunk/src/orxonox/weaponsystem/WeaponSet.h (copied) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (copied) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (copied) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (copied) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (copied) * code/trunk/src/orxonox/worldentities (copied) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (copied) * code/trunk/src/orxonox/worldentities/BigExplosion.h (copied) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (copied) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (copied) * code/trunk/src/orxonox/worldentities/CameraPosition.h (copied) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (copied) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (copied) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (copied) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (copied) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (copied) * code/trunk/src/orxonox/worldentities/MobileEntity.h (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.h (copied) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (copied) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (copied) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (copied) * code/trunk/src/orxonox/worldentities/StaticEntity.h (copied) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (copied) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (copied) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (copied) * code/trunk/src/orxonox/worldentities/WorldEntity.h (copied) * code/trunk/src/orxonox/worldentities/pawns (copied) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (copied) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (copied) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (copied) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (copied) Reverted trunk again. We might want to find a way to delete these ... Wed, 23 Sep 2009 13:12:05 GMT dafrick [5761] * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) Removed unused buttons. Sat, 19 Sep 2009 21:57:28 GMT rgrieder [5748] * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.h (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) In quest system: - Build fix (non-void function must return a value) ... Sun, 13 Sep 2009 13:07:19 GMT dafrick [5746] * code/trunk/data/gui/layouts/QuestGUI.layout (added) * code/trunk/data/gui/scripts/QuestGUI.lua (added) * code/trunk/src/modules/questsystem/QuestGUI.cc (added) * code/trunk/src/modules/questsystem/QuestGUI.h (added) * code/trunk/src/modules/questsystem/QuestGUINode.cc (added) * code/trunk/src/modules/questsystem/QuestGUINode.h (added) Forgot to add files... Sun, 30 Aug 2009 10:01:14 GMT rgrieder [5700] * code/trunk/data/CMakeLists.txt (modified) * code/trunk/data/gui/configs/CEGUIConfig.xsd (modified) * code/trunk/data/gui/configs/Falagard.xsd (modified) * code/trunk/data/gui/configs/Font.xsd (modified) * code/trunk/data/gui/configs/GUILayout.xsd (modified) * code/trunk/data/gui/configs/GUIScheme.xsd (modified) * code/trunk/data/gui/configs/Imageset.xsd (modified) * code/trunk/data/gui/layouts/CompositorDemo.layout (modified) * code/trunk/data/gui/layouts/Console.wnd (modified) * code/trunk/data/gui/layouts/CrowdDemo.layout (modified) * code/trunk/data/gui/layouts/Demo7Windows.layout (modified) * code/trunk/data/gui/layouts/Demo8.layout (modified) * code/trunk/data/gui/layouts/DragDropDemo.layout (modified) * code/trunk/data/gui/layouts/FontDemo.layout (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGameTest.layout (modified) * code/trunk/data/gui/layouts/InstancingDemo.layout (modified) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/TabControlDemo.layout (modified) * code/trunk/data/gui/layouts/TabPage.layout (modified) * code/trunk/data/gui/layouts/TabPage1.layout (modified) * code/trunk/data/gui/layouts/TabPage2.layout (modified) * code/trunk/data/gui/layouts/TextDemo.layout (modified) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (modified) * code/trunk/data/gui/layouts/VanillaConsole.layout (modified) * code/trunk/data/gui/layouts/VanillaWindows.layout (modified) * code/trunk/data/gui/layouts/cegui8.layout (modified) * code/trunk/data/gui/layouts/facial.layout (modified) * code/trunk/data/gui/layouts/ogregui.layout (modified) * code/trunk/data/gui/layouts/shadows.layout (modified) * code/trunk/data/gui/schemes/Demo8.scheme (modified) * code/trunk/data/gui/schemes/GUIScheme.xsd (modified) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (modified) * code/trunk/data/gui/schemes/VanillaSkin.scheme (modified) * code/trunk/data/gui/schemes/WindowsLook.scheme (modified) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/physicstest.oxw (modified) * code/trunk/data/levels/old/physicstest2.oxw (modified) * code/trunk/data/levels/old/planettest.oxw (modified) * code/trunk/data/levels/old/presentation_physics.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/questsystem.oxw (modified) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (modified) * code/trunk/data/levels/old/tutorial_hs08.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/particle/ExplosionComp1.particle (modified) * code/trunk/data/particle/ExplosionComp2.particle (modified) * code/trunk/data/particle/ExplosionComp4.particle (modified) * code/trunk/data/particle/FireComp2.particle (modified) * code/trunk/data/particle/LaserGun.particle (modified) * code/trunk/data/particle/ThrusterFire.particle (modified) * code/trunk/data/particle/forcefield.particle (modified) * code/trunk/data/particle/repairGold.particle (modified) * code/trunk/data/particle/repairSilver.particle (modified) * code/trunk/data/particle/shotTest.particle (modified) * code/trunk/data/resources.oxr (modified) * code/trunk/data/tcl/irk/README (modified) * code/trunk/data/tcl/irk/docs/changes.txt (modified) * code/trunk/data/tcl/irk/docs/todo.txt (modified) * code/trunk/data/tcl/irk/docs/usage.txt (modified) * code/trunk/data/tcl/irk/examples/fortunebot.tcl (modified) * code/trunk/data/tcl/irk/examples/mysaint.tcl (modified) * code/trunk/data/tcl/irk/irk.tcl (modified) * code/trunk/data/tcl/irk/lib/irkauth.tcl (modified) * code/trunk/data/tcl/irk/lib/irkcommand.tcl (modified) * code/trunk/data/tcl/irk/lib/irkconnect.tcl (modified) * code/trunk/data/tcl/irk/lib/irkctcptcl.tcl (modified) * code/trunk/data/tcl/irk/lib/irkdispatch.tcl (modified) * code/trunk/data/tcl/irk/lib/irkflow.tcl (modified) * code/trunk/data/tcl/irk/lib/irkqueue.tcl (modified) * code/trunk/data/tcl/irk/lib/irkreceive.tcl (modified) * code/trunk/data/tcl/irk/lib/irkservers.tcl (modified) * code/trunk/data/tcl/irk/lib/irkstate.tcl (modified) * code/trunk/data/tcl/irk/lib/irkutil.tcl (modified) * code/trunk/data/tcl/irk/pkgIndex.tcl (modified) * code/trunk/data/tcl/irk/socks/socks.tcl (modified) Added eol-style native to all data files (all text based). Also ... Sun, 30 Aug 2009 00:22:00 GMT rgrieder [5695] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/bin/standalone.bat.in (modified) * code/trunk/cmake/BuildConfig.cmake (deleted) * code/trunk/cmake/BuildConfigGCC.cmake (deleted) * code/trunk/cmake/BuildConfigMSVC.cmake (deleted) * code/trunk/cmake/CheckOGREPlugins.cmake (modified) * code/trunk/cmake/CompilerConfig.cmake (copied) * code/trunk/cmake/CompilerConfigGCC.cmake (copied) * code/trunk/cmake/CompilerConfigMSVC.cmake (copied) * code/trunk/cmake/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/InstallConfig.cmake (copied) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/Media.cmake (deleted) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/cmake/ParseMacroArguments.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) * code/trunk/data (copied) * code/trunk/data/CMakeLists.txt (copied) * code/trunk/data/DataInstallScript.cmake (copied) * code/trunk/data/defaultConfig (copied) * code/trunk/data/defaultConfig/keybindings.ini (copied) * code/trunk/data/defaultConfig/masterKeybindings.ini (copied) * code/trunk/data/gui (copied) * code/trunk/data/gui/configs (copied) * code/trunk/data/gui/configs/CEGUIConfig.xsd (copied) * code/trunk/data/gui/configs/Falagard.xsd (copied) * code/trunk/data/gui/configs/Font.xsd (copied) * code/trunk/data/gui/configs/GUILayout.xsd (copied) * code/trunk/data/gui/configs/GUIScheme.xsd (copied) * code/trunk/data/gui/configs/Imageset.xsd (copied) * code/trunk/data/gui/layouts (copied) * code/trunk/data/gui/layouts/CompositorDemo.layout (copied) * code/trunk/data/gui/layouts/Console.wnd (copied) * code/trunk/data/gui/layouts/CrowdDemo.layout (copied) * code/trunk/data/gui/layouts/Demo7Windows.layout (copied) * code/trunk/data/gui/layouts/Demo8.layout (copied) * code/trunk/data/gui/layouts/DragDropDemo.layout (copied) * code/trunk/data/gui/layouts/FontDemo.layout (copied) * code/trunk/data/gui/layouts/GUILayout.xsd (copied) * code/trunk/data/gui/layouts/InGameTest.layout (copied) * code/trunk/data/gui/layouts/InstancingDemo.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (copied) * code/trunk/data/gui/layouts/PickupInventory.layout (copied) * code/trunk/data/gui/layouts/TabControlDemo.layout (copied) * code/trunk/data/gui/layouts/TabPage.layout (copied) * code/trunk/data/gui/layouts/TabPage1.layout (copied) * code/trunk/data/gui/layouts/TabPage2.layout (copied) * code/trunk/data/gui/layouts/TextDemo.layout (copied) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (copied) * code/trunk/data/gui/layouts/VanillaConsole.layout (copied) * code/trunk/data/gui/layouts/VanillaWindows.layout (copied) * code/trunk/data/gui/layouts/cegui8.layout (copied) * code/trunk/data/gui/layouts/facial.layout (copied) * code/trunk/data/gui/layouts/ogregui.layout (copied) * code/trunk/data/gui/layouts/shadows.layout (copied) * code/trunk/data/gui/schemes (copied) * code/trunk/data/gui/schemes/Demo8.scheme (copied) * code/trunk/data/gui/schemes/GUIScheme.xsd (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (copied) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (copied) * code/trunk/data/gui/scripts (copied) * code/trunk/data/gui/scripts/BasicGUI.lua (copied) * code/trunk/data/gui/scripts/InitialiseGUI.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (copied) * code/trunk/data/gui/scripts/PickupInventory.lua (copied) * code/trunk/data/levels (copied) * code/trunk/data/levels/empty_level.oxw (copied) * code/trunk/data/levels/gametype_asteroids.oxw (copied) * code/trunk/data/levels/gametype_underattack.oxw (copied) * code/trunk/data/levels/includes (copied) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (copied) * code/trunk/data/levels/includes/weaponsettings1.oxi (copied) * code/trunk/data/levels/includes/weaponsettings2.oxi (copied) * code/trunk/data/levels/includes/weaponsettings3.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_H2.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_pirate.oxi (copied) * code/trunk/data/levels/old (copied) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (copied) * code/trunk/data/levels/old/physicstest.oxw (copied) * code/trunk/data/levels/old/physicstest2.oxw (copied) * code/trunk/data/levels/old/planettest.oxw (copied) * code/trunk/data/levels/old/presentation_physics.oxw (copied) * code/trunk/data/levels/old/princessaeryn.oxw (copied) * code/trunk/data/levels/old/questsystem.oxw (copied) * code/trunk/data/levels/old/sample4.oxw (copied) * code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (copied) * code/trunk/data/levels/old/tutorial_hs08.oxw (copied) * code/trunk/data/levels/pickuptest.oxw (copied) * code/trunk/data/levels/presentation.oxw (copied) * code/trunk/data/levels/presentation09.oxw (copied) * code/trunk/data/levels/presentation09b.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (copied) * code/trunk/data/levels/presentation_pong.oxw (copied) * code/trunk/data/levels/teambasematchlevel.oxw (copied) * code/trunk/data/levels/teamdeathmatch.oxw (copied) * code/trunk/data/levels/templates (copied) * code/trunk/data/levels/templates/spaceship_H2.oxt (copied) * code/trunk/data/levels/templates/spaceship_assff.oxt (copied) * code/trunk/data/levels/templates/spaceship_pirate.oxt (copied) * code/trunk/data/levels/tutorial.oxw (copied) * code/trunk/data/levels/waypoints.oxw (copied) * code/trunk/data/lua (copied) * code/trunk/data/lua/LuaStateInit.lua (copied) * code/trunk/data/overlays (copied) * code/trunk/data/overlays/OrxonoxLoading.overlay (copied) * code/trunk/data/overlays/debug.oxo (copied) * code/trunk/data/overlays/hud.oxo (copied) * code/trunk/data/overlays/hudtemplates3.oxo (copied) * code/trunk/data/overlays/ponghud.oxo (copied) * code/trunk/data/overlays/stats.oxo (copied) * code/trunk/data/overlays/teambasematchhud.oxo (copied) * code/trunk/data/overlays/underattackhud.oxo (copied) * code/trunk/data/particle (copied) * code/trunk/data/particle/Example-Water.particle (copied) * code/trunk/data/particle/Example.particle (copied) * code/trunk/data/particle/ExplosionComp1.particle (copied) * code/trunk/data/particle/ExplosionComp2.particle (copied) * code/trunk/data/particle/ExplosionComp4.particle (copied) * code/trunk/data/particle/FireComp2.particle (copied) * code/trunk/data/particle/LaserGun.particle (copied) * code/trunk/data/particle/ThrusterFire.particle (copied) * code/trunk/data/particle/bigexplosion1part1.particle (copied) * code/trunk/data/particle/bigexplosion1part2.particle (copied) * code/trunk/data/particle/bigexplosion1part3.particle (copied) * code/trunk/data/particle/emitted_emitter.particle (copied) * code/trunk/data/particle/engineglow.particle (copied) * code/trunk/data/particle/explosion1.particle (copied) * code/trunk/data/particle/explosion2.particle (copied) * code/trunk/data/particle/explosion2b.particle (copied) * code/trunk/data/particle/explosion3.particle (copied) * code/trunk/data/particle/fairytwirl.particle (copied) * code/trunk/data/particle/fire3.particle (copied) * code/trunk/data/particle/fire4.particle (copied) * code/trunk/data/particle/forcefield.particle (copied) * code/trunk/data/particle/ray1.particle (copied) * code/trunk/data/particle/ray2.particle (copied) * code/trunk/data/particle/repairGold.particle (copied) * code/trunk/data/particle/repairSilver.particle (copied) * code/trunk/data/particle/shot1.particle (copied) * code/trunk/data/particle/shot2.particle (copied) * code/trunk/data/particle/shot2_small.particle (copied) * code/trunk/data/particle/shot3_small.particle (copied) * code/trunk/data/particle/shotTest.particle (copied) * code/trunk/data/particle/smoke1.particle (copied) * code/trunk/data/particle/smoke2.particle (copied) * code/trunk/data/particle/smoke3.particle (copied) * code/trunk/data/particle/smoke4.particle (copied) * code/trunk/data/particle/smoke5.particle (copied) * code/trunk/data/particle/smoke6.particle (copied) * code/trunk/data/particle/smoke7.particle (copied) * code/trunk/data/particle/sparks.particle (copied) * code/trunk/data/particle/thruster1.particle (copied) * code/trunk/data/particle/thruster2.particle (copied) * code/trunk/data/particle/thruster3.particle (copied) * code/trunk/data/resources.oxr (copied) * code/trunk/data/tcl (copied) * code/trunk/data/tcl/init.tcl (copied) * code/trunk/data/tcl/irc.tcl (copied) * code/trunk/data/tcl/irk (copied) * code/trunk/data/tcl/irk/README (copied) * code/trunk/data/tcl/irk/docs (copied) * code/trunk/data/tcl/irk/docs/changes.txt (copied) * code/trunk/data/tcl/irk/docs/todo.txt (copied) * code/trunk/data/tcl/irk/docs/usage.txt (copied) * code/trunk/data/tcl/irk/examples (copied) * code/trunk/data/tcl/irk/examples/fortunebot.tcl (copied) * code/trunk/data/tcl/irk/examples/mysaint.tcl (copied) * code/trunk/data/tcl/irk/irk.tcl (copied) * code/trunk/data/tcl/irk/lib (copied) * code/trunk/data/tcl/irk/lib/irkauth.tcl (copied) * code/trunk/data/tcl/irk/lib/irkcommand.tcl (copied) * code/trunk/data/tcl/irk/lib/irkconnect.tcl (copied) * code/trunk/data/tcl/irk/lib/irkctcptcl.tcl (copied) * code/trunk/data/tcl/irk/lib/irkdispatch.tcl (copied) * code/trunk/data/tcl/irk/lib/irkflow.tcl (copied) * code/trunk/data/tcl/irk/lib/irkqueue.tcl (copied) * code/trunk/data/tcl/irk/lib/irkreceive.tcl (copied) * code/trunk/data/tcl/irk/lib/irkservers.tcl (copied) * code/trunk/data/tcl/irk/lib/irkstate.tcl (copied) * code/trunk/data/tcl/irk/lib/irkutil.tcl (copied) * code/trunk/data/tcl/irk/pkgIndex.tcl (copied) * code/trunk/data/tcl/irk/socks (copied) * code/trunk/data/tcl/irk/socks/socks.tcl (copied) * code/trunk/data/tcl/remote.tcl (copied) * code/trunk/data/tcl/telnet_server.tcl (copied) * code/trunk/doc/api/CMakeLists.txt (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (copied) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/ceguilua/CMakeLists.txt (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/Clock.h (modified) * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/ConfigFileManager.h (modified) * code/trunk/src/core/ConfigValueContainer.h (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/DynLibManager.h (modified) * code/trunk/src/core/GUIManager.cc (modified) * code/trunk/src/core/GUIManager.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Game.h (modified) * code/trunk/src/core/GraphicsManager.cc (modified) * code/trunk/src/core/GraphicsManager.h (modified) * code/trunk/src/core/Identifier.cc (modified) * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/core/Loader.cc (modified) * code/trunk/src/core/Loader.h (modified) * code/trunk/src/core/LuaBind.cc (deleted) * code/trunk/src/core/LuaBind.h (deleted) * code/trunk/src/core/LuaState.cc (copied) * code/trunk/src/core/LuaState.h (copied) * code/trunk/src/core/MemoryArchive.cc (copied) * code/trunk/src/core/MemoryArchive.h (copied) * code/trunk/src/core/Resource.cc (copied) * code/trunk/src/core/Resource.h (copied) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/ToluaInterface.h (copied) * code/trunk/src/core/XMLFile.h (modified) * code/trunk/src/core/input/Button.cc (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/InputManager.h (modified) * code/trunk/src/core/input/InputState.cc (modified) * code/trunk/src/core/input/InputState.h (modified) * code/trunk/src/core/input/KeyBinder.cc (modified) * code/trunk/src/core/input/KeyBinder.h (modified) * code/trunk/src/core/input/KeyDetector.cc (modified) * code/trunk/src/network/CMakeLists.txt (modified) * code/trunk/src/network/ClientInformation.h (modified) * code/trunk/src/network/TODO (modified) * code/trunk/src/network/packet/CMakeLists.txt (modified) * code/trunk/src/network/synchronisable/CMakeLists.txt (modified) * code/trunk/src/ois/OISEffect.cpp (modified) * code/trunk/src/ois/OISEffect.h (modified) * code/trunk/src/ois/OISForceFeedback.cpp (modified) * code/trunk/src/ois/OISForceFeedback.h (modified) * code/trunk/src/ois/OISJoyStick.h (modified) * code/trunk/src/ois/OISPrereqs.h (modified) * code/trunk/src/ois/changes_orxonox.diff (modified) * code/trunk/src/ois/linux/EventHelpers.cpp (modified) * code/trunk/src/ois/linux/EventHelpers.h (modified) * code/trunk/src/ois/linux/LinuxForceFeedback.cpp (modified) * code/trunk/src/ois/linux/LinuxForceFeedback.h (modified) * code/trunk/src/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/trunk/src/ois/win32/Win32ForceFeedback.cpp (modified) * code/trunk/src/ois/win32/Win32ForceFeedback.h (modified) * code/trunk/src/ois/win32/Win32InputManager.cpp (modified) * code/trunk/src/ois/win32/Win32InputManager.h (modified) * code/trunk/src/ois/win32/Win32JoyStick.cpp (modified) * code/trunk/src/ois/win32/Win32JoyStick.h (modified) * code/trunk/src/ois/win32/Win32KeyBoard.cpp (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Script.cc (modified) * code/trunk/src/orxonox/objects/Script.h (modified) * code/trunk/src/orxonox/orxonox-main.vcproj.user.in (modified) * code/trunk/src/orxonox/sound/SoundBase.cc (modified) * code/trunk/src/orxonox/sound/SoundBase.h (modified) * code/trunk/src/orxonox/tools/CMakeLists.txt (modified) * code/trunk/src/orxonox/tools/Mesh.cc (modified) * code/trunk/src/orxonox/tools/ResourceCollection.cc (copied) * code/trunk/src/orxonox/tools/ResourceCollection.h (copied) * code/trunk/src/orxonox/tools/ResourceLocation.cc (copied) * code/trunk/src/orxonox/tools/ResourceLocation.h (copied) * code/trunk/src/util/CMakeLists.txt (modified) * code/trunk/src/util/Debug.h (modified) Merged resource2 branch back to trunk. IMPORTANT NOTE: Upon this ... Tue, 18 Aug 2009 22:19:11 GMT rgrieder [5661] * code/branches/resource2/data/gui/layouts/MainMenu.layout (moved) * code/branches/resource2/data/gui/scripts/BasicGUI.lua (moved) * code/branches/resource2/data/gui/scripts/IConsole.lua (deleted) * code/branches/resource2/data/gui/scripts/InitialiseGUI.lua (moved) * code/branches/resource2/data/gui/scripts/InstancedInit.lua (deleted) * code/branches/resource2/data/gui/scripts/MainMenu.lua (moved) * code/branches/resource2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/resource2/data/gui/scripts/demo8.lua (deleted) * code/branches/resource2/data/gui/scripts/inGameTest.lua (deleted) * code/branches/resource2/data/gui/scripts/loadGUI.lua (deleted) * code/branches/resource2/data/gui/scripts/loadGUI_2.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu_2.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu_3.lua (deleted) * code/branches/resource2/data/lua/LuaStateInit.lua (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/GUIManager.h (modified) * code/branches/resource2/src/core/LuaState.cc (modified) * code/branches/resource2/src/core/LuaState.h (modified) * code/branches/resource2/src/orxonox/gamestates/GSMainMenu.cc (modified) Cleaned out the lua script files for the GUI. Also replaced ...