# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 29, 2024, 2:44:03 AM Thu, 18 Mar 2010 14:48:49 GMT erwin [6562] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) More tries to fix the sound: there seems to be no context in the ... Thu, 18 Mar 2010 13:18:45 GMT scheusso [6559] * code/branches/skybox2/src/modules/CMakeLists.txt (modified) * code/branches/skybox2/src/modules/designtools (added) * code/branches/skybox2/src/modules/designtools/CMakeLists.txt (added) * code/branches/skybox2/src/modules/designtools/DesignToolsPrereqs.h (added) created new module designtools to put skyboxgenerator and also ... Thu, 18 Mar 2010 13:10:01 GMT scheusso [6558] * code/branches/skybox2 (copied) creating new skybox branch to continue work on skybox generator Thu, 18 Mar 2010 12:13:30 GMT dafrick [6557] * code/branches/pickup3 (deleted) Remove pickup3 branch, because it's no longer needed, as well... Thu, 18 Mar 2010 12:12:55 GMT dafrick [6556] * code/branches/pickup2 (deleted) Remove pickups 2 branch, since it's no longer needed. Thu, 18 Mar 2010 12:08:55 GMT scheusso [6555] * code/branches/ppspickups2 (modified) * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (copied) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (copied) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h (copied) merging revisions 6526:6532 from ppspickups2 into new ppspickups2 Thu, 18 Mar 2010 12:07:57 GMT scheusso [6554] * code/branches/ppspickups2 (copied) recreating ppspickups2 from trunk Thu, 18 Mar 2010 12:07:32 GMT scheusso [6553] * code/branches/ppspickups2 (deleted) temporarily deleting this branch Thu, 18 Mar 2010 12:01:56 GMT scheusso [6552] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (added) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (added) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (added) * code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (added) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (added) merged revisions 6525:6543 from ppspickups1 into ppspickups1 Thu, 18 Mar 2010 11:46:49 GMT scheusso [6551] * code/branches/ppspickups1 (copied) recreating ppspickups1 branch Thu, 18 Mar 2010 11:46:24 GMT scheusso [6550] * code/branches/ppspickups1 (deleted) temporarily deleting this branch Thu, 18 Mar 2010 11:21:27 GMT rgrieder [6548] * code/branches/gamestate/data/gui/schemes/SleekSpaceLook.scheme (added) Added a new look from the CEGUI skin repository: sleekspace. (added ... Thu, 18 Mar 2010 09:58:18 GMT rgrieder [6546] * code/branches/gamestate/data/gui/schemes/TaharezLookSkin.scheme (deleted) Removed yet another obsolete cegui file. Wed, 17 Mar 2010 23:15:34 GMT rgrieder [6545] * code/branches/gamestate/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/gamestate/data/gui/layouts/InGameMenu.layout (modified) * code/branches/gamestate/data/gui/layouts/InfoPopup.layout (modified) It seems we don't usually define the fonts used in widgets manually. ... Wed, 17 Mar 2010 23:13:57 GMT rgrieder [6544] * code/branches/gamestate/data/gui/configs/Falagard.xsd (deleted) * code/branches/gamestate/data/gui/configs/Font.xsd (deleted) * code/branches/gamestate/data/gui/configs/GUILayout.xsd (deleted) * code/branches/gamestate/data/gui/configs/GUIScheme.xsd (deleted) * code/branches/gamestate/data/gui/configs/Imageset.xsd (deleted) * code/branches/gamestate/data/gui/layouts/CompositorDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/Console.wnd (deleted) * code/branches/gamestate/data/gui/layouts/CrowdDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/Demo7Windows.layout (deleted) * code/branches/gamestate/data/gui/layouts/Demo8.layout (deleted) * code/branches/gamestate/data/gui/layouts/DragDropDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/FontDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/InstancingDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabControlDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabPage.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabPage1.layout (deleted) * code/branches/gamestate/data/gui/layouts/TabPage2.layout (deleted) * code/branches/gamestate/data/gui/layouts/TextDemo.layout (deleted) * code/branches/gamestate/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/branches/gamestate/data/gui/layouts/VanillaConsole.layout (deleted) * code/branches/gamestate/data/gui/layouts/VanillaWindows.layout (deleted) * code/branches/gamestate/data/gui/layouts/cegui8.layout (deleted) * code/branches/gamestate/data/gui/layouts/facial.layout (deleted) * code/branches/gamestate/data/gui/layouts/ogregui.layout (deleted) * code/branches/gamestate/data/gui/layouts/shadows.layout (deleted) * code/branches/gamestate/data/gui/schemes/Demo8.scheme (deleted) * code/branches/gamestate/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/gamestate/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/branches/gamestate/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/branches/gamestate/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) Removed loads of CEGUI related files that we really don't need. Most ... Wed, 17 Mar 2010 11:36:46 GMT rgrieder [6543] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (modified) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) svn:eol-style "native" for all text based files. Wed, 17 Mar 2010 11:14:42 GMT ebeier [6542] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (modified) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (added) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (added) made some changes, testlevel should be ready, ... Wed, 17 Mar 2010 09:40:31 GMT ebeier [6541] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (added) * code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (added) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (added) added some files for new speed pickup Tue, 16 Mar 2010 12:49:16 GMT rgrieder [6537] * code/branches/gamestate/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestate/src/libraries/core/Core.cc (modified) * code/branches/gamestate/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestate/src/libraries/core/GUIManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.cc (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputState.cc (modified) * code/branches/gamestate/src/libraries/core/input/InputState.h (modified) * code/branches/gamestate/src/libraries/util/TriBool.h (added) * code/branches/gamestate/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gamestate/src/orxonox/gamestates/GSMainMenu.cc (modified) Linked every GUI sheet to exactly one InputState. Also added ... Mon, 15 Mar 2010 16:20:26 GMT benedict [6532] * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (modified) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (added) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h (added) created .h and .cc files for invi-pickup Mon, 15 Mar 2010 15:52:47 GMT benedict [6531] * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (added) simple copy of pickuplevel Mon, 15 Mar 2010 15:49:02 GMT benedict [6530] * code/branches/ppspickups2/test (deleted) wider nur ein test Mon, 15 Mar 2010 15:29:29 GMT benedict [6529] * code/branches/ppspickups2/test (added) testcommit Mon, 15 Mar 2010 15:27:50 GMT ebeier [6528] * code/branches/ppspickups1/test.txt (added) Mon, 15 Mar 2010 15:23:54 GMT scheusso [6527] * code/branches/chat (copied) creating new chat branch Mon, 15 Mar 2010 15:01:25 GMT dafrick [6526] * code/branches/ppspickups2 (copied) Second new branch to create pickups. (Ignore the ... level from the ... Mon, 15 Mar 2010 14:59:57 GMT dafrick [6525] * code/branches/ppspickups1 (copied) New branch to create pickups level. Mon, 15 Mar 2010 14:07:21 GMT dafrick [6523] * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Whitespace removal. Mon, 15 Mar 2010 13:52:50 GMT rgrieder [6522] * code/branches/rocket (copied) Created branch for rocket aim improvements. Mon, 15 Mar 2010 06:33:11 GMT dafrick [6521] * code/branches/pickup3/src/libraries/core/Super.h (modified) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Added changedPickedUp method to Pickupable to solve a problem in ... Sun, 14 Mar 2010 09:27:41 GMT dafrick [6520] * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) Small fix in HealthPickup. Sat, 13 Mar 2010 14:32:34 GMT dafrick [6519] * code/branches/pickup3/data/levels/includes/pickups.oxi (modified) * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Started documenting MetaPcikup, resolved some bugs in ... Fri, 12 Mar 2010 07:56:04 GMT dafrick [6518] * code/branches/pickup3/data/levels/pickup.oxw (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc (moved) * code/branches/pickup3/src/modules/pickup/items/MetaPickup.h (moved) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) Renamed TestPickup to MetaPickup. Fri, 12 Mar 2010 07:42:18 GMT dafrick [6517] * code/branches/pickup3/src/modules/pickup/items/TestPickup.cc (modified) TestPickup now more universal, as it accepts all PickupCarriers as ... Thu, 11 Mar 2010 21:59:37 GMT dafrick [6516] * code/branches/pickup3/src/modules/pickup/DroppedPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/DroppedPickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) Resolved DroppedPickup bug, where the pickup picked up from a ... Thu, 11 Mar 2010 16:00:09 GMT scheusso [6515] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) permanent creation of DroppedPickup instead of temporary Thu, 11 Mar 2010 15:43:12 GMT rgrieder [6514] * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) Fixed intialisation bug in PickupSpawner. Thu, 11 Mar 2010 15:30:30 GMT dafrick [6512] * code/branches/pickup3/data/levels/pickup.oxw (added) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/pickup3/src/modules/pickup/DroppedPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/items/TestPickup.cc (added) * code/branches/pickup3/src/modules/pickup/items/TestPickup.h (added) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) Added additional pickup (TestPickup), and did some bug $fixing. Thu, 11 Mar 2010 15:18:06 GMT erwin [6511] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) You shalt not compile and edit. Thu, 11 Mar 2010 15:14:53 GMT erwin [6510] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified) last one for today Thu, 11 Mar 2010 14:58:42 GMT erwin [6509] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) Committing spreeeee! Hardcoded source init Thu, 11 Mar 2010 14:47:35 GMT erwin [6508] * code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified) Removed unused function declarations Thu, 11 Mar 2010 14:40:14 GMT erwin [6507] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) Found a few new places to change things for file streaming Thu, 11 Mar 2010 14:16:12 GMT scheusso [6506] * code/branches/sound5 (modified) * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound5/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound5/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound5/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.h (modified) * code/branches/sound5/src/orxonox/sound/SoundPrereqs.h (copied) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.h (modified) * code/branches/sound5/src/orxonox/sound/WorldSound.h (modified) merged sound4 into sound5 Thu, 11 Mar 2010 14:13:23 GMT scheusso [6505] * code/branches/sound5 (copied) creating new sound5 branch (ogg streaming) Thu, 11 Mar 2010 14:12:37 GMT erwin [6504] * code/branches/sound4/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound4/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound4/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound4/src/orxonox/sound/SoundManager.cc (modified) Commit before rebase, attempt to fix everything ;-) Thu, 11 Mar 2010 09:15:35 GMT scheusso [6500] * code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt (modified) removing dronecontroller from cmakelists in order to build ... Tue, 09 Mar 2010 22:06:08 GMT dafrick [6499] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) Some small changes regarding output. Mon, 08 Mar 2010 20:45:28 GMT dafrick [6498] * code/branches/pickup3/data/levels/includes/pickups.oxi (added) * code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt (added) Added some preconfigured health pickups. Mon, 08 Mar 2010 20:17:22 GMT dafrick [6497] * code/branches/pickup3/src/libraries/core/OrxonoxClass.h (modified) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Fixed bug in clone() (Argument needed to be as reference). Pickups ... Mon, 08 Mar 2010 19:07:48 GMT rgrieder [6496] * code/branches/pickup3/src/modules/pickup/DroppedPickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (modified) Fixed DLL interface on Windows. Mon, 08 Mar 2010 14:36:00 GMT scheusso [6494] * code/branches/tutorial/cmake/LibraryConfigTardis.cmake (modified) tardis fix Mon, 08 Mar 2010 11:49:25 GMT dafrick [6492] * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) Small error in Pickup Spawner. Mon, 08 Mar 2010 08:53:29 GMT scheusso [6491] * code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt (modified) removed Drone.cc from CMakeLists Mon, 08 Mar 2010 08:39:47 GMT dafrick [6490] * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) Added target to HealthPickup, which I had forgotten. Mon, 08 Mar 2010 07:09:17 GMT dafrick [6489] * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.h (modified) Changed changedActivity and changedVisibility such that when ... Sun, 07 Mar 2010 22:47:11 GMT scheusso [6488] * code/branches/tutorial/src/orxonox/worldentities/Drone.cc (modified) forgot an important detail Sun, 07 Mar 2010 22:27:20 GMT rgrieder [6487] * code/branches/tutorial (modified) * code/branches/tutorial/data/levels/tutorial.oxw (modified) * code/branches/tutorial/src/orxonox/controllers/DroneController.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/Drone.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/Drone.h (modified) Merged r5841 that removes the student's code from the tutorial. Sun, 07 Mar 2010 22:16:54 GMT dafrick [6486] * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) Simplification in PickupSpawner due to previous commit. Sun, 07 Mar 2010 22:16:03 GMT dafrick [6485] * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/pickup3/src/orxonox/worldentities/WorldEntity.h (modified) Added changedActivity and changedVisibility method to WorldEntity, ... Sun, 07 Mar 2010 22:00:05 GMT dafrick [6484] * code/branches/pickup3/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) Cleanup and bug fixes. Sun, 07 Mar 2010 21:20:51 GMT rgrieder [6483] * code/branches/tutorial/src/orxonox/controllers (modified) * code/branches/tutorial/src/orxonox/controllers/DroneController.cc (modified) * code/branches/tutorial/src/orxonox/controllers/DroneController.h (modified) * code/branches/tutorial/src/orxonox/worldentities (modified) * code/branches/tutorial/src/orxonox/worldentities/Drone.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/Drone.h (modified) Cosmetic changes.. Sun, 07 Mar 2010 21:11:31 GMT rgrieder [6482] * code/branches/tutorial (modified) * code/branches/tutorial/data/levels/tutorial.oxw (modified) * code/branches/tutorial/src/orxonox/controllers (modified) * code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/tutorial/src/orxonox/controllers/DroneController.cc (copied) * code/branches/tutorial/src/orxonox/controllers/DroneController.h (copied) * code/branches/tutorial/src/orxonox/pickup/BaseItem.h (modified) * code/branches/tutorial/src/orxonox/worldentities (modified) * code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/tutorial/src/orxonox/worldentities/Drone.cc (copied) * code/branches/tutorial/src/orxonox/worldentities/Drone.h (copied) Merged HS 2009 tutorial in new FS 2010 branch. This includes all the ... Sun, 07 Mar 2010 21:04:01 GMT rgrieder [6481] * code/branches/tutorial (copied) Tutorial branch for the FS 2010 PPS. Sun, 07 Mar 2010 13:05:05 GMT dafrick [6480] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h (modified) Simplification in creation of PickupIdentifier. Sun, 07 Mar 2010 10:07:03 GMT dafrick [6479] * code/branches/pickup3/src/libraries/core/BaseObject.cc (modified) * code/branches/pickup3/src/libraries/core/BaseObject.h (modified) Added XMLPortParam to add one single template to BaseObject for ease ... Sun, 07 Mar 2010 09:55:23 GMT dafrick [6478] * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) More bug fixes. Sat, 06 Mar 2010 18:44:04 GMT dafrick [6477] * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) Some more documenting. Completed HealthPickup. Sat, 06 Mar 2010 14:08:19 GMT erwin [6476] * code/branches/sound4/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound4/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound4/src/orxonox/sound/SoundStreamer.cc (modified) Tried to hack ths sound streaming part in... sound doesn't work at ... Fri, 05 Mar 2010 17:26:54 GMT dafrick [6475] * code/branches/pickup3/src/modules/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/DroppedPickup.cc (moved) * code/branches/pickup3/src/modules/pickup/DroppedPickup.h (moved) * code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) * code/branches/pickup3/src/modules/pickup/Pickup.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/branches/pickup3/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupManager.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h (modified) * code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified) Additional documentation, code niceifying and potential bug fixing. ... Fri, 05 Mar 2010 08:49:56 GMT dafrick [6474] * code/branches/pickup3/src/modules/pickup/Pickup.cc (added) * code/branches/pickup3/src/modules/pickup/Pickup.h (added) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc (added) * code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h (added) * code/branches/pickup3/src/modules/pickup/PickupManager.cc (added) * code/branches/pickup3/src/modules/pickup/PickupManager.h (added) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (added) * code/branches/pickup3/src/modules/pickup/PickupRepresentation.h (added) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/items (added) * code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt (added) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (added) * code/branches/pickup3/src/modules/pickup/items/HealthPickup.h (added) * code/branches/pickup3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (added) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/pickup3/src/orxonox/pickup/BaseItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/BaseItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/DroppedItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/EquipmentItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/EquipmentItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/ModifierPickup.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/ModifierPickup.h (deleted) * code/branches/pickup3/src/orxonox/pickup/ModifierType.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PassiveItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/PassiveItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupCollection.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupCollection.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (added) * code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.h (added) * code/branches/pickup3/src/orxonox/pickup/PickupInventory.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupInventory.h (deleted) * code/branches/pickup3/src/orxonox/pickup/PickupSpawner.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/UsableItem.cc (deleted) * code/branches/pickup3/src/orxonox/pickup/UsableItem.h (deleted) * code/branches/pickup3/src/orxonox/pickup/items (deleted) Some documenting done. Added files, that I had forgotten to add. ... Thu, 04 Mar 2010 11:11:21 GMT dafrick [6467] * code/branches/pickup3/src/orxonox/items/Engine.cc (modified) Steering works now. The lesson is: Don't comment out stuff you don't ... Thu, 04 Mar 2010 10:56:26 GMT dafrick [6466] * code/branches/pickup3/src/libraries/core/OrxonoxClass.h (modified) * code/branches/pickup3/src/libraries/core/Super.h (modified) * code/branches/pickup3/src/modules/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/modules/pickup/DroppedItem.cc (modified) * code/branches/pickup3/src/modules/pickup/DroppedItem.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/orxonox/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/pickup3/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/pickup3/src/orxonox/pickup/CMakeLists.txt (modified) * code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified) Lots of things done in pickups module. Compiles, but it seems, that ... Wed, 03 Mar 2010 22:46:32 GMT scheusso [6465] * code/branches/network2/src/libraries/core/GraphicsManager.cc (modified) stupid mistake Wed, 03 Mar 2010 19:56:01 GMT scheusso [6464] * code/branches/network2/src/libraries/core/GraphicsManager.cc (modified) setting default number of mipmaps to unlimited (was 0 before) Mon, 01 Mar 2010 22:30:21 GMT scheusso [6462] * code/branches/network2/data/levels/includes/weaponsettings3.oxi (modified) temporarily removing hs-w01 models due to major performance drop ... Sun, 24 Jan 2010 16:03:27 GMT rgrieder [6459] * code/branches/gamestate/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestate/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified) Simplified BasicGUI construction. Just give the name of the GUI as ... Sat, 23 Jan 2010 15:39:40 GMT scheusso [6458] * code/branches/network2/src/orxonox/worldentities/pawns/Pawn.cc (modified) changed Pawn::aimPosition_ synchronisation to Client->Server only Sat, 23 Jan 2010 15:38:41 GMT scheusso [6457] * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/network2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/network2/src/orxonox/sound/BaseSound.h (modified) * code/branches/network2/src/orxonox/sound/WorldSound.cc (modified) changed synchronisation of worldsound state (1 instead of 4 bytes) ... Fri, 22 Jan 2010 16:49:36 GMT scheusso [6456] * code/branches/network2/src/orxonox/graphics/BlinkingBillboard.cc (modified) changed BlinkingBillboard Synchronisation in order to reduce traffic ... Fri, 22 Jan 2010 14:49:23 GMT scheusso [6455] * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified) unregisterVariable reintroduced some style changes Fri, 22 Jan 2010 13:51:06 GMT rgrieder [6454] * code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc (modified) * code/branches/consolecommands2/src/libraries/core/ConsoleCommand.h (modified) * code/branches/consolecommands2/src/libraries/util/VA_NARGS.h (modified) 3 build fixes for MSVC. Wed, 20 Jan 2010 13:28:48 GMT landauf [6453] * code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc (modified) hmm Wed, 20 Jan 2010 13:21:10 GMT landauf [6452] * code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc (modified) * code/branches/consolecommands2/src/libraries/core/ConsoleCommand.h (modified) * code/branches/consolecommands2/src/libraries/core/Functor.h (modified) * code/branches/consolecommands2/src/libraries/core/LuaState.h (modified) * code/branches/consolecommands2/src/libraries/util/Convert.h (modified) * code/branches/consolecommands2/src/libraries/util/VA_NARGS.h (added) merged current state of the new cc system to the updated branch Wed, 20 Jan 2010 13:00:45 GMT landauf [6451] * code/branches/consolecommands2 (copied) annual update of the cc branch Sun, 17 Jan 2010 23:05:57 GMT scheusso [6450] * code/branches/network2/src/libraries/network/GamestateClient.cc (modified) * code/branches/network2/src/libraries/network/GamestateManager.cc (modified) * code/branches/network2/src/libraries/network/Host.h (modified) * code/branches/network2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network2/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network2/src/libraries/network/packet/Packet.cc (modified) * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified) further traffic reduction: - synchronisableheaders are now smaller( ... Sun, 17 Jan 2010 10:49:48 GMT scheusso [6449] * code/branches/network2/src/libraries/network/GamestateClient.cc (modified) * code/branches/network2/src/libraries/network/GamestateManager.cc (modified) * code/branches/network2/src/libraries/network/GamestateManager.h (modified) * code/branches/network2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network2/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network2/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h (modified) changed diff behaviour in order to reduce datasize before and after ... Sun, 17 Jan 2010 10:37:48 GMT scheusso [6448] * code/branches/network2/src/modules/objects/Planet.h (modified) * code/branches/network2/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/network2/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/network2/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/network2/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/network2/src/modules/pong/PongBall.h (modified) * code/branches/network2/src/modules/pong/PongBat.h (modified) * code/branches/network2/src/orxonox/CMakeLists.txt (modified) * code/branches/network2/src/orxonox/Level.h (modified) * code/branches/network2/src/orxonox/Test.h (modified) * code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/network2/src/orxonox/graphics/Backlight.h (modified) * code/branches/network2/src/orxonox/graphics/Billboard.h (modified) * code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/branches/network2/src/orxonox/graphics/FadingBillboard.h (modified) * code/branches/network2/src/orxonox/graphics/GlobalShader.h (modified) * code/branches/network2/src/orxonox/graphics/Light.h (modified) * code/branches/network2/src/orxonox/graphics/Model.h (modified) * code/branches/network2/src/orxonox/graphics/ParticleEmitter.h (modified) * code/branches/network2/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/network2/src/orxonox/infos/HumanPlayer.h (modified) * code/branches/network2/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/network2/src/orxonox/items/Engine.h (modified) * code/branches/network2/src/orxonox/items/MultiStateEngine.h (modified) * code/branches/network2/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/network2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/branches/network2/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/network2/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/network2/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/network2/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h (modified) * code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h (modified) made registerVariables always private. otherwise bad things may ... Sun, 03 Jan 2010 16:53:05 GMT rgrieder [6442] * code/branches/gamestate/src/libraries/core/Core.h (modified) * code/branches/gamestate/src/libraries/core/Game.h (modified) * code/branches/gamestate/src/libraries/core/IOConsole.cc (modified) * code/branches/gamestate/src/libraries/core/IOConsole.h (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) * code/branches/gamestate/src/libraries/core/Template.cc (modified) * code/branches/gamestate/src/libraries/network/TrafficControl.h (modified) * code/branches/gamestate/src/libraries/util/Serialise.h (modified) Removed unnecessary path qualifiers. Sun, 03 Jan 2010 14:56:34 GMT rgrieder [6441] * code/branches/gamestate/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestate/src/libraries/core/GUIManager.h (modified) * code/branches/gamestate/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/gamestate/src/orxonox/overlays/GUISheet.cc (added) * code/branches/gamestate/src/orxonox/overlays/GUISheet.h (added) Added XML loadable wrapper class that can load GUI sheets. Sun, 03 Jan 2010 14:55:39 GMT rgrieder [6440] * code/branches/gamestate/src/modules/questsystem/QuestManager.cc (modified) * code/branches/gamestate/src/modules/questsystem/QuestManager.h (modified) Fixed typos. Sun, 03 Jan 2010 14:54:34 GMT rgrieder [6439] * code/branches/gamestate/src/libraries/core/Language.h (modified) Found two macros that can be replaced by simple inline functions. Fri, 01 Jan 2010 21:05:56 GMT rgrieder [6437] * code/branches/gamestate/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/gamestate/src/libraries/core/ConfigFileManager.h (modified) * code/branches/gamestate/src/libraries/core/input/Button.cc (modified) * code/branches/gamestate/src/libraries/core/input/Button.h (modified) * code/branches/gamestate/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/gamestate/src/libraries/core/input/KeyBinder.h (modified) Added support for keybindings.ini merging: When running development ... Fri, 01 Jan 2010 17:43:54 GMT rgrieder [6435] * code/branches/sound4/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound4/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound4/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound4/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/sound4/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound4/src/orxonox/sound/SoundManager.h (modified) * code/branches/sound4/src/orxonox/sound/SoundPrereqs.h (copied) * code/branches/sound4/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/sound4/src/orxonox/sound/SoundStreamer.h (modified) * code/branches/sound4/src/orxonox/sound/WorldSound.h (modified) Moved getALErrorString function from SoundManager.h to newly created ... Fri, 01 Jan 2010 17:28:42 GMT rgrieder [6434] * code/branches/sound4 (copied) Sound streaming branch. Wed, 30 Dec 2009 14:56:04 GMT scheusso [6433] * code/branches/network2 (copied) creating network2 branch Tue, 29 Dec 2009 21:30:19 GMT rgrieder [6432] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) * code/branches/gamestate/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/branches/gamestate/src/libraries/core/ArgumentCompletionFunctions.h (modified) * code/branches/gamestate/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/gamestate/src/libraries/core/ConfigFileManager.h (modified) * code/branches/gamestate/src/libraries/core/ConfigValueContainer.cc (modified) * code/branches/gamestate/src/libraries/core/ConfigValueContainer.h (modified) * code/branches/gamestate/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/gamestate/src/libraries/core/CorePrereqs.h (modified) * code/branches/gamestate/src/libraries/core/Identifier.cc (modified) * code/branches/gamestate/src/libraries/core/Identifier.h (modified) * code/branches/gamestate/src/libraries/core/Shell.cc (modified) * code/branches/gamestate/src/libraries/core/Shell.h (modified) * code/branches/gamestate/src/libraries/core/input/Button.cc (modified) * code/branches/gamestate/src/libraries/core/input/Button.h (modified) * code/branches/gamestate/src/libraries/core/input/JoyStick.cc (modified) * code/branches/gamestate/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/gamestate/src/libraries/core/input/KeyBinder.h (modified) Changed the way config values associated with general settings ... Tue, 29 Dec 2009 18:16:36 GMT rgrieder [6431] * code/branches/gamestate/src/libraries/util/Singleton.h (modified) Extended Singleton with a exists() method. Tue, 29 Dec 2009 09:40:29 GMT rgrieder [6430] * code/branches/gamestate (copied) Created branch to ditch the GameStates. Sat, 26 Dec 2009 09:06:54 GMT dafrick [6421] * code/branches/pickup3/src/modules/pickup/DroppedItem.cc (modified) * code/branches/pickup3/src/modules/pickup/DroppedItem.h (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) * code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified) * code/branches/pickup3/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified) Some Documenting and bug fixes.