# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 7:19:39 PM 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 15:10:26 GMT rgrieder [8234] * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) Removed 6 MSVC warnings about conversions. 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 17:37:00 GMT dafrick [8232] * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.h (modified) Extending and reorganizing ScreenshotManager and SkyboxGenerator. ... 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 21:50:02 GMT dafrick [8229] * code/trunk/contrib/orxonox.desktop (modified) * code/trunk/contrib/orxonox.manpage.xml (modified) * code/trunk/contrib/orxonox.png (added) * code/trunk/contrib/orxonox.svg (deleted) Replacing old icon with new one, adjsuting .desktop file and adding ... Sun, 10 Apr 2011 21:43:06 GMT dafrick [8228] * data/trunk/images/GLX_icon.png (modified) Replacing GLX_icon in data. Sun, 10 Apr 2011 21:42:19 GMT dafrick [8227] * data/pool/images/GLX_icon.png (modified) Replacing GLX_icon in pool. Sun, 10 Apr 2011 21:41:49 GMT dafrick [8226] * data/pool/tools/AUTHORS (modified) * data/pool/tools/icon (added) * data/pool/tools/icon/icon.xcf (added) * data/pool/tools/icon/icon128.png (added) * data/pool/tools/icon/icon16.png (added) * data/pool/tools/icon/icon192.png (added) * data/pool/tools/icon/icon22.png (added) * data/pool/tools/icon/icon24.png (added) * data/pool/tools/icon/icon256.png (added) * data/pool/tools/icon/icon32.png (added) * data/pool/tools/icon/icon36.png (added) * data/pool/tools/icon/icon48.png (added) * data/pool/tools/icon/icon64.png (added) * data/pool/tools/icon/icon72.png (added) * data/pool/tools/icon/icon96.png (added) * data/pool/tools/icon/icon_reduced1.xcf (added) * data/pool/tools/icon/icon_reduced2.xcf (added) * data/pool/tools/icon/icon_reduced3.xcf (added) * data/pool/tools/icon/icon_reduced4.xcf (added) Adding icon to pool. 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:24:36 GMT dafrick [8220] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) Adding some default keybindings. 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 17:07:17 GMT dafrick [8215] * code/trunk/src/libraries/core/Game.cc (modified) Bugfix, so that orxonox will start in modes that don't show any ... Sat, 09 Apr 2011 16:48:15 GMT dafrick [8214] * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController_jonas.cc (deleted) Undoing last change. Sat, 09 Apr 2011 13:33:06 GMT dafrick [8213] * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) Adding changes made to DistanceTrigger also in trunk. Also ... Fri, 08 Apr 2011 21:51:22 GMT jo [8212] * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) Set lives value to 4 in last team standing gametype. 1 live is only ... Fri, 08 Apr 2011 05:52:54 GMT dafrick [8211] * data/pool/images/effects/AUTHORS (modified) * data/pool/images/effects/pickup (added) * data/pool/images/effects/pickup/3arrowsup.png (moved) * data/pool/images/effects/pickup/TODO (added) * data/pool/images/effects/pickup/arrow.png (moved) * data/pool/images/effects/pickup/arrow.xcf (added) * data/pool/images/effects/pickup/asterix.png (moved) * data/pool/images/effects/pickup/asterix.xcf (added) * data/pool/images/effects/pickup/cross.png (moved) * data/pool/images/effects/pickup/cross.xcf (added) * data/pool/images/effects/pickup/eye.png (moved) * data/pool/images/effects/pickup/info.xml (added) * data/pool/images/effects/pickup/shield.png (moved) * data/pool/images/effects/planets (added) * data/pool/images/effects/planets/blueplanet.png (added) * data/pool/images/effects/planets/blueplanet.xcf (added) * data/pool/images/effects/planets/blueplanetTexture.xcf (added) * data/pool/images/effects/planets/brownplanet.png (added) * data/pool/images/effects/planets/brownplanet.xcf (added) * data/pool/images/effects/planets/greenplanet.png (added) * data/pool/images/effects/planets/greenplanet.xcf (added) * data/pool/images/effects/planets/greenplanetTexture.xcf (added) * data/pool/images/effects/planets/greyplanet.png (added) * data/pool/images/effects/planets/greyplanet.xcf (added) * data/pool/images/effects/planets/greyplanetTexture.xcf (added) * data/pool/images/effects/planets/info.xml (added) * data/pool/images/effects/planets/redplanet.png (added) * data/pool/images/effects/planets/redplanet.xcf (added) * data/pool/images/effects/planets/redplanetTexture.xcf (added) * data/pool/images/effects/planets/rings.xcf (added) * data/pool/images/effects/planets/rings2.xcf (added) * data/pool/images/effects/planets/violetplanet.png (added) * data/pool/images/effects/planets/violetplanet.xcf (added) * data/pool/images/effects/planets/violetplanet2.png (added) * data/pool/images/effects/planets/violetplanet2.xcf (added) * data/pool/images/effects/primitives (added) * data/pool/images/effects/primitives/info.xml (added) * data/pool/images/effects/primitives/sphere.png (moved) * data/pool/images/effects/primitives/sphere.xcf (added) * data/pool/materials/planets.material (added) Adding planets to pool. Also added some other image source. Thu, 07 Apr 2011 22:18:28 GMT dafrick [8210] * data/trunk/materials/OrxonoxSky.material (modified) Reverting change in skyboxes material. Thu, 07 Apr 2011 22:16:54 GMT dafrick [8209] * data/trunk/AUTHORS (modified) * data/trunk/gui/looknfeels/OrxonoxLook.looknfeel (modified) * data/trunk/images/effects/blueplanet.png (added) * data/trunk/images/effects/brownplanet.png (added) * data/trunk/images/effects/greenplanet.png (added) * data/trunk/images/effects/greyplanet.png (added) * data/trunk/images/effects/redplanet.png (added) * data/trunk/images/effects/violetplanet.png (added) * data/trunk/images/effects/violetplanet2.png (added) * data/trunk/materials/OrxonoxSky.material (modified) * data/trunk/materials/planets.material (added) Adding new planet billboards. Thu, 07 Apr 2011 20:53:16 GMT dafrick [8208] * data/pool/tools/AUTHORS (modified) * data/pool/tools/colorscheme (added) * data/pool/tools/colorscheme/colorscheme.png (added) * data/pool/tools/colorscheme/colorscheme.xcf (added) * data/pool/tools/colorscheme/orxonoxColorScheme.gpl (moved) Adding additional color scheme files, moving into own subdirectory. Thu, 07 Apr 2011 20:33:12 GMT dafrick [8207] * data/pool/tools (added) * data/pool/tools/AUTHORS (added) * data/pool/tools/orxonoxColorScheme.gpl (copied) Adding color scheme to new tool folder in data/pool. 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 ... Wed, 06 Apr 2011 09:12:38 GMT dafrick [8193] * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) Resolving bug in MultiTrigger. 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 18:05:30 GMT rgrieder [8179] * code/trunk/data/levels/lastTeamStanding.oxw (modified) Hopefully fixed XML parsing errors at startup (can't test right now, ... Sun, 03 Apr 2011 17:56:47 GMT jo [8178] * code/trunk (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (copied) * code/trunk/data/levels/lastTeamStandingII.oxw (copied) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (copied) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (copied) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (copied) Merged lastmastanding3 into trunk. There's an xml parsing error that ... 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 ... Sun, 03 Apr 2011 10:52:54 GMT dafrick [8169] * data/pool/models/spacestation/info.xml (modified) * data/pool/models/spacestation/meshes (deleted) * data/pool/models/spacestation/textures (deleted) Removing stuff, that is not needed. Sun, 03 Apr 2011 10:49:45 GMT dafrick [8168] * data/pool/models/asteroids/TODO (added) * data/pool/models/asteroids/info_asteroid_UV.xml (added) * data/pool/models/asteroids/info_asteroid_ice.xml (added) * data/pool/models/spacestation/CuboidBody.blend (copied) * data/pool/models/spacestation/CuboidConnection.blend (copied) * data/pool/models/spacestation/CuboidLandingZone.blend (copied) * data/pool/models/spacestation/DoubleCuboidBody.blend (copied) * data/pool/models/spacestation/SemiCircleCockpit.blend (copied) * data/pool/models/spacestation/SolarPanel.blend (copied) * data/pool/models/spacestation/TODO (modified) * data/pool/models/spacestation/Thruster.blend (copied) * data/pool/models/spacestation/info.xml (modified) * data/pool/models/spacestation/meshes (copied) * data/pool/models/spacestation/satellitedish.blend (copied) * data/pool/models/spacestation/screenshots (copied) * data/pool/models/spacestation/screenshots/CuboidBody.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidBody2.png (deleted) * data/pool/models/spacestation/screenshots/CuboidConnBody.png (copied) * data/pool/models/spacestation/screenshots/CuboidConnection.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidConnection2.png (deleted) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidConnectionBody2.png (deleted) * data/pool/models/spacestation/screenshots/CuboidLandingZone.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidLandingZone2.png (deleted) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidSS2.png (deleted) * data/pool/models/spacestation/screenshots/CuboidSpaceStation.blend (copied) * data/pool/models/spacestation/screenshots/DoubleCuboidBody.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/DoubleCuboidBody2.png (deleted) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SatelliteDish2.png (deleted) * data/pool/models/spacestation/screenshots/SemiCircleCockpit.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SemiCircleCockpit2.png (deleted) * data/pool/models/spacestation/screenshots/SolarPanel.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SolarPanel2.png (deleted) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SpaceStations2.png (deleted) * data/pool/models/spacestation/screenshots/Thruster.png (copied) * data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/Thruster2.png (deleted) * data/pool/models/spacestation/screenshots/satellitedish.png (copied) * data/pool/models/spacestation/textures (copied) Adding .blend files and screenshots for spacestation. 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 Wed, 30 Mar 2011 10:52:13 GMT dafrick [8162] * data/pool/models/AUTHORS (modified) * data/pool/models/spaceships/swallow (added) * data/pool/models/spaceships/swallow/swallow_mat.mesh (moved) * data/pool/models/spaceships/transporter (added) * data/pool/models/spaceships/transporter/TODO (added) * data/pool/models/spaceships/transporter/Transporter.mesh (moved) * data/pool/models/spaceships/transporter/info.xml (added) Moving tow more ships. Wed, 30 Mar 2011 10:45:16 GMT dafrick [8161] * data/pool/models/AUTHORS (modified) * data/pool/models/Carrier.mesh (deleted) * data/pool/models/drone (added) * data/pool/models/drone/TODO (added) * data/pool/models/drone/drone.mesh (moved) * data/pool/models/drone/info.xml (added) * data/pool/models/duBall (added) * data/pool/models/duBall/DuBall1.mesh (moved) * data/pool/models/duBall/DuBall2.mesh (moved) * data/pool/models/duBall/TODO (added) * data/pool/models/duBall/info.xml (added) * data/pool/models/primitives/crate (added) * data/pool/models/primitives/crate/TODO (added) * data/pool/models/primitives/crate/crate.mesh (moved) * data/pool/models/primitives/crate/info.xml (added) * data/pool/models/spaceships (added) * data/pool/models/spaceships/assff (moved) * data/pool/models/spaceships/assff/info.xml (copied) * data/pool/models/spaceships/carrier (added) * data/pool/models/spaceships/carrier/Carrier.mesh (added) * data/pool/models/spaceships/carrier/TODO (added) * data/pool/models/spaceships/carrier/info.xml (added) * data/pool/models/spaceships/ghost (added) * data/pool/models/spaceships/ghost/ghost.mesh (moved) * data/pool/models/spaceships/ghost/info.xml (added) * data/pool/models/spaceships/pirate (added) * data/pool/models/spaceships/pirate/pirate.mesh (moved) * data/pool/models/spaceships/spacecruiser (added) * data/pool/models/spaceships/spacecruiser/spacecruiser.mesh (moved) * data/pool/models/spaceships/spacecruiser/spacecruiser_16.mesh (moved) * data/pool/models/spaceships/starship (added) * data/pool/models/spaceships/starship/TODO (added) * data/pool/models/spaceships/starship/info.xml (added) * data/pool/models/spaceships/starship/starship.mesh (moved) Still moving stuff. Wed, 30 Mar 2011 09:27:44 GMT dafrick [8160] * data/pool/models/AUTHORS (modified) * data/pool/models/assff/info.xml (modified) * data/pool/models/asteroids/rocky/TODO (modified) * data/pool/models/cube.mesh (deleted) * data/pool/models/cube_green.mesh (deleted) * data/pool/models/cube_orange.mesh (deleted) * data/pool/models/cube_red.mesh (deleted) * data/pool/models/cube_yellow.mesh (deleted) * data/pool/models/debris (added) * data/pool/models/debris/assff (added) * data/pool/models/debris/assff/BodyDebris1.mesh (moved) * data/pool/models/debris/assff/CockpitDebris.mesh (moved) * data/pool/models/debris/assff/SmallPart1.mesh (moved) * data/pool/models/debris/assff/SmallPart2.mesh (moved) * data/pool/models/debris/assff/TODO (added) * data/pool/models/debris/assff/WingDebris1.mesh (moved) * data/pool/models/debris/assff/WingDebris2.mesh (moved) * data/pool/models/debris/assff/info.xml (added) * data/pool/models/primitives (added) * data/pool/models/primitives/axes (added) * data/pool/models/primitives/axes/TODO (added) * data/pool/models/primitives/axes/axes.mesh (moved) * data/pool/models/primitives/axes/info.xml (added) * data/pool/models/primitives/cone (added) * data/pool/models/primitives/cone/Cone.mesh (moved) * data/pool/models/primitives/cone/TODO (added) * data/pool/models/primitives/cone/info.xml (added) * data/pool/models/primitives/cube (added) * data/pool/models/primitives/cube/TODO (added) * data/pool/models/primitives/cube/cube.mesh (added) * data/pool/models/primitives/cube/cube_green.mesh (added) * data/pool/models/primitives/cube/cube_orange.mesh (added) * data/pool/models/primitives/cube/cube_red.mesh (added) * data/pool/models/primitives/cube/cube_yellow.mesh (added) * data/pool/models/primitives/cube/info.xml (added) * data/pool/models/primitives/plane (added) * data/pool/models/primitives/plane/TODO (added) * data/pool/models/primitives/plane/info.xml (added) * data/pool/models/primitives/plane/plane.mesh (moved) * data/pool/models/primitives/sphere (added) * data/pool/models/primitives/sphere/TODO (added) * data/pool/models/primitives/sphere/info.xml (added) * data/pool/models/primitives/sphere/sphere.mesh (moved) * data/pool/models/spacestation (added) * data/pool/models/spacestation/CuboidBody.mesh (moved) * data/pool/models/spacestation/CuboidConnBody.mesh (moved) * data/pool/models/spacestation/CuboidConnection.mesh (moved) * data/pool/models/spacestation/CuboidLandingZone.mesh (moved) * data/pool/models/spacestation/DoubleCuboidBody.mesh (moved) * data/pool/models/spacestation/SemiCircleCockpit.mesh (moved) * data/pool/models/spacestation/SolarPanel.mesh (moved) * data/pool/models/spacestation/TODO (added) * data/pool/models/spacestation/Thruster.mesh (moved) * data/pool/models/spacestation/info.xml (added) * data/pool/models/spacestation/satellitedish.mesh (moved) Some more moving... Tue, 29 Mar 2011 22:27:48 GMT dafrick [8159] * data/pool/models/AUTHORS (modified) * data/pool/models/assff/info.xml (modified) * data/pool/models/asteroids (added) * data/pool/models/asteroids/asteroid_UV.mesh (moved) * data/pool/models/asteroids/asteroid_UV_lq.mesh (moved) * data/pool/models/asteroids/asteroid_ice.mesh (moved) * data/pool/models/asteroids/plain (added) * data/pool/models/asteroids/plain/TODO (added) * data/pool/models/asteroids/plain/asteroid.mesh (moved) * data/pool/models/asteroids/plain/asteroid1.mesh (moved) * data/pool/models/asteroids/plain/asteroid2.mesh (moved) * data/pool/models/asteroids/plain/asteroid3.mesh (moved) * data/pool/models/asteroids/plain/asteroid4.mesh (moved) * data/pool/models/asteroids/plain/info.xml (added) * data/pool/models/asteroids/rocky (added) * data/pool/models/asteroids/rocky/TODO (added) * data/pool/models/asteroids/rocky/ast1.mesh (moved) * data/pool/models/asteroids/rocky/ast2.mesh (moved) * data/pool/models/asteroids/rocky/ast3.mesh (moved) * data/pool/models/asteroids/rocky/ast4.mesh (moved) * data/pool/models/asteroids/rocky/ast5.mesh (moved) * data/pool/models/asteroids/rocky/ast6.mesh (moved) * data/pool/models/asteroids/rocky/info.xml (added) Creating folder for asteroids. Tue, 29 Mar 2011 21:54:57 GMT dafrick [8158] * data/pool/AUTHORS (deleted) * data/pool/images/AUTHORS (added) * data/pool/images/overlay/AUTHORS (added) * data/pool/models/AUTHORS (modified) * data/pool/models/assff (added) * data/pool/models/assff/TODO (added) * data/pool/models/assff/assff.mesh (moved) * data/pool/models/assff/assff_lod_med.mesh (moved) * data/pool/models/assff/info.xml (added) * data/pool/models/assff/screenshot.png (added) * data/pool/resources.oxr (deleted) Removing resources.oxr and toplevel AUTHORS file. Creating directory ... Tue, 29 Mar 2011 21:09:18 GMT dafrick [8157] * data/pool/audio/ambient/default/AUTHORS (added) * data/pool/audio/ambient/dnb/AUTHORS (added) * data/pool/audio/ambient/eightbit/AUTHORS (added) * data/pool/audio/ambient/jazzy/AUTHORS (added) * data/pool/audio/sounds/AUTHORS (added) * data/pool/fonts/AUTHORS (added) * data/pool/gui/fonts/AUTHORS (added) * data/pool/gui/imagesets/AUTHORS (added) * data/pool/gui/looknfeels/AUTHORS (added) * data/pool/gui/looknfeels/TODO (added) * data/pool/images/decals/AUTHORS (added) * data/pool/images/effects/AUTHORS (added) * data/pool/images/gui/AUTHORS (added) * data/pool/images/skyboxes/AUTHORS (added) * data/pool/images/textures/AUTHORS (added) * data/pool/images/textures/seamless/AUTHORS (added) * data/pool/materials/AUTHORS (added) * data/pool/models/AUTHORS (added) * data/pool/models/Cone.mesh (copied) * data/pool/models/UEATransporter036.mesh (copied) * data/pool/models/UEATransporter036T.mesh (copied) * data/pool/models/assff_lod_med.mesh (copied) * data/pool/models/asteroid.mesh (copied) * data/pool/models/asteroid1.mesh (copied) * data/pool/models/asteroid2.mesh (copied) * data/pool/models/asteroid3.mesh (copied) * data/pool/models/asteroid4.mesh (copied) * data/pool/models/asteroid_UV_lq.mesh (copied) * data/pool/models/cube_yellow.mesh (copied) * data/pool/models/cwrench.mesh (copied) * data/pool/models/gwrench.mesh (copied) * data/pool/models/jumpthrust.mesh (copied) * data/pool/models/ogrehead.mesh (copied) * data/pool/models/spacecruiser_16.mesh (copied) * data/pool/models/starship.mesh (copied) * data/pool/models/unused (deleted) * data/pool/packs/AUTHORS (added) * data/pool/programs/AUTHORS (added) Splitting AUTHORS files and moving unused models back into models. Tue, 29 Mar 2011 20:08:34 GMT dafrick [8156] * data/pool (copied) Creating the future content repository: data pool. 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:16:45 GMT dafrick [8149] * data/branches/environment (copied) New environment data branch. 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.