# # ChangeLog for code/branches/presentation # # Generated by Trac 1.0.9 # Dec 20, 2024, 6:16:56 PM Sat, 18 Jun 2011 11:11:04 GMT FelixSchulthess [8710] * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.cc (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.h (modified) space boundary billboard is now animated. test run with myTestLevel.oxw Tue, 14 Jun 2011 18:04:44 GMT dafrick [8705] * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/docking/Dock.h (modified) The calling of tthe docking dialog is now synchronized (but not the ... Mon, 13 Jun 2011 12:35:18 GMT dafrick [8704] * code/branches/presentation/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) Only escape [] in CEGUI tetx of version is >= 0.7 Sun, 12 Jun 2011 23:49:05 GMT landauf [8703] * code/branches/presentation/data/gui/scripts/NotificationLayer.lua (modified) two fixes for cegui 0.7 sometimes there's an exception while ... Sat, 11 Jun 2011 11:47:05 GMT landauf [8702] * code/branches/presentation/src/orxonox/worldentities/MobileEntity.h (modified) fixed radian <-> degree conversion bug Mon, 06 Jun 2011 06:15:38 GMT dafrick [8700] * code/branches/presentation/data/gui/layouts/DockingDialog.layout (modified) * code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified) * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/docking/Dock.h (modified) * code/branches/presentation/src/modules/docking/DockingTarget.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.h (modified) Adherence to styleguide. Thu, 02 Jun 2011 12:05:27 GMT scheusso [8694] * code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/TriggerBase.cc (modified) * code/branches/presentation/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentation/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/branches/presentation/src/orxonox/worldentities/CameraPosition.cc (modified) * code/branches/presentation/src/orxonox/worldentities/SpawnPoint.cc (modified) fixed a network problem with SpaceBoundaries please don't use new on ... Tue, 31 May 2011 15:34:18 GMT rgrieder [8692] * code/branches/presentation/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSRoot.h (modified) Added "getTimeFactor" console command. Mon, 30 May 2011 16:20:22 GMT rgrieder [8686] * code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified) Fixed missing include. Mon, 30 May 2011 09:14:06 GMT dafrick [8684] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) Adding some sound. Mon, 30 May 2011 08:20:27 GMT dafrick [8682] * code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) Hack-ish Hack to just have one HUD at a time. Mon, 30 May 2011 07:58:19 GMT dafrick [8681] * code/branches/presentation/src/orxonox/infos/GametypeInfo.cc (modified) gametypeInfo didn't quite work in Tetris. Mon, 30 May 2011 07:55:38 GMT dafrick [8680] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) Make the camera position stay the same between differnet stones in ... Mon, 30 May 2011 07:07:31 GMT dafrick [8679] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/levels/spaceRace.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) Finalizing presentation level. Sun, 29 May 2011 22:14:57 GMT dafrick [8675] * code/branches/presentation/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.h (modified) Fixing problems with beaconMask being NULL. Sun, 29 May 2011 21:59:17 GMT dafrick [8673] * code/branches/presentation (modified) * code/branches/presentation/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentation/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc (copied) * code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h (copied) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging hudimprovements branch into presentation branch. Sun, 29 May 2011 17:15:43 GMT landauf [8668] * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) small cleanup Sun, 29 May 2011 16:44:45 GMT dafrick [8667] * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/presentation/src/modules/objects/Script.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/branches/presentation/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified) Possible fix for segfaults due to player being NULL. Sun, 29 May 2011 15:46:39 GMT dafrick [8666] * code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc (modified) Possible fix. Doesn't really address the issoe though. Sun, 29 May 2011 15:39:19 GMT dafrick [8665] * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) Notifications should now work over the network. Thanks for the help, Oli. Sun, 29 May 2011 15:25:02 GMT dafrick [8664] * code/branches/presentation/data/levels/includes/notifications.oxi (modified) * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) Presentation level is getting ready. Sun, 29 May 2011 15:24:39 GMT dafrick [8663] * code/branches/presentation/src/libraries/core/BaseObject.cc (modified) Fixing warning. Sun, 29 May 2011 15:24:04 GMT dafrick [8662] * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) Anotehr step towards networked notifications. Sun, 29 May 2011 15:01:53 GMT landauf [8661] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) fixed two possible causes which stacked multiple tetris stones at the ... Sun, 29 May 2011 14:02:07 GMT landauf [8660] * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (modified) added fade in/out effect for space boundaries (alpha value, based on ... Sun, 29 May 2011 13:40:02 GMT dafrick [8659] * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) Adding missing include. Sun, 29 May 2011 11:40:53 GMT landauf [8658] * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) the "lift" which is applied to the spaceship when pitching is now ... Sun, 29 May 2011 11:12:28 GMT dafrick [8657] * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) Fixing singularity bug in SpaceBoundaries. Sun, 29 May 2011 09:24:31 GMT dafrick [8656] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) Adding network callbacks. Still doesn't work yet, though. Sun, 29 May 2011 08:31:15 GMT landauf [8655] * code/branches/presentation/src/libraries/core/BaseObject.cc (modified) fixed crashing assertion in case a template linked to a non-existing ... Sun, 29 May 2011 07:58:34 GMT landauf [8654] * code/branches/presentation/src/orxonox/items/Engine.cc (modified) fixed engine destructor Sat, 28 May 2011 20:11:23 GMT scheusso [8651] * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) first attempt to make notifications synchronisable not yet succeeded ... Sat, 28 May 2011 18:53:14 GMT scheusso [8648] * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/packet/Welcome.cc (modified) * code/branches/presentation/src/libraries/network/packet/Welcome.h (modified) * code/branches/presentation/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) some network related fixes Sat, 28 May 2011 18:01:37 GMT rgrieder [8647] * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) Attempt to fix incompatibility with CEGUI 0.7. Doesn't yet work! Sat, 28 May 2011 17:35:35 GMT rgrieder [8646] * code/branches/presentation/src/libraries/network/LANDiscovery.cc (modified) Moved LANDiscovery singleton to Graphics Scope to fix the "host_ == ... Sat, 28 May 2011 16:56:56 GMT landauf [8645] * code/branches/presentation/src/libraries/core/ThreadWin.cc (modified) * code/branches/presentation/src/modules/docking/CMakeLists.txt (modified) * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/docking/Dock.h (modified) * code/branches/presentation/src/modules/docking/DockToShip.cc (modified) * code/branches/presentation/src/modules/docking/DockToShip.h (modified) * code/branches/presentation/src/modules/docking/DockingAnimation.cc (modified) * code/branches/presentation/src/modules/docking/DockingAnimation.h (modified) * code/branches/presentation/src/modules/docking/DockingController.cc (modified) * code/branches/presentation/src/modules/docking/DockingController.h (modified) * code/branches/presentation/src/modules/docking/DockingEffect.cc (modified) * code/branches/presentation/src/modules/docking/DockingEffect.h (modified) * code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h (modified) * code/branches/presentation/src/modules/docking/DockingPrereqs.h (modified) * code/branches/presentation/src/modules/docking/DockingTarget.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.h (modified) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (modified) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.h (modified) * code/branches/presentation/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/presentation/src/modules/gametypes/GametypesPrecompiledHeaders.h (modified) * code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h (modified) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/presentation/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/presentation/src/modules/gametypes/SpaceRace.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (modified) * code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/presentation/src/modules/portals/CMakeLists.txt (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.h (modified) * code/branches/presentation/src/modules/portals/PortalLink.cc (modified) * code/branches/presentation/src/modules/portals/PortalLink.h (modified) * code/branches/presentation/src/modules/portals/PortalsPrecompiledHeaders.h (modified) * code/branches/presentation/src/modules/portals/PortalsPrereqs.h (modified) * code/branches/presentation/src/modules/tetris/CMakeLists.txt (modified) * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) * code/branches/presentation/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/presentation/src/modules/tetris/TetrisCenterpoint.h (modified) * code/branches/presentation/src/modules/tetris/TetrisPrereqs.h (modified) * code/branches/presentation/src/modules/tetris/TetrisStone.cc (modified) * code/branches/presentation/src/modules/tetris/TetrisStone.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/presentation/src/orxonox/interfaces/NotificationListener.cc (modified) set svn:eol-style to native, removed svn:executable property. no code ... Sat, 28 May 2011 16:45:14 GMT landauf [8643] * code/branches/presentation/data/gui/layouts/DockingDialog.layout (modified) * code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified) * code/branches/presentation/data/levels/docking.oxw (modified) * code/branches/presentation/data/levels/earth.oxw (modified) * code/branches/presentation/data/levels/includes/notifications.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/data/levels/portals.oxw (modified) * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/levels/quests.oxw (modified) * code/branches/presentation/data/levels/shieldTest.oxw (modified) * code/branches/presentation/data/levels/spaceRace.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (modified) * code/branches/presentation/data/levels/tetris.oxw (modified) * code/branches/presentation/data/particle/RingExp.particle (modified) * code/branches/presentation/data/particle/RingExp2.particle (modified) * code/branches/presentation/data/particle/RingExp3.particle (modified) * code/branches/presentation/data/particle/Shield.particle (modified) * code/branches/presentation/data/particle/weaponflare.particle (modified) * code/branches/presentation/data/particle/weaponshoot.particle (modified) set svn:eol-style to native, removed svn:executable property. no code ... Sat, 28 May 2011 16:35:18 GMT landauf [8642] * code/branches/presentation/data/levels/pirateAttack.oxw (modified) * code/branches/presentation/data/levels/pong.oxw (modified) * code/branches/presentation/data/levels/spaceRace.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipTransporterSL.oxt (modified) fixed warnings in some level files Sat, 28 May 2011 16:14:15 GMT dafrick [8640] * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) Make nice with dedicated server. Sat, 28 May 2011 15:36:50 GMT rgrieder [8639] * code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h (modified) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/presentation/src/modules/gametypes/SpaceRace.h (modified) * code/branches/presentation/src/orxonox/infos/GametypeInfo.cc (modified) Fixed MSVC build and a warning. Sat, 28 May 2011 15:10:01 GMT dafrick [8637] * code/branches/presentation (modified) * code/branches/presentation/data/gui/layouts/QuestGUI.layout (modified) * code/branches/presentation/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/presentation/data/gui/scripts/QuestGUI.lua (modified) * code/branches/presentation/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation/data/levels/FPSTest.oxw (modified) * code/branches/presentation/data/levels/asteroids.oxw (modified) * code/branches/presentation/data/levels/docking.oxw (modified) * code/branches/presentation/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation/data/levels/earth.oxw (modified) * code/branches/presentation/data/levels/emptyLevel.oxw (modified) * code/branches/presentation/data/levels/events.oxw (modified) * code/branches/presentation/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation/data/levels/includes/notifications.oxi (copied) * code/branches/presentation/data/levels/lastManStanding.oxw (modified) * code/branches/presentation/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/data/levels/notifications.oxw (modified) * code/branches/presentation/data/levels/pickups.oxw (modified) * code/branches/presentation/data/levels/pirateAttack.oxw (modified) * code/branches/presentation/data/levels/planets.oxw (modified) * code/branches/presentation/data/levels/pong.oxw (modified) * code/branches/presentation/data/levels/portals.oxw (modified) * code/branches/presentation/data/levels/presentation.oxw (modified) * code/branches/presentation/data/levels/presentation09.oxw (modified) * code/branches/presentation/data/levels/presentation09b.oxw (modified) * code/branches/presentation/data/levels/presentationDM.oxw (modified) * code/branches/presentation/data/levels/presentationFS10.oxw (modified) * code/branches/presentation/data/levels/presentationFS102.oxw (modified) * code/branches/presentation/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/levels/presentationHS09.oxw (modified) * code/branches/presentation/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation/data/levels/princessAeryn.oxw (modified) * code/branches/presentation/data/levels/quests.oxw (copied) * code/branches/presentation/data/levels/screenshot.oxw (modified) * code/branches/presentation/data/levels/shieldTest.oxw (modified) * code/branches/presentation/data/levels/sound.oxw (modified) * code/branches/presentation/data/levels/spaceRace.oxw (modified) * code/branches/presentation/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentation/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation/data/levels/testStars.oxw (modified) * code/branches/presentation/data/levels/testSwallow.oxw (modified) * code/branches/presentation/data/levels/tetris.oxw (modified) * code/branches/presentation/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation/data/levels/tutorial.oxw (modified) * code/branches/presentation/data/levels/underAttack.oxw (modified) * code/branches/presentation/data/levels/waypoints.oxw (modified) * code/branches/presentation/data/overlays/debug.oxo (modified) * code/branches/presentation/doc/api/groups/Triggers.dox (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) * code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation/src/modules/notifications/CMakeLists.txt (modified) * code/branches/presentation/src/modules/notifications/Notification.cc (deleted) * code/branches/presentation/src/modules/notifications/Notification.h (deleted) * code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationManager.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationManager.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/branches/presentation/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/branches/presentation/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/presentation/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation/src/modules/questsystem/QuestManager.h (modified) * code/branches/presentation/src/orxonox/LevelManager.cc (modified) * code/branches/presentation/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/presentation/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/presentation/src/orxonox/interfaces/NotificationListener.cc (copied) * code/branches/presentation/src/orxonox/interfaces/NotificationListener.h (modified) Merging tutoriallevel3 branch into presentation branch. Sat, 28 May 2011 14:15:12 GMT landauf [8635] * code/branches/presentation/data/particle/Shield.particle (modified) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (modified) the shield effect is now attached to the ship Fri, 27 May 2011 21:35:05 GMT dafrick [8632] * code/branches/presentation/src/modules/objects/CMakeLists.txt (modified) * code/branches/presentation/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (moved) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (moved) * code/branches/presentation/src/orxonox/worldentities/CMakeLists.txt (modified) Moving space bounaries into modules/objects Fri, 27 May 2011 21:09:00 GMT dafrick [8631] * code/branches/presentation (modified) * code/branches/presentation/data/levels/spaceRace.oxw (copied) * code/branches/presentation/src/modules/CMakeLists.txt (modified) * code/branches/presentation/src/modules/gametypes (copied) * code/branches/presentation/src/modules/gametypes/CMakeLists.txt (copied) * code/branches/presentation/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) * code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h (copied) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.cc (copied) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h (copied) * code/branches/presentation/src/modules/gametypes/SpaceRace.cc (copied) * code/branches/presentation/src/modules/gametypes/SpaceRace.h (copied) * code/branches/presentation/src/orxonox/gametypes/Gametype.cc (modified) Merging spacerace branch into presentation branch. Fri, 27 May 2011 20:54:34 GMT dafrick [8628] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.h (modified) Some changes in prsentation level. Making PortalEndPoints radar viewable. Fri, 27 May 2011 19:54:03 GMT landauf [8627] * code/branches/presentation/data/gui/scripts/SheetManager.lua (modified) * code/branches/presentation/data/levels/templates/lodInformation.oxt (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) merged revisions 8527-8530 from trunk to presentation branch: - ... Thu, 26 May 2011 16:01:34 GMT landauf [8615] * code/branches/presentation/src/libraries/core/command/Shell.cc (modified) * code/branches/presentation/src/libraries/util/Math.h (modified) turns out the mod(x,y) function was fucked up all the time. we need ... Thu, 26 May 2011 15:40:16 GMT dafrick [8614] * code/branches/presentation (modified) * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.cc (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.h (modified) * code/branches/presentation/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/presentation/src/orxonox/worldentities/SpaceBoundaries.h (modified) Merging spaceboundaries2 branch into presentation branch. Thu, 26 May 2011 15:16:39 GMT landauf [8612] * code/branches/presentation/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/presentation/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/Munition.cc (modified) fixed possible bug in LastTeamStanding Thu, 26 May 2011 15:09:03 GMT landauf [8611] * code/branches/presentation/src/libraries/core/Game.cc (modified) fixed the oldest warning in orxonox Thu, 26 May 2011 14:58:18 GMT landauf [8608] * code/branches/presentation/src/orxonox/MoodManager.cc (modified) * code/branches/presentation/src/orxonox/MoodManager.h (modified) * code/branches/presentation/src/orxonox/sound/AmbientSound.cc (modified) removed some redundant code in MoodManager Thu, 26 May 2011 14:38:07 GMT rgrieder [8607] * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Calling the destructor doesn't really take care of the memory ... Thu, 26 May 2011 14:35:46 GMT dafrick [8605] * code/branches/presentation (modified) * code/branches/presentation/data/levels/portals.oxw (modified) * code/branches/presentation/doc/api/Groups.dox (modified) * code/branches/presentation/doc/api/groups/Portals.dox (copied) * code/branches/presentation/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.h (modified) * code/branches/presentation/src/modules/portals/PortalLink.cc (modified) * code/branches/presentation/src/modules/portals/PortalLink.h (modified) Merging portals2 branch into presentation branch. Thu, 26 May 2011 14:34:54 GMT landauf [8603] * code/branches/presentation/src/libraries/core/ConfigValueContainer.h (modified) * code/branches/presentation/src/libraries/core/CoreIncludes.h (modified) * code/branches/presentation/src/libraries/core/Super.h (modified) * code/branches/presentation/src/libraries/core/command/Functor.h (modified) * code/branches/presentation/src/libraries/util/Convert.h (modified) * code/branches/presentation/src/libraries/util/MultiTypeValue.h (modified) * code/branches/presentation/src/libraries/util/ScopedSingletonManager.h (modified) * code/branches/presentation/src/libraries/util/Serialise.h (modified) removed some parameter names where the parameter is not actually used Thu, 26 May 2011 14:18:12 GMT smerkli [8601] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) presentation level now has docking thingy added Thu, 26 May 2011 12:56:54 GMT dafrick [8598] * code/branches/presentation/data/levels/templates/lodInformation.oxt (modified) Adding HydroHarvester to lodInformation, to disable LOD. Thu, 26 May 2011 12:29:03 GMT dafrick [8597] * code/branches/presentation (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging steering branch into presentation branch. Thu, 26 May 2011 12:22:22 GMT smerkli [8596] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) working on the presentation level Thu, 26 May 2011 11:57:01 GMT landauf [8594] * code/branches/presentation/src/libraries/core/Identifier.h (modified) * code/branches/presentation/src/libraries/util/Exception.h (modified) * code/branches/presentation/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) fixed a few warnings that were only visible with ... Thu, 26 May 2011 11:53:52 GMT dafrick [8593] * code/branches/presentation/data/levels/emptyLevel.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) Adjusting Assff2 to fit new engines. Thu, 26 May 2011 11:44:06 GMT dafrick [8592] * code/branches/presentation (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi (copied) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (copied) * code/branches/presentation/data/particle/weaponflare.particle (copied) * code/branches/presentation/data/particle/weaponshoot.particle (copied) Merging weapons branch into presentation branch. Wed, 25 May 2011 22:58:09 GMT dafrick [8589] * code/branches/presentation (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/presentation/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/items/Engine.h (modified) * code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging bigships branch into presentation branch. Wed, 25 May 2011 21:44:04 GMT dafrick [8587] * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) The Camera doesn't need to be a MovableEntity, which also averts ... Wed, 25 May 2011 21:07:46 GMT rgrieder [8586] * code/branches/presentation/src/modules/docking/DockingController.h (modified) * code/branches/presentation/src/modules/docking/DockingPrereqs.h (modified) * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) Fixed MSVC build (dllexport problems) and warnings. Wed, 25 May 2011 21:06:31 GMT rgrieder [8585] * code/branches/presentation/src/libraries/util/SubString.h (modified) Found two more typos in SubString! Wed, 25 May 2011 21:02:50 GMT dafrick [8584] * code/branches/presentation/data/gui/scripts/SheetManager.lua (modified) Apparently this bug was already fixed by landauf in the trunk. So ... Wed, 25 May 2011 20:52:36 GMT dafrick [8583] * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Fixing possible bug. Wed, 25 May 2011 20:10:09 GMT dafrick [8582] * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Fixing segfault, that occured when a SpaceShip was created without a ... Wed, 25 May 2011 19:42:29 GMT dafrick [8581] * code/branches/presentation/data/gui/scripts/SheetManager.lua (modified) Fixing bug in SheetManager.lua Wed, 25 May 2011 19:41:29 GMT dafrick [8580] * code/branches/presentation (modified) * code/branches/presentation/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/branches/presentation/data/levels/shieldTest.oxw (copied) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (copied) * code/branches/presentation/data/particle/Shield.particle (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging game immersion branch into presentation branch. Wed, 25 May 2011 19:28:29 GMT dafrick [8579] * code/branches/presentation/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (deleted) * code/branches/presentation/data/levels/shieldTest.oxw (deleted) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (deleted) * code/branches/presentation/data/particle/Shield.particle (deleted) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (deleted) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (deleted) * code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Reverse merge to revert last, failed, merge. Apparently you can't ... Wed, 25 May 2011 19:22:53 GMT dafrick [8578] * code/branches/presentation/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/branches/presentation/data/levels/shieldTest.oxw (copied) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (copied) * code/branches/presentation/data/particle/Shield.particle (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging game immersion branch into presentation branch. Wed, 25 May 2011 09:02:54 GMT dafrick [8570] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/particle/RingExp.particle (added) * code/branches/presentation/data/particle/RingExp2.particle (added) * code/branches/presentation/data/particle/RingExp3.particle (added) Adding ring explosion particle effect to presentation level. Tue, 24 May 2011 20:41:43 GMT dafrick [8568] * code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified) * code/branches/presentation/src/modules/docking/DockToShip.cc (modified) * code/branches/presentation/src/modules/docking/DockToShip.h (modified) * code/branches/presentation/src/modules/docking/DockingAnimation.cc (modified) * code/branches/presentation/src/modules/docking/DockingAnimation.h (modified) * code/branches/presentation/src/modules/docking/DockingController.cc (modified) * code/branches/presentation/src/modules/docking/DockingController.h (modified) * code/branches/presentation/src/modules/docking/DockingEffect.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.h (modified) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (modified) Renaming member variables to adhere to styleguide, initialize values, ... Tue, 24 May 2011 20:17:10 GMT dafrick [8567] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) Some simplification. Tue, 24 May 2011 20:12:42 GMT dafrick [8566] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) * code/branches/presentation/src/modules/tetris/TetrisStone.cc (modified) Fixing another bug. Tue, 24 May 2011 19:59:01 GMT dafrick [8565] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) Fixing bug in tetris. Tue, 24 May 2011 19:24:39 GMT dafrick [8564] * code/branches/presentation (modified) * code/branches/presentation/data/levels/tetris.oxw (copied) * code/branches/presentation/src/modules/CMakeLists.txt (modified) * code/branches/presentation/src/modules/pong/PongBat.h (modified) * code/branches/presentation/src/modules/tetris (copied) * code/branches/presentation/src/modules/tetris/CMakeLists.txt (copied) * code/branches/presentation/src/modules/tetris/Tetris.cc (copied) * code/branches/presentation/src/modules/tetris/Tetris.h (copied) * code/branches/presentation/src/modules/tetris/TetrisCenterpoint.cc (copied) * code/branches/presentation/src/modules/tetris/TetrisCenterpoint.h (copied) * code/branches/presentation/src/modules/tetris/TetrisPrereqs.h (copied) * code/branches/presentation/src/modules/tetris/TetrisStone.cc (copied) * code/branches/presentation/src/modules/tetris/TetrisStone.h (copied) Merging tetris branch into presentation branch. Tue, 24 May 2011 14:44:39 GMT dafrick [8561] * code/branches/presentation (modified) * code/branches/presentation/data/gui/layouts/DockingDialog.layout (copied) * code/branches/presentation/data/gui/scripts/DockingDialog.lua (copied) * code/branches/presentation/data/levels/docking.oxw (copied) * code/branches/presentation/src/modules/CMakeLists.txt (modified) * code/branches/presentation/src/modules/docking (copied) * code/branches/presentation/src/modules/docking/CMakeLists.txt (copied) * code/branches/presentation/src/modules/docking/Dock.cc (copied) * code/branches/presentation/src/modules/docking/Dock.h (copied) * code/branches/presentation/src/modules/docking/DockToShip.cc (copied) * code/branches/presentation/src/modules/docking/DockToShip.h (copied) * code/branches/presentation/src/modules/docking/DockingAnimation.cc (copied) * code/branches/presentation/src/modules/docking/DockingAnimation.h (copied) * code/branches/presentation/src/modules/docking/DockingController.cc (copied) * code/branches/presentation/src/modules/docking/DockingController.h (copied) * code/branches/presentation/src/modules/docking/DockingEffect.cc (copied) * code/branches/presentation/src/modules/docking/DockingEffect.h (copied) * code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/branches/presentation/src/modules/docking/DockingPrereqs.h (copied) * code/branches/presentation/src/modules/docking/DockingTarget.cc (copied) * code/branches/presentation/src/modules/docking/DockingTarget.h (copied) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (copied) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.h (copied) * code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/presentation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation/src/orxonox/infos/PlayerInfo.h (modified) Merging dockingsystem2 branch to presentation branch. Mon, 23 May 2011 21:40:58 GMT dafrick [8556] * code/branches/presentation (modified) * code/branches/presentation/data/levels/includes/pickups.oxi (modified) * code/branches/presentation/data/levels/pickups.oxw (modified) * code/branches/presentation/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation/src/libraries/util/SubString.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/presentation/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc (copied) * code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h (copied) * code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/worldentities/WorldEntity.cc (modified) Merging pickup branch into presentation branch. Mon, 23 May 2011 14:14:57 GMT youngk [8546] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) Minor changes to the realism of planets in the presentation level. Thu, 19 May 2011 14:13:10 GMT smerkli [8512] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) changed presentation level a little Wed, 18 May 2011 08:57:00 GMT dafrick [8499] * code/branches/presentation (copied) Creating new presentation branch. Wed, 18 May 2011 08:55:36 GMT dafrick [8498] * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) Removing some tags because the cause warnings for now, might be re- ...