# # ChangeLog for code/branches/presentation/data/levels # # Generated by Trac 1.0.9 # Nov 2, 2024, 6:17: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 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. 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 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 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 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 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. 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 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. 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 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 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: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: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 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 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- ...