# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Jun 8, 2024, 7:55:41 PM Wed, 20 Apr 2011 02:16:31 GMT rgrieder [8274] * code/branches/kicklib/data/CMakeLists.txt (modified) * code/branches/kicklib/data/DataInstallScript.cmake (deleted) * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) Do not merge resources.oxr files to avoid problems at intall time. Wed, 20 Apr 2011 02:01:12 GMT rgrieder [8273] * code/branches/kicklib/cmake/PackageConfig.cmake (modified) Added optional use of install_manifest.txt file (white space ... Tue, 19 Apr 2011 22:29:08 GMT rgrieder [8272] * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) Load Ogre plugins and Orxonox modules with the same path composition. ... Tue, 19 Apr 2011 22:10:36 GMT rgrieder [8271] * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.h (modified) Fixed PATH fiddling for module/plugin loading. Tue, 19 Apr 2011 21:20:46 GMT rgrieder [8270] * code/branches/kicklib/cmake/tools/TargetUtilities.cmake (modified) Add RPATH for installed libraries too Tue, 19 Apr 2011 21:20:15 GMT rgrieder [8269] * code/branches/kicklib/contrib/CMakeLists.txt (modified) Honour install prefix Tue, 19 Apr 2011 18:52:53 GMT rgrieder [8268] * code/branches/kicklib/src/libraries/core/CorePrereqs.h (modified) Fixed kicklib build. Mon, 18 Apr 2011 21:51:05 GMT youngk [8262] * code/branches/mac_osx/data/levels/planets.oxw (modified) Changing planets level Mon, 18 Apr 2011 19:33:05 GMT youngk [8260] * code/branches/mac_osx/data/mac/Orxonox-Info.plist (modified) * code/branches/mac_osx/src/CMakeLists.txt (modified) * code/branches/mac_osx/src/Orxonox.cc (modified) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporter.m (modified) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterWindow.nib (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterWindow.nib/designable.nib (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterWindow.nib/keyedobjects.nib (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMakeLists.txt (modified) Made the crash reporter work. More or less... Mon, 18 Apr 2011 17:14:18 GMT youngk [8259] * code/branches/mac_osx/cmake/PrepareDevBundle.cmake (modified) * code/branches/mac_osx/cmake/tools/TargetUtilities.cmake (modified) * code/branches/mac_osx/src/CMakeLists.txt (modified) * code/branches/mac_osx/src/OrxonoxMac.mm (modified) * code/branches/mac_osx/src/external/CMakeLists.txt (modified) * code/branches/mac_osx/src/external/cmcrashreporter (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporter.h (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporter.m (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporter.tmproj (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterGlobal.h (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterGlobal.m (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterWindow.h (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterWindow.m (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMCrashReporterWindow.xib (added) * code/branches/mac_osx/src/external/cmcrashreporter/CMakeLists.txt (added) * code/branches/mac_osx/src/external/cmcrashreporter/read-me.txt (added) Integrating automatic crash reporter. Does not work atm. Mon, 18 Apr 2011 14:35:01 GMT sven [8257] * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockToShip.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc (added) * code/branches/dockingsystem2/src/modules/docking/DockingTarget.h (added) First working dock example.. Mon, 18 Apr 2011 14:08:46 GMT ssgier [8255] * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup/src/modules/pickup/items/CMakeLists.txt (modified) No Comment Mon, 18 Apr 2011 14:04:40 GMT dboehi [8254] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Added possibibility to change the frequency of the shaking camera in ... Mon, 18 Apr 2011 12:18:01 GMT msalomon [8251] * code/branches/spacerace/src/modules/gametypes/CMakeLists.txt (modified) First version of the check points. Mon, 18 Apr 2011 12:14:17 GMT msalomon [8250] * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.h (modified) Last changes to the SpaceRace game type. Mon, 18 Apr 2011 10:50:01 GMT dafrick [8249] * code/branches/tetris/src/modules/tetris (added) * code/branches/tetris/src/modules/tetris/CMakeLists.txt (added) * code/branches/tetris/src/modules/tetris/Tetris.cc (added) * code/branches/tetris/src/modules/tetris/Tetris.h (added) * code/branches/tetris/src/modules/tetris/TetrisCenterpoint.cc (added) * code/branches/tetris/src/modules/tetris/TetrisCenterpoint.h (added) * code/branches/tetris/src/modules/tetris/TetrisPrereqs.h (added) * code/branches/tetris/src/modules/tetris/TetrisStone.cc (added) * code/branches/tetris/src/modules/tetris/TetrisStone.h (added) Re-adding tetris module. Mon, 18 Apr 2011 10:42:53 GMT dafrick [8248] * code/branches/tetris/src/modules/tetris (deleted) Something went wrong with the tetris module... ;) Mon, 18 Apr 2011 10:39:06 GMT dafrick [8247] * code/branches/tetris/src/modules/tetris (copied) * code/branches/tetris/src/modules/pong/Pong.cc (deleted) * code/branches/tetris/src/modules/pong/Pong.h (deleted) * code/branches/tetris/src/modules/pong/PongAI.h (deleted) * code/branches/tetris/src/modules/pong/PongBat.cc (deleted) * code/branches/tetris/src/modules/pong/PongBat.h (deleted) * code/branches/tetris/src/modules/pong/PongBot.cc (deleted) * code/branches/tetris/src/modules/pong/PongBot.h (deleted) * code/branches/tetris/src/modules/pong/PongCenterpoint.cc (deleted) * code/branches/tetris/src/modules/pong/PongCenterpoint.h (deleted) * code/branches/tetris/src/modules/pong/PongPrereqs.h (deleted) * code/branches/tetris/src/modules/pong/PongScore.cc (deleted) * code/branches/tetris/src/modules/pong/PongScore.h (deleted) Removing some all Pong files. Mon, 18 Apr 2011 10:34:22 GMT dafrick [8246] * code/branches/tetris/data/levels/tetris.oxw (added) * code/branches/tetris/src/modules/CMakeLists.txt (modified) * code/branches/tetris/src/modules/pong/PongBat.h (modified) * code/branches/tetris/src/modules/tetris (copied) * code/branches/tetris/src/modules/tetris/CMakeLists.txt (modified) * code/branches/tetris/src/modules/pong/PongBall.cc (deleted) * code/branches/tetris/src/modules/pong/PongBall.h (deleted) * code/branches/tetris/src/modules/tetris/Tetris.cc (added) * code/branches/tetris/src/modules/tetris/Tetris.h (added) * code/branches/tetris/src/modules/tetris/TetrisCenterpoint.cc (added) * code/branches/tetris/src/modules/tetris/TetrisCenterpoint.h (added) * code/branches/tetris/src/modules/tetris/TetrisPrereqs.h (added) * code/branches/tetris/src/modules/tetris/TetrisStone.cc (added) * code/branches/tetris/src/modules/tetris/TetrisStone.h (added) A place to start for tetris. Thu, 14 Apr 2011 14:53:27 GMT kmaurus [8244] * code/branches/spaceboundaries/data/levels/myTestLevel.oxw (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) Pawns that want to leave the area are reflected, one billboard is ... Thu, 14 Apr 2011 14:33:33 GMT anbueche [8243] * code/branches/portals/data/levels/portals.oxw (modified) * code/branches/portals/src/modules/objects/triggers/MultiTrigger.h (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) * code/branches/portals/src/modules/portals/PortalLink.cc (modified) * code/branches/portals/src/modules/portals/PortalLink.h (modified) portals work pretty good Thu, 14 Apr 2011 13:45:24 GMT smerkli [8242] * code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) Implemented a list servers command for the masterserver, more ... Thu, 14 Apr 2011 13:43:41 GMT smerkli [8241] * code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) * code/branches/masterserver2/src/libraries/network/MasterServer.h (modified) Generic witty commit comment Thu, 14 Apr 2011 12:33:59 GMT smerkli [8240] * code/branches/masterserver2/data/levels/templates/spaceshipAssff.oxt (modified) fixed acceleration and boost back to normal Tue, 12 Apr 2011 19:51:52 GMT jo [8239] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) I forgot to remove that line. Tue, 12 Apr 2011 19:41:33 GMT jo [8238] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/DroneController.cc (modified) * code/branches/ai/src/orxonox/controllers/DroneController.h (modified) Drone (almost) doesn't shoot at it's owner anymore. Tue, 12 Apr 2011 17:54:36 GMT kmaurus [8237] * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) some comments added Tue, 12 Apr 2011 15:39:49 GMT dafrick [8236] * code/branches/environment (copied) Creating new environment branch. Tue, 12 Apr 2011 15:39:15 GMT dafrick [8235] * code/branches/environment (deleted) Deleting environment branch to create a new one with up-to-date ... Tue, 12 Apr 2011 13:18:55 GMT rgrieder [8233] * code/branches/kicklib/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib/src/OrxonoxConfig.cmake (modified) Removed config files from individual targets for MSVC because search ... Mon, 11 Apr 2011 04:39:04 GMT rgrieder [8231] * code/branches/kicklib/src/SpecialConfig.h.in (modified) * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/GraphicsManager.h (modified) Attempt to fix Ogre plugins for Orxonox installations on Windows. Mon, 11 Apr 2011 01:37:14 GMT rgrieder [8230] * code/branches/kicklib/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) Zlib should now work again with MSVC < 10. Sun, 10 Apr 2011 19:03:59 GMT rgrieder [8225] * code/branches/kicklib/src/OrxonoxConfig.h.in (modified) * code/branches/kicklib/src/libraries/core/CorePrereqs.h (modified) * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib/src/libraries/core/Resource.cc (modified) * code/branches/kicklib/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) Resolved problems with different Boost filesystem versions. Sun, 10 Apr 2011 19:02:15 GMT rgrieder [8224] * code/branches/kicklib/cmake/LibraryConfig.cmake (modified) Removed support for Boost versions less than 1.40. Sun, 10 Apr 2011 09:09:36 GMT dafrick [8223] * code/branches/steering/src/orxonox/controllers/HumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/HumanController.h (modified) * code/branches/steering/src/orxonox/items/Engine.cc (modified) * code/branches/steering/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/steering/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Streamlining boost. Sun, 10 Apr 2011 03:29:18 GMT rgrieder [8222] * code/branches/kicklib/bin/client1.bat.in (modified) * code/branches/kicklib/bin/client2.bat.in (modified) * code/branches/kicklib/bin/dedicated.bat.in (modified) * code/branches/kicklib/bin/dedicatedClient.bat.in (modified) * code/branches/kicklib/bin/masterserver.bat.in (modified) * code/branches/kicklib/bin/run.bat.in (modified) * code/branches/kicklib/bin/server.bat.in (modified) * code/branches/kicklib/bin/standalone.bat.in (modified) Fixed run scripts for Windows. Sun, 10 Apr 2011 01:28:27 GMT rgrieder [8221] * code/branches/kicklib/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib/cmake/tools/FindOgg.cmake (modified) * code/branches/kicklib/cmake/tools/FindVorbis.cmake (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) Changes that allow the Visual Studio 2010 dependencies to be used. Sat, 09 Apr 2011 19:09:11 GMT dafrick [8219] * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h (modified) Minor changes in documentation. Sat, 09 Apr 2011 17:18:45 GMT rgrieder [8218] * code/branches/kicklib/cmake/PrepareDevBundle.cmake (modified) Fixed indentation issues in PrepareDevBundle.cmake by removing the IF ... Sat, 09 Apr 2011 17:11:52 GMT rgrieder [8217] * code/branches/kicklib/bin/mac (deleted) Merged revision 8135 to from mac_osx to kicklib branch. (part 2) ... Sat, 09 Apr 2011 17:08:25 GMT rgrieder [8216] * code/branches/kicklib (modified) * code/branches/kicklib/bin/mac/OrxonoxMac (deleted) * code/branches/kicklib/cmake/PrepareDevBundle.cmake (modified) * code/branches/kicklib/data/mac/Icon.icns (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) Merged revision 8135 to from mac_osx to kicklib branch. (part 1) Sat, 09 Apr 2011 16:48:15 GMT dafrick [8214] * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController_jonas.cc (deleted) Undoing last change. Thu, 07 Apr 2011 20:19:16 GMT dafrick [8206] * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/data/levels/fightInOurBack.oxw (modified) * code/branches/dockingsystem2/data/levels/pirateAttack.oxw (modified) * code/branches/dockingsystem2/data/levels/theTimeMachine.oxw (modified) * code/branches/dockingsystem2/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/dockingsystem2/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/dockingsystem2/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/dockingsystem2/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/dockingsystem2/src/modules/objects/triggers/MultiTrigger.cc (modified) Extending DistanceTrigger (both the normal and the MultiTrigger ... Thu, 07 Apr 2011 19:00:56 GMT dafrick [8205] * code/branches/dockingsystem (deleted) Removing old dockingsystem branch. Thu, 07 Apr 2011 14:37:29 GMT smerkli [8204] * code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) * code/branches/masterserver2/src/libraries/network/MasterServer.h (modified) Thu, 07 Apr 2011 14:31:37 GMT smerkli [8203] * code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) * code/branches/masterserver2/src/libraries/network/ServerList.cc (modified) yay, works Thu, 07 Apr 2011 14:18:08 GMT smerkli [8202] * code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) * code/branches/masterserver2/src/libraries/network/ServerList.cc (modified) * code/branches/masterserver2/src/libraries/network/ServerList.h (modified) done for today Thu, 07 Apr 2011 14:11:20 GMT kmaurus [8201] * code/branches/spaceboundaries/data/levels/myTestLevel.oxw (added) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) healthDecreasing added, position of SpaceBoundaries added to the radar Thu, 07 Apr 2011 10:55:24 GMT FelixSchulthess [8200] * code/branches/portals/data/levels/portals.oxw (modified) * code/branches/portals/src/modules/CMakeLists.txt (modified) * code/branches/portals/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/portals/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/portals/src/modules/portals/CMakeLists.txt (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) * code/branches/portals/src/modules/portals/PortalLink.cc (modified) * code/branches/portals/src/modules/portals/PortalLink.h (modified) * code/branches/portals/src/modules/portals/PortalsPrecompiledHeaders.h (moved) * code/branches/portals/src/modules/portals/PortalsPrereqs.h (moved) blah Thu, 07 Apr 2011 10:13:19 GMT FelixSchulthess [8199] * code/branches/portals/src/modules/portals (added) * code/branches/portals/src/modules/portals/CMakeLists.txt (added) * code/branches/portals/src/modules/portals/PortalEndPoint.cc (moved) * code/branches/portals/src/modules/portals/PortalEndPoint.h (moved) * code/branches/portals/src/modules/portals/PortalLink.cc (moved) * code/branches/portals/src/modules/portals/PortalLink.h (moved) * code/branches/portals/src/modules/portals/PortalPrecompiledHeaders.h (added) * code/branches/portals/src/modules/portals/PortalPrereqs.h (added) * code/branches/portals/src/orxonox/worldentities/CMakeLists.txt (modified) moved portals to modules Wed, 06 Apr 2011 21:06:45 GMT anbueche [8198] * code/branches/portals/src/orxonox/worldentities/PortalEndPoint.cc (modified) * code/branches/portals/src/orxonox/worldentities/PortalEndPoint.h (modified) * code/branches/portals/src/orxonox/worldentities/PortalLink.cc (modified) * code/branches/portals/src/orxonox/worldentities/PortalLink.h (modified) First steps to use of Triggers and Events Wed, 06 Apr 2011 14:54:07 GMT dafrick [8197] * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h (modified) Replacing getNick() with getName(). nick_ in HumanPlayer is only ... Wed, 06 Apr 2011 14:39:29 GMT dafrick [8196] * code/branches/dockingsystem2 (modified) * code/branches/dockingsystem2/data/levels/docking.oxw (copied) * code/branches/dockingsystem2/src/modules/CMakeLists.txt (modified) * code/branches/dockingsystem2/src/modules/docking (copied) * code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (copied) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (copied) * code/branches/dockingsystem2/src/modules/docking/Dock.h (copied) * code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (copied) * code/branches/dockingsystem2/src/modules/docking/DockToShip.h (copied) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (copied) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (copied) * code/branches/dockingsystem2/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (copied) * code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h (modified) * code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified) Merging old dockingsystem branch into new one. Do svn switch ... Wed, 06 Apr 2011 14:26:26 GMT dafrick [8195] * code/branches/dockingsystem2 (copied) New dockingsystem branch, to avoid problems when merging it into trunk. Wed, 06 Apr 2011 10:07:29 GMT dafrick [8194] * code/branches/dockingsystem (modified) * code/branches/dockingsystem/data/levels/lastManStanding.oxw (modified) * code/branches/dockingsystem/data/levels/lastTeamStanding.oxw (copied) * code/branches/dockingsystem/data/levels/lastTeamStandingII.oxw (copied) * code/branches/dockingsystem/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/dockingsystem/data/overlays/lastTeamStandingHUD.oxo (copied) * code/branches/dockingsystem/doc/api/Groups.dox (modified) * code/branches/dockingsystem/doc/api/groups (copied) * code/branches/dockingsystem/doc/api/groups/Notifications.dox (copied) * code/branches/dockingsystem/doc/api/groups/Pickup.dox (copied) * code/branches/dockingsystem/doc/api/groups/Questsystem.dox (copied) * code/branches/dockingsystem/doc/api/groups/Triggers.dox (copied) * code/branches/dockingsystem/src/libraries/core/Loader.cc (modified) * code/branches/dockingsystem/src/libraries/network/Host.cc (modified) * code/branches/dockingsystem/src/libraries/network/MasterServerComm.h (modified) * code/branches/dockingsystem/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/dockingsystem/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/dockingsystem/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/dockingsystem/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/dockingsystem/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/branches/dockingsystem/src/modules/overlays/hud/GametypeStatus.h (modified) * code/branches/dockingsystem/src/modules/overlays/hud/LastTeamStandingInfos.cc (copied) * code/branches/dockingsystem/src/modules/overlays/hud/LastTeamStandingInfos.h (copied) * code/branches/dockingsystem/src/modules/pickup/Pickup.h (modified) * code/branches/dockingsystem/src/modules/pong/Pong.cc (modified) * code/branches/dockingsystem/src/modules/pong/Pong.h (modified) * code/branches/dockingsystem/src/modules/pong/PongAI.cc (modified) * code/branches/dockingsystem/src/modules/pong/PongAI.h (modified) * code/branches/dockingsystem/src/modules/pong/PongBall.cc (modified) * code/branches/dockingsystem/src/modules/pong/PongBall.h (modified) * code/branches/dockingsystem/src/modules/pong/PongBat.cc (modified) * code/branches/dockingsystem/src/modules/pong/PongBat.h (modified) * code/branches/dockingsystem/src/modules/pong/PongBot.cc (modified) * code/branches/dockingsystem/src/modules/pong/PongBot.h (modified) * code/branches/dockingsystem/src/modules/pong/PongCenterpoint.cc (modified) * code/branches/dockingsystem/src/modules/pong/PongCenterpoint.h (modified) * code/branches/dockingsystem/src/modules/pong/PongScore.cc (modified) * code/branches/dockingsystem/src/modules/pong/PongScore.h (modified) * code/branches/dockingsystem/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/dockingsystem/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/dockingsystem/src/orxonox/gametypes/Gametype.h (modified) * code/branches/dockingsystem/src/orxonox/gametypes/LastTeamStanding.cc (copied) * code/branches/dockingsystem/src/orxonox/gametypes/LastTeamStanding.h (copied) Merging trunk into dockingsystem branch to be able to use the recent ... Mon, 04 Apr 2011 14:53:58 GMT sven [8192] * code/branches/dockingsystem/data/levels/docking.oxw (modified) * code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) Mon, 04 Apr 2011 14:19:57 GMT dboehi [8191] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Update version of the boost effect, the camera is rotating up and ... Mon, 04 Apr 2011 14:07:54 GMT jonas [8190] * code/branches/weapons/data/levels/emptyLevel.oxw (modified) model texturiert und ingame eingefuegt Mon, 04 Apr 2011 13:50:29 GMT sven [8189] * code/branches/dockingsystem/src/orxonox/infos/HumanPlayer.h (modified) Added getter for nick_ in HumanPlayer Mon, 04 Apr 2011 13:48:17 GMT sven [8188] * code/branches/dockingsystem/data/levels/docking.oxw (modified) * code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) More verbose error handling in Dock Mon, 04 Apr 2011 13:45:09 GMT simonmie [8187] * code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) Added initialShieldHealth and minor changes Mon, 04 Apr 2011 13:21:48 GMT sven [8186] * code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) DockToShip and some fixes Mon, 04 Apr 2011 13:12:49 GMT sven [8185] * code/branches/dockingsystem/data/levels/docking.oxw (modified) * code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem/src/modules/docking/Dock.h (modified) * code/branches/dockingsystem/src/modules/docking/DockToShip.cc (modified) * code/branches/dockingsystem/src/modules/docking/DockToShip.h (modified) * code/branches/dockingsystem/src/modules/docking/DockingEffect.cc (modified) * code/branches/dockingsystem/src/modules/docking/DockingEffect.h (modified) * code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h (modified) * code/branches/dockingsystem/src/orxonox/infos/PlayerInfo.cc (modified) DockToShip and some fixes Mon, 04 Apr 2011 12:53:53 GMT simonmie [8184] * code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) Added maxShieldHealth Mon, 04 Apr 2011 12:14:25 GMT simonmie [8183] * code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) Added countdown time before shield reload starts Mon, 04 Apr 2011 11:37:50 GMT dafrick [8182] * code/branches/spacerace/src/modules/CMakeLists.txt (modified) * code/branches/spacerace/src/modules/gametypes (added) * code/branches/spacerace/src/modules/gametypes/CMakeLists.txt (added) * code/branches/spacerace/src/modules/gametypes/GametypesPrecompiledHeaders.h (added) * code/branches/spacerace/src/modules/gametypes/GametypesPrereqs.h (added) * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (added) * code/branches/spacerace/src/modules/gametypes/SpaceRace.h (added) Readding spacerace files. Mon, 04 Apr 2011 11:35:59 GMT dafrick [8181] * code/branches/spacerace (copied) New space race branch. Mon, 04 Apr 2011 11:35:04 GMT dafrick [8180] * code/branches/spacerace (deleted) Deleiting branch, something is not working. Sun, 03 Apr 2011 16:51:03 GMT anbueche [8177] * code/branches/portals/data/levels/portals.oxw (added) * code/branches/portals/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/portals/src/orxonox/worldentities/PortalEndPoint.cc (added) * code/branches/portals/src/orxonox/worldentities/PortalEndPoint.h (added) * code/branches/portals/src/orxonox/worldentities/PortalLink.cc (added) * code/branches/portals/src/orxonox/worldentities/PortalLink.h (added) added PortalEndPoint and PortalLink, billboard for endpoint implemented Sun, 03 Apr 2011 16:44:48 GMT rgrieder [8176] * code/branches/kicklib/src/external/ois/CMakeLists.txt (modified) Build fix for msvc 8. Sun, 03 Apr 2011 16:05:20 GMT jo [8175] * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (modified) test. Sun, 03 Apr 2011 15:56:01 GMT jo [8174] * code/branches/lastmanstanding3/data/levels/lastTeamStandingII.oxw (modified) different colouring to show streams. Sun, 03 Apr 2011 11:06:14 GMT jo [8173] * code/branches/lastmanstanding3/data/levels/TEAMstanding.oxw (deleted) removed level file that was pnly supposed for the level creation part Sun, 03 Apr 2011 11:04:29 GMT jo [8172] * code/branches/lastmanstanding3/data/levels/lastTeamStandingII.oxw (added) Level for gametype lastTeamStanding. Sun, 03 Apr 2011 11:03:40 GMT jo [8171] * code/branches/lastmanstanding3/data/levels/TEAMstanding.oxw (modified) Level enhancement. Several forcefields + proper spawnpoints added. Sun, 03 Apr 2011 11:01:28 GMT jo [8170] * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.h (modified) Removed lock that triggered a bug. (the game didn't end) Implemented ... Sat, 02 Apr 2011 09:33:42 GMT landauf [8167] * code/branches/spaceboundaries/src/orxonox/infos/GametypeInfo.cc (modified) reverted license Fri, 01 Apr 2011 19:33:37 GMT kmaurus [8166] * code/branches/spaceboundaries/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) updated to style guide: underlines at the end of member variables added Thu, 31 Mar 2011 22:25:28 GMT jo [8165] * code/branches/lastmanstanding3/data/levels/TEAMstanding.oxw (modified) Collisionshapes added. Beginning to experiment with forcefields. ... Thu, 31 Mar 2011 14:12:02 GMT kmaurus [8164] * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) Es wird nun erkannt, wenn das Spaceship sich zu weit entfernt. ... Thu, 31 Mar 2011 13:35:59 GMT smerkli [8163] * code/branches/masterserver2/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/masterserver2/data/levels/tutorial.oxw (modified) * code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) * code/branches/masterserver2/src/libraries/network/MasterServer.h (modified) Started thinking about server list cleanups Tue, 29 Mar 2011 19:33:53 GMT jo [8155] * code/branches/lastmanstanding3/data/levels/TEAMstanding.oxw (added) Working on a new level for lastTeamStanding gametype. Basic concept ... Mon, 28 Mar 2011 14:57:25 GMT dafrick [8154] * code/branches/spacerace/src/modules/CMakeLists.txt (modified) * code/branches/spacerace/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/spacerace/src/orxonox/gametypes/SpaceRace.cc (deleted) * code/branches/spacerace/src/orxonox/gametypes/SpaceRace.h (deleted) Moving SpaceRace into modules. Mon, 28 Mar 2011 14:45:56 GMT sven [8153] * code/branches/dockingsystem/src/modules/docking/DockingEffect.cc (modified) TODO added, final commit today Mon, 28 Mar 2011 14:43:18 GMT simonmie [8152] * code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) added nice particleEffect if shield is hit Mon, 28 Mar 2011 14:39:32 GMT sven [8151] * code/branches/dockingsystem/data/levels/docking.oxw (modified) * code/branches/dockingsystem/src/modules/docking/CMakeLists.txt (modified) * code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem/src/modules/docking/Dock.h (modified) * code/branches/dockingsystem/src/modules/docking/DockToShip.cc (added) * code/branches/dockingsystem/src/modules/docking/DockToShip.h (added) * code/branches/dockingsystem/src/modules/docking/DockingEffect.cc (added) * code/branches/dockingsystem/src/modules/docking/DockingEffect.h (added) * code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h (modified) XML support for different DockingEffects added, DockingEffect base ... Mon, 28 Mar 2011 14:27:06 GMT msalomon [8150] * code/branches/spacerace/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/spacerace/src/orxonox/gametypes/SpaceRace.cc (added) * code/branches/spacerace/src/orxonox/gametypes/SpaceRace.h (added) Started working on space race. Mon, 28 Mar 2011 14:15:38 GMT dafrick [8148] * code/branches/environment (copied) New environment branch with newest mac_osx changes. Mon, 28 Mar 2011 14:14:53 GMT dafrick [8147] * code/branches/environment (deleted) Deleting environment branch. Mon, 28 Mar 2011 13:57:44 GMT simonmie [8146] * code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw (added) Added test-level for auto-reloading shield Mon, 28 Mar 2011 13:55:04 GMT simonmie [8145] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) First try of self-reloading shield Mon, 28 Mar 2011 13:31:45 GMT dafrick [8144] * code/branches/pickup (copied) Brnach to work on new pickups. Mon, 28 Mar 2011 13:29:15 GMT dafrick [8143] * code/branches/spacerace (copied) New branch to work on space race gametype. Mon, 28 Mar 2011 13:26:34 GMT dafrick [8142] * code/branches/weapons (copied) New branch to work on weapons. Mon, 28 Mar 2011 13:25:56 GMT dafrick [8141] * code/branches/particleeffects (copied) New branch to work on particle effects. Mon, 28 Mar 2011 13:24:12 GMT sven [8140] * code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem/src/modules/docking/Dock.h (modified) * code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h (modified) fixed includes Mon, 28 Mar 2011 13:19:26 GMT dafrick [8139] * code/branches/steering (copied) New branch to work on steering and spaceship behavior improvements. Mon, 28 Mar 2011 13:13:04 GMT dboehi [8138] * code/branches/gameimmersion/src/orxonox/graphics/Camera.cc (modified) * code/branches/gameimmersion/src/orxonox/graphics/Camera.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h (modified) First version of the camera shake effect for the afterburner Mon, 28 Mar 2011 12:57:31 GMT sven [8137] * code/branches/dockingsystem/data/levels/docking.oxw (added) * code/branches/dockingsystem/src/modules/CMakeLists.txt (modified) * code/branches/dockingsystem/src/modules/docking (added) * code/branches/dockingsystem/src/modules/docking/CMakeLists.txt (added) * code/branches/dockingsystem/src/modules/docking/Dock.cc (added) * code/branches/dockingsystem/src/modules/docking/Dock.h (added) * code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h (added) * code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h (added) M src/modules/CMakeLists.txt A src/modules/docking A ... Mon, 28 Mar 2011 11:24:12 GMT dafrick [8136] * code/branches/bigships (copied) New branch for big ships.