# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 29, 2024, 12:17:50 PM Wed, 20 Oct 2010 13:47:12 GMT smerkli [7569] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) ...everything looks better with a GPL on top. Wed, 20 Oct 2010 13:43:42 GMT smerkli [7568] * code/branches/masterserver/src/modules/CMakeLists.txt (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) some progress, nothing working yet though. Wed, 20 Oct 2010 13:17:57 GMT youngk [7567] * code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake (modified) * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) Changes for the compilation of OIS on the mac. Wed, 20 Oct 2010 12:54:08 GMT smerkli [7566] * code/branches/masterserver/src/modules/masterserver/.MasterServer.h.swp-backup (deleted) Wed, 20 Oct 2010 12:53:53 GMT smerkli [7565] * code/branches/masterserver/src/modules/masterserver (added) * code/branches/masterserver/src/modules/masterserver/.MasterServer.h.swp-backup (added) * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (added) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (added) * code/branches/masterserver/src/modules/masterserver/ServerList.cpp (added) * code/branches/masterserver/src/modules/masterserver/ServerList.h (added) Initial check-in of the master server code. Nowhere near completion ... Tue, 19 Oct 2010 21:43:25 GMT rgrieder [7564] * code/branches/ois_update/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/ois_update/src/libraries/core/Super.h (modified) * code/branches/ois_update/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/ois_update/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/ois_update/src/modules/questsystem/effects/AddReward.cc (modified) Renamed all symbols called "check" because of macro collisions on OS ... Tue, 19 Oct 2010 21:32:36 GMT rgrieder [7563] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) Reverted changes. Tue, 19 Oct 2010 21:28:30 GMT rgrieder [7562] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) More testing... Tue, 19 Oct 2010 21:26:35 GMT jo [7561] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) New, Improved Level. Should become similar to Stonehenge - maybe Tue, 19 Oct 2010 21:22:55 GMT rgrieder [7560] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) De-macro'd a super function declaration in BaseObject.h with the hope ... Tue, 19 Oct 2010 21:16:01 GMT rgrieder [7559] * code/branches/ois_update/src/libraries/core/Super.h (modified) Reverted changes made for testing purposes. Tue, 19 Oct 2010 21:06:16 GMT rgrieder [7558] * code/branches/ois_update/src/libraries/core/Super.h (modified) Still testing... Tue, 19 Oct 2010 20:57:05 GMT rgrieder [7557] * code/branches/ois_update/src/libraries/core/Super.h (modified) Testing.. Tue, 19 Oct 2010 16:34:13 GMT landauf [7556] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/data/levels/notifications.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) eol-style native Tue, 19 Oct 2010 16:32:25 GMT landauf [7555] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) no nested tags allowed (I think the billboard is ... Tue, 19 Oct 2010 16:25:17 GMT landauf [7554] * code/branches/lastmanstanding/src/modules/notifications/Notification.h (modified) small fix to make it compile again Mon, 18 Oct 2010 21:20:32 GMT rgrieder [7553] * code/branches/ois_update/src/libraries/core/Super.h (modified) * code/branches/ois_update/src/libraries/util/Math.cc (modified) Reverted intentional compiler errors generated in the last commit. ... Sun, 17 Oct 2010 20:50:43 GMT dafrick [7552] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.h (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.h (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/items/Engine.h (modified) Resolving some TODOs and doing some additional cleanup. Almost done ... Sun, 17 Oct 2010 19:40:53 GMT dafrick [7551] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/images/pickupmodule.png (added) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) Moved documentation for pickup module from wiki to doxygen. Sat, 16 Oct 2010 12:45:07 GMT dafrick [7550] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) Drone is much weaker now (makes less damage (pi/2) per gun), which ... Sat, 16 Oct 2010 12:18:45 GMT dafrick [7549] * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) Resolving some more TODO's. Sat, 16 Oct 2010 11:22:15 GMT dafrick [7548] * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) Resolving some TODO's. Sat, 16 Oct 2010 10:37:09 GMT dafrick [7547] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/PickupListener.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Documenting and cleanup. Fri, 15 Oct 2010 06:43:02 GMT dafrick [7546] * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) Ok, this should finally do it. Fri, 15 Oct 2010 06:35:20 GMT dafrick [7545] * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Improvements in InvisiblePickup. Fri, 15 Oct 2010 06:14:03 GMT dafrick [7544] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Fixing bug I introduced. Thu, 14 Oct 2010 21:58:56 GMT jo [7543] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Bug description. Couldn't find a solution though. Thu, 14 Oct 2010 21:02:57 GMT jo [7542] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Some cleanup. There's still a nasty bug. Thu, 14 Oct 2010 10:55:59 GMT dafrick [7541] * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Some more documentation. Thu, 14 Oct 2010 09:20:16 GMT dafrick [7540] * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) Some more documenting. Wed, 13 Oct 2010 20:57:13 GMT dafrick [7539] * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) Some cleanup in PickupManager. Wed, 13 Oct 2010 18:36:51 GMT rgrieder [7538] * data/branches/cleanup/resources.oxr (modified) Removed looknfeel folder from resources.oxr Wed, 13 Oct 2010 18:36:22 GMT rgrieder [7537] * code/branches/data_cleanup/data/DefaultResources.oxr (modified) * code/branches/data_cleanup/data/gui/looknfeels (copied) * code/branches/data_cleanup/src/libraries/core/GUIManager.cc (modified) * code/branches/data_cleanup/src/libraries/tools/ResourceLocation.cc (modified) Moved content of resource group "GUI" to "General" and added ... Wed, 13 Oct 2010 18:35:37 GMT rgrieder [7536] * code/branches/data_cleanup (copied) Creating branch for data cleanup stuff. Wed, 13 Oct 2010 11:29:07 GMT dafrick [7535] * code/branches/menu (copied) Creating new branch. For konrad to work on the menu. Wed, 13 Oct 2010 10:36:50 GMT dafrick [7534] * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) Forgot to initialize value. Wed, 13 Oct 2010 09:35:18 GMT dafrick [7533] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) Documenting in pickups module. Cleaning up in PickupManager. ... Tue, 12 Oct 2010 22:09:04 GMT rgrieder [7532] * code/branches/ois_update/src/libraries/core/Super.h (modified) * code/branches/ois_update/src/libraries/util/Math.cc (modified) Adding some compiler errors to test OS X stuff Tue, 12 Oct 2010 18:33:58 GMT dafrick [7531] * code/trunk/src/modules/pickup/PickupManager.cc (modified) Fixing bug, that caused segfault in pickups with multiplayer. Tue, 12 Oct 2010 16:02:07 GMT rgrieder [7530] * code/branches/ois_update/CMakeLists.txt (modified) Hope this fixes some more OS X problems. Tue, 12 Oct 2010 14:07:38 GMT adrfried [7529] * code/trunk/src/external/enet/VERSION (added) enet version file added Mon, 11 Oct 2010 21:32:02 GMT rgrieder [7528] * code/branches/ois_update/src/libraries/util/SignalHandler.h (modified) Even linux only classes should carry the _LibraryExport macro. Mon, 11 Oct 2010 21:29:42 GMT rgrieder [7527] * code/branches/ois_update/src/libraries/core/CorePrereqs.h (modified) * code/branches/ois_update/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/ois_update/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/ois_update/src/libraries/util/UtilPrereqs.h (modified) * code/branches/ois_update/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/branches/ois_update/src/modules/notifications/NotificationsPrereqs.h (modified) * code/branches/ois_update/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/ois_update/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/ois_update/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ois_update/src/modules/pong/PongPrereqs.h (modified) * code/branches/ois_update/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/ois_update/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/ois_update/src/orxonox/OrxonoxPrereqs.h (modified) Added _LibraryPrivate macros to all LibraryPrereqs.h files. You can ... Mon, 11 Oct 2010 21:17:09 GMT rgrieder [7526] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Fixed GCC visibility: Default should be 'default', not 'hidden' for ... Mon, 11 Oct 2010 21:08:26 GMT rgrieder [7525] * code/branches/ois_update/src/OrxonoxConfig.cmake (modified) * code/branches/ois_update/src/OrxonoxConfig.h.in (modified) Architecture (32/64 bit) should be determined at compile time because ... Mon, 11 Oct 2010 20:39:58 GMT rgrieder [7524] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Postponing -march options for later. There are too many possible ... Mon, 11 Oct 2010 10:58:59 GMT rgrieder [7523] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Activated SSE on Linux and disabled Visibility again because of ... Mon, 11 Oct 2010 10:36:19 GMT rgrieder [7522] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Build fixes for code written on Windows Mon, 11 Oct 2010 10:32:23 GMT rgrieder [7521] * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) Bugfix (no GCC_VERSION variable with other compilers). Mon, 11 Oct 2010 10:29:16 GMT rgrieder [7520] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) * code/branches/ois_update/cmake/CompilerConfigMSVC.cmake (modified) Added some useful compiler options found in the Ogre build system. ... Sat, 09 Oct 2010 15:32:31 GMT rgrieder [7519] * code/branches/ois_update/CMakeLists.txt (modified) Trying to get OS X to compile with 32 bits. Sat, 09 Oct 2010 15:28:36 GMT rgrieder [7518] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) There was a hidden problem with the recent "radical change" after ... Sat, 09 Oct 2010 15:24:44 GMT rgrieder [7517] * code/branches/ois_update/CMakeLists.txt (modified) Radical change in build system. Should not make any difference ... Sat, 09 Oct 2010 14:12:02 GMT rgrieder [7516] * code/branches/ois_update/src/external/ois/changes_orxonox.diff (modified) * code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp (modified) Fixed wrong code in MacHIDManager (OIS). Sat, 09 Oct 2010 14:05:15 GMT rgrieder [7515] * code/branches/ois_update/src/modules/pickup/PickupCollection.h (modified) No new line at end of file. Sat, 09 Oct 2010 13:36:51 GMT rgrieder [7514] * code/branches/ois_update/src/OrxonoxConfig.cmake (modified) * code/branches/ois_update/src/OrxonoxConfig.h.in (modified) * code/branches/ois_update/src/libraries/core/command/Functor.h (modified) * code/branches/ois_update/src/libraries/util/SharedPtr.h (modified) This hopefully fixes some warnings with gcc 4.0. Fri, 08 Oct 2010 22:27:50 GMT rgrieder [7513] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Updated DynLib class to the newest version in the OGRE trunk. This ... Fri, 08 Oct 2010 07:23:29 GMT rgrieder [7512] * code/branches/ois_update/src/libraries/core/DynLib.h (modified) That should fix DynLib compiling on Mac. Thu, 07 Oct 2010 21:17:58 GMT rgrieder [7511] * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) Removed obsolete statement. Thu, 07 Oct 2010 21:12:05 GMT rgrieder [7510] * code/branches/ois_update/src/CMakeLists.txt (modified) Fixed something I should have seen a long time ago: Order of include ... Thu, 07 Oct 2010 19:30:12 GMT rgrieder [7509] * code/branches/ois_update/src/external/ois/mac/CMakeLists.txt (modified) No more compilations here as well. Thu, 07 Oct 2010 19:28:22 GMT rgrieder [7508] * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) Not using compilations to compile OIS for the moment. Thu, 07 Oct 2010 18:26:22 GMT rgrieder [7507] * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) * code/branches/ois_update/src/external/ois/mac/CMakeLists.txt (modified) Fixed CMakeLists files in OIS folder. Thu, 07 Oct 2010 18:21:33 GMT rgrieder [7506] * code/branches/ois_update/src/external/ois/OIS.h (modified) * code/branches/ois_update/src/external/ois/OISConfig.h (modified) * code/branches/ois_update/src/external/ois/OISInputManager.cpp (modified) * code/branches/ois_update/src/external/ois/OISKeyboard.h (modified) * code/branches/ois_update/src/external/ois/OISMultiTouch.h (added) * code/branches/ois_update/src/external/ois/OISPrereqs.h (modified) * code/branches/ois_update/src/external/ois/ReadMe.txt (modified) * code/branches/ois_update/src/external/ois/VERSION (modified) * code/branches/ois_update/src/external/ois/changes_orxonox.diff (modified) * code/branches/ois_update/src/external/ois/linux/LinuxInputManager.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxInputManager.h (modified) * code/branches/ois_update/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.h (modified) * code/branches/ois_update/src/external/ois/linux/LinuxMouse.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxPrereqs.h (modified) * code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp (modified) * code/branches/ois_update/src/external/ois/mac/MacHIDManager.h (modified) * code/branches/ois_update/src/external/ois/mac/MacInputManager.cpp (modified) * code/branches/ois_update/src/external/ois/mac/MacJoyStick.cpp (added) * code/branches/ois_update/src/external/ois/mac/MacJoyStick.h (added) * code/branches/ois_update/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32ForceFeedback.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32InputManager.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32InputManager.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32JoyStick.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32KeyBoard.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32KeyBoard.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32Mouse.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32Mouse.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32Prereqs.h (modified) Updated OIS source files to its current SVN trunk (r26). Thu, 07 Oct 2010 18:12:14 GMT rgrieder [7505] * code/branches/ois_update (copied) Wed, 06 Oct 2010 06:00:40 GMT dafrick [7504] * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (added) * code/trunk/src/orxonox/interfaces/PickupListener.h (added) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) Pickups module is now (from what I can tell after some basic testing) ... Fri, 01 Oct 2010 11:27:04 GMT scheusso [7503] * code/trunk/src/libraries/network/FunctionCall.cc (modified) don't know where this else got lost Wed, 29 Sep 2010 16:51:22 GMT scheusso [7502] * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) removing some debug stuff i forgot Wed, 29 Sep 2010 13:39:00 GMT dafrick [7501] * code/branches/masterserver (copied) New branch for Sandro to work on THE master server. Wed, 29 Sep 2010 12:52:47 GMT dafrick [7500] * code/trunk/data/gui/layouts/ChatBox.layout (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) Fixing same issue as in tutorial2 branch. Error only occurs (as far ... Wed, 29 Sep 2010 12:49:26 GMT dafrick [7499] * code/branches/tutorial2/data/gui/layouts/ChatBox.layout (modified) * code/branches/tutorial2/data/gui/scripts/ChatBox.lua (modified) Fix to get rid of lua/cegui error. Tue, 28 Sep 2010 20:11:25 GMT scheusso [7498] * code/branches/network3 (deleted) deleting old network3 branch Tue, 28 Sep 2010 20:10:56 GMT scheusso [7497] * code/branches/network4 (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/network4/src/modules/weapons/MuzzleFlash.cc (modified) merging network3 into network4 branch Tue, 28 Sep 2010 20:05:38 GMT scheusso [7496] * code/branches/network4 (copied) creating new network4 branch for network testing and (maybe also) ... Tue, 28 Sep 2010 19:48:32 GMT scheusso [7495] * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/FunctionCall.cc (modified) * code/trunk/src/libraries/network/FunctionCall.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) buffering incoming function calls for non-existing objects works now Tue, 28 Sep 2010 15:31:59 GMT dafrick [7494] * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (added) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) Some documenting and cleaning up/re-organization in pickups module. Mon, 27 Sep 2010 17:53:30 GMT dafrick [7493] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) Fixing small bug in Script (regarding number of executions). Fixed ... Sun, 26 Sep 2010 20:38:57 GMT dafrick [7492] * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) Reverting changes to Billboard. Apparently Ogre 1.4 doesn't support ... Sun, 26 Sep 2010 19:48:42 GMT dafrick [7491] * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) Implemented Billboard rotation. If there is a reason why it wasn't ... Sun, 26 Sep 2010 16:41:19 GMT scheusso [7490] * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/FunctionCall.cc (copied) * code/trunk/src/libraries/network/FunctionCall.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) cleaning up function calls a bit in order to buffer calls for not ... Fri, 24 Sep 2010 14:01:04 GMT dafrick [7489] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) Mostly more documentation. Fri, 24 Sep 2010 10:01:57 GMT dafrick [7488] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) Some more documentation. Making NotificationManager Root scope, ... Thu, 23 Sep 2010 21:57:08 GMT dafrick [7487] * code/trunk/doc/api/Groups.dox (modified) Forgot to actually commit largest doc part... Thu, 23 Sep 2010 21:54:16 GMT dafrick [7486] * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Cleanup in Script. Some more documenting in Notifications module. Thu, 23 Sep 2010 21:22:22 GMT jo [7485] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Last Man Standing already works basically. All game rules are ... Thu, 23 Sep 2010 11:00:42 GMT dafrick [7484] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) Doing some documentation. Thu, 23 Sep 2010 09:21:01 GMT dafrick [7483] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Removing some debug output and come minor cleaning up. Thu, 23 Sep 2010 09:12:22 GMT dafrick [7482] * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) Fixed Script class. Works now without having to rely on guessing how ... Wed, 22 Sep 2010 21:30:33 GMT jo [7481] * code/branches/lastmanstanding/data/levels/empty_level.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Die erste Arbeitsversion. Zum Testen muss man zuerst Bots hinzufügen, ... Wed, 22 Sep 2010 21:22:03 GMT jo [7480] * code/branches/lastmanstanding/data/levels/empty_level.oxw (modified) * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (added) * code/branches/lastmanstanding/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (added) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (added) initial upload Wed, 22 Sep 2010 20:47:28 GMT jo [7479] * code/branches/lastmanstanding (copied) Tue, 21 Sep 2010 22:00:42 GMT rgrieder [7478] * data/branches/cleanup/images/bumpmaps (deleted) * data/branches/cleanup/images/effects/atmosphere.png (moved) * data/branches/cleanup/images/effects/atmospheretype1.png (moved) * data/branches/cleanup/images/effects/atmospheretype2.png (moved) * data/branches/cleanup/images/effects/atmospheretype3.png (moved) * data/branches/cleanup/images/effects/atmospheretype4.png (moved) * data/branches/cleanup/images/effects/atmospheretype5.png (moved) * data/branches/cleanup/images/effects/backlightflare.png (moved) * data/branches/cleanup/images/effects/backlighttrail.png (moved) * data/branches/cleanup/images/effects/backlighttrail2.png (moved) * data/branches/cleanup/images/effects/bigflame.png (moved) * data/branches/cleanup/images/effects/bigflare1.png (moved) * data/branches/cleanup/images/effects/clouds.png (moved) * data/branches/cleanup/images/effects/explosion.png (moved) * data/branches/cleanup/images/effects/explosion3.png (moved) * data/branches/cleanup/images/effects/flare.png (moved) * data/branches/cleanup/images/effects/flare2.png (moved) * data/branches/cleanup/images/effects/flare2_1.png (moved) * data/branches/cleanup/images/effects/flaretrail.png (moved) * data/branches/cleanup/images/effects/ring_flare.png (moved) * data/branches/cleanup/images/effects/ring_flare2.png (moved) * data/branches/cleanup/images/effects/smoke.png (moved) * data/branches/cleanup/images/effects/smoke2.png (moved) * data/branches/cleanup/images/effects/smoke3.png (moved) * data/branches/cleanup/images/effects/smoke4.png (moved) Removed bumpmaps folder. Moved some effect files to 'effects'. Tue, 21 Sep 2010 21:53:33 GMT rgrieder [7477] * data/branches/cleanup/models/unused (added) * data/branches/cleanup/models/unused/Cone.mesh (moved) * data/branches/cleanup/models/unused/UEATransporter036.mesh (moved) * data/branches/cleanup/models/unused/UEATransporter036T.mesh (moved) * data/branches/cleanup/models/unused/assff_lod_med.mesh (moved) * data/branches/cleanup/models/unused/asteroid.mesh (moved) * data/branches/cleanup/models/unused/asteroid1.mesh (moved) * data/branches/cleanup/models/unused/asteroid2.mesh (moved) * data/branches/cleanup/models/unused/asteroid3.mesh (moved) * data/branches/cleanup/models/unused/asteroid4.mesh (moved) * data/branches/cleanup/models/unused/asteroid_UV_lq.mesh (moved) * data/branches/cleanup/models/unused/cube_yellow.mesh (moved) * data/branches/cleanup/models/unused/cwrench.mesh (moved) * data/branches/cleanup/models/unused/gwrench.mesh (moved) * data/branches/cleanup/models/unused/jumpthrust.mesh (moved) * data/branches/cleanup/models/unused/ogrehead.mesh (moved) * data/branches/cleanup/models/unused/spacecruiser_16.mesh (moved) * data/branches/cleanup/models/unused/starship.mesh (moved) Temporarily moved every unreferenced *.mesh file to a subfoler called ... Tue, 21 Sep 2010 21:22:35 GMT rgrieder [7476] * data/branches/cleanup/gui/looknfeel (deleted) Moved looknfeel files to the other repository (not yet committed). Tue, 21 Sep 2010 21:17:13 GMT rgrieder [7475] * data/branches/cleanup/images/PlasmaAufh_Aufh.jpg (moved) * data/branches/cleanup/images/PlasmaBlau.png (moved) * data/branches/cleanup/images/clouds.png (moved) * data/branches/cleanup/images/effects/LightningBall_1.png (moved) * data/branches/cleanup/images/effects/LightningBall_2.png (moved) * data/branches/cleanup/images/effects/LightningBall_3.png (moved) * data/branches/cleanup/images/effects/LightningBall_4.png (moved) * data/branches/cleanup/images/effects/LightningBall_5.png (moved) * data/branches/cleanup/images/effects/LightningBall_6.png (moved) * data/branches/cleanup/images/effects/LightningBall_7.png (moved) * data/branches/cleanup/images/effects/LightningBall_8.png (moved) * data/branches/cleanup/images/explosion.png (moved) * data/branches/cleanup/images/explosion3.png (moved) * data/branches/cleanup/images/flare.png (moved) * data/branches/cleanup/images/flare2.png (moved) * data/branches/cleanup/images/flare2_1.png (moved) * data/branches/cleanup/images/flaretrail.png (moved) * data/branches/cleanup/images/plasmaSilver_Tube.png (moved) * data/branches/cleanup/images/plasmagunParabol_Cylinder002.jpg (moved) * data/branches/cleanup/images/smoke.png (moved) * data/branches/cleanup/images/smoke2.png (moved) * data/branches/cleanup/images/smoke3.png (moved) * data/branches/cleanup/images/smoke4.png (moved) * data/branches/cleanup/images/thrust.jpg (moved) Moved some files again because I'm not sure whether they're really ... Tue, 21 Sep 2010 21:15:44 GMT dafrick [7474] * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/src/modules/notifications/Notification.cc (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestNotification.cc (deleted) * code/trunk/src/modules/questsystem/QuestNotification.h (deleted) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) Synchronizing Notifications. In the course of that, notifications ... Tue, 21 Sep 2010 19:50:41 GMT rgrieder [7473] * data/branches/cleanup/images/FairChar.png (moved) * data/branches/cleanup/images/GPN-2000-001437.png (moved) * data/branches/cleanup/images/gui (added) * data/branches/cleanup/images/gui/DriveIcons.png (moved) * data/branches/cleanup/images/gui/ReadMe.txt (moved) * data/branches/cleanup/images/gui/SleekSpace.png (moved) * data/branches/cleanup/images/gui/TaharezGreenLook.png (moved) * data/branches/cleanup/images/gui/TaharezLook.png (moved) * data/branches/cleanup/images/gui/WindowsLook.png (moved) * data/branches/cleanup/images/gui/pickup.png (moved) * data/branches/cleanup/images/gui/vanilla.png (moved) * data/branches/cleanup/images/main_menu_1.jpg (moved) * data/branches/cleanup/resources.oxr (modified) Moved images in gui/imagesets and adjusted resources.oxr Tue, 21 Sep 2010 16:46:19 GMT dafrick [7472] * data/branches/cleanup/images/effects/3arrowsup.png (moved) * data/branches/cleanup/images/effects/arrow.png (moved) * data/branches/cleanup/images/effects/asterix.png (moved) * data/branches/cleanup/images/effects/cross.png (moved) * data/branches/cleanup/images/effects/eye.png (moved) * data/branches/cleanup/images/effects/shield.png (moved) * data/branches/cleanup/images/effects/sphere.png (moved) Moving some files... Tue, 21 Sep 2010 16:18:39 GMT rgrieder [7471] * data/branches/cleanup/images/GLX_icon.tga (deleted) * data/branches/cleanup/images/bumpmaps (added) * data/branches/cleanup/images/decals (added) * data/branches/cleanup/images/decals/decal.jpg (moved) * data/branches/cleanup/images/effects (added) * data/branches/cleanup/images/effects/smokecolors.png (moved) Applied Felix's directory structure suggestion. (and removed ... Mon, 20 Sep 2010 18:44:45 GMT rgrieder [7470] * data/branches/cleanup/images (added) * data/branches/cleanup/images/3arrowsup.png (copied) * data/branches/cleanup/images/DroneBanner.png (copied) * data/branches/cleanup/images/Formation.png (copied) * data/branches/cleanup/images/GLX_icon.png (copied) * data/branches/cleanup/images/GLX_icon.tga (copied) * data/branches/cleanup/images/OrxonoxBlack.png (copied) * data/branches/cleanup/images/OrxonoxGREEN.png (copied) * data/branches/cleanup/images/OrxonoxORANGE.png (copied) * data/branches/cleanup/images/OrxonoxRED.png (copied) * data/branches/cleanup/images/OrxonoxYELLOW.png (copied) * data/branches/cleanup/images/PSO1024.jpg (copied) * data/branches/cleanup/images/Pickups.png (copied) * data/branches/cleanup/images/Sepia1D.png (copied) * data/branches/cleanup/images/arrow.png (copied) * data/branches/cleanup/images/arrows.png (copied) * data/branches/cleanup/images/asterix.png (copied) * data/branches/cleanup/images/atmosphere.png (copied) * data/branches/cleanup/images/atmospheretype1.png (copied) * data/branches/cleanup/images/atmospheretype2.png (copied) * data/branches/cleanup/images/atmospheretype3.png (copied) * data/branches/cleanup/images/atmospheretype4.png (copied) * data/branches/cleanup/images/atmospheretype5.png (copied) * data/branches/cleanup/images/backGround.png (copied) * data/branches/cleanup/images/backlightflare.png (copied) * data/branches/cleanup/images/backlighttrail.png (copied) * data/branches/cleanup/images/backlighttrail2.png (copied) * data/branches/cleanup/images/bigflame.png (copied) * data/branches/cleanup/images/bigflare1.png (copied) * data/branches/cleanup/images/cross.png (copied) * data/branches/cleanup/images/decal.jpg (copied) * data/branches/cleanup/images/eye.png (copied) * data/branches/cleanup/images/goldwrenchpickup.jpg (copied) * data/branches/cleanup/images/jumpturbinepickup.jpg (copied) * data/branches/cleanup/images/mapgrid.png (copied) * data/branches/cleanup/images/ogrelogo-small.jpg (copied) * data/branches/cleanup/images/ogrelogo.png (copied) * data/branches/cleanup/images/orxonox_logo.svg (copied) * data/branches/cleanup/images/overlay (added) * data/branches/cleanup/images/overlay/RadarDot.png (copied) * data/branches/cleanup/images/overlay/RadarSquare.png (copied) * data/branches/cleanup/images/overlay/RadarTriangle.png (copied) * data/branches/cleanup/images/overlay/bar1.png (added) * data/branches/cleanup/images/overlay/bar2.png (added) * data/branches/cleanup/images/overlay/bar2a.png (added) * data/branches/cleanup/images/overlay/bar2b.png (added) * data/branches/cleanup/images/overlay/bar2c.png (added) * data/branches/cleanup/images/overlay/centeroverlay.png (added) * data/branches/cleanup/images/overlay/console2.png (added) * data/branches/cleanup/images/overlay/console3.png (added) * data/branches/cleanup/images/overlay/console4.png (added) * data/branches/cleanup/images/overlay/console5.png (added) * data/branches/cleanup/images/overlay/crosshair.png (added) * data/branches/cleanup/images/overlay/crosshair2.png (copied) * data/branches/cleanup/images/overlay/crosshair3.png (copied) * data/branches/cleanup/images/overlay/cursor.png (copied) * data/branches/cleanup/images/overlay/cursor_console.png (copied) * data/branches/cleanup/images/overlay/damageoverlaybottom.png (copied) * data/branches/cleanup/images/overlay/damageoverlayleft.png (copied) * data/branches/cleanup/images/overlay/damageoverlayright.png (copied) * data/branches/cleanup/images/overlay/damageoverlaytop.png (copied) * data/branches/cleanup/images/overlay/directionarrows.png (copied) * data/branches/cleanup/images/overlay/directionarrows1.png (copied) * data/branches/cleanup/images/overlay/directionarrows2.png (copied) * data/branches/cleanup/images/overlay/directionarrows3.png (copied) * data/branches/cleanup/images/overlay/directionarrows4.png (copied) * data/branches/cleanup/images/overlay/healthbar_bar.png (copied) * data/branches/cleanup/images/overlay/healthbar_bg.png (copied) * data/branches/cleanup/images/overlay/radar.png (copied) * data/branches/cleanup/images/overlay/tdc.png (copied) * data/branches/cleanup/images/ring_flare.png (copied) * data/branches/cleanup/images/ring_flare2.png (copied) * data/branches/cleanup/images/sample_loading.jpg (copied) * data/branches/cleanup/images/sewer_001.png (copied) * data/branches/cleanup/images/shield.png (copied) * data/branches/cleanup/images/skyboxes (added) * data/branches/cleanup/images/skyboxes/skypanoramagen1_bk.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen1_dn.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen1_fr.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen1_lf.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen1_rt.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen1_up.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen2_bk.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen2_dn.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen2_fr.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen2_lf.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen2_rt.jpg (copied) * data/branches/cleanup/images/skyboxes/skypanoramagen2_up.jpg (copied) * data/branches/cleanup/images/skyboxes/starbox_bk.jpg (copied) * data/branches/cleanup/images/skyboxes/starbox_dn.jpg (copied) * data/branches/cleanup/images/skyboxes/starbox_fr.jpg (copied) * data/branches/cleanup/images/skyboxes/starbox_lf.jpg (copied) * data/branches/cleanup/images/skyboxes/starbox_rt.jpg (copied) * data/branches/cleanup/images/skyboxes/starbox_up.jpg (copied) * data/branches/cleanup/images/smokecolors.png (copied) * data/branches/cleanup/images/sphere.png (copied) * data/branches/cleanup/images/stockstealth.jpg (copied) * data/branches/cleanup/images/streak.png (copied) * data/branches/cleanup/images/textures (moved) * data/branches/cleanup/materials/textures/3arrowsup.png (deleted) * data/branches/cleanup/materials/textures/DroneBanner.png (deleted) * data/branches/cleanup/materials/textures/Formation.png (deleted) * data/branches/cleanup/materials/textures/GLX_icon.png (deleted) * data/branches/cleanup/materials/textures/GLX_icon.tga (deleted) * data/branches/cleanup/materials/textures/OrxonoxBlack.png (deleted) * data/branches/cleanup/materials/textures/OrxonoxGREEN.png (deleted) * data/branches/cleanup/materials/textures/OrxonoxORANGE.png (deleted) * data/branches/cleanup/materials/textures/OrxonoxRED.png (deleted) * data/branches/cleanup/materials/textures/OrxonoxYELLOW.png (deleted) * data/branches/cleanup/materials/textures/PSO1024.jpg (deleted) * data/branches/cleanup/materials/textures/Pickups.png (deleted) * data/branches/cleanup/materials/textures/RadarDot.png (deleted) * data/branches/cleanup/materials/textures/RadarSquare.png (deleted) * data/branches/cleanup/materials/textures/RadarTriangle.png (deleted) * data/branches/cleanup/materials/textures/Sepia1D.png (deleted) * data/branches/cleanup/materials/textures/arrow.png (deleted) * data/branches/cleanup/materials/textures/arrows.png (deleted) * data/branches/cleanup/materials/textures/asterix.png (deleted) * data/branches/cleanup/materials/textures/atmosphere.png (deleted) * data/branches/cleanup/materials/textures/atmospheretype1.png (deleted) * data/branches/cleanup/materials/textures/atmospheretype2.png (deleted) * data/branches/cleanup/materials/textures/atmospheretype3.png (deleted) * data/branches/cleanup/materials/textures/atmospheretype4.png (deleted) * data/branches/cleanup/materials/textures/atmospheretype5.png (deleted) * data/branches/cleanup/materials/textures/backGround.png (deleted) * data/branches/cleanup/materials/textures/backlightflare.png (deleted) * data/branches/cleanup/materials/textures/backlighttrail.png (deleted) * data/branches/cleanup/materials/textures/backlighttrail2.png (deleted) * data/branches/cleanup/materials/textures/bar1.png (deleted) * data/branches/cleanup/materials/textures/bar2.png (deleted) * data/branches/cleanup/materials/textures/bar2a.png (deleted) * data/branches/cleanup/materials/textures/bar2b.png (deleted) * data/branches/cleanup/materials/textures/bar2c.png (deleted) * data/branches/cleanup/materials/textures/bigflame.png (deleted) * data/branches/cleanup/materials/textures/bigflare1.png (deleted) * data/branches/cleanup/materials/textures/centeroverlay.png (deleted) * data/branches/cleanup/materials/textures/console2.png (deleted) * data/branches/cleanup/materials/textures/console3.png (deleted) * data/branches/cleanup/materials/textures/console4.png (deleted) * data/branches/cleanup/materials/textures/console5.png (deleted) * data/branches/cleanup/materials/textures/cross.png (deleted) * data/branches/cleanup/materials/textures/crosshair.png (deleted) * data/branches/cleanup/materials/textures/crosshair2.png (deleted) * data/branches/cleanup/materials/textures/crosshair3.png (deleted) * data/branches/cleanup/materials/textures/cursor.png (deleted) * data/branches/cleanup/materials/textures/cursor_console.png (deleted) * data/branches/cleanup/materials/textures/damageoverlaybottom.png (deleted) * data/branches/cleanup/materials/textures/damageoverlayleft.png (deleted) * data/branches/cleanup/materials/textures/damageoverlayright.png (deleted) * data/branches/cleanup/materials/textures/damageoverlaytop.png (deleted) * data/branches/cleanup/materials/textures/decal.jpg (deleted) * data/branches/cleanup/materials/textures/directionarrows.png (deleted) * data/branches/cleanup/materials/textures/directionarrows1.png (deleted) * data/branches/cleanup/materials/textures/directionarrows2.png (deleted) * data/branches/cleanup/materials/textures/directionarrows3.png (deleted) * data/branches/cleanup/materials/textures/directionarrows4.png (deleted) * data/branches/cleanup/materials/textures/eye.png (deleted) * data/branches/cleanup/materials/textures/goldwrenchpickup.jpg (deleted) * data/branches/cleanup/materials/textures/healthbar_bar.png (deleted) * data/branches/cleanup/materials/textures/healthbar_bg.png (deleted) * data/branches/cleanup/materials/textures/jumpturbinepickup.jpg (deleted) * data/branches/cleanup/materials/textures/mapgrid.png (deleted) * data/branches/cleanup/materials/textures/ogrelogo-small.jpg (deleted) * data/branches/cleanup/materials/textures/ogrelogo.png (deleted) * data/branches/cleanup/materials/textures/orxonox_logo.svg (deleted) * data/branches/cleanup/materials/textures/radar.png (deleted) * data/branches/cleanup/materials/textures/ring_flare.png (deleted) * data/branches/cleanup/materials/textures/ring_flare2.png (deleted) * data/branches/cleanup/materials/textures/sample_loading.jpg (deleted) * data/branches/cleanup/images/textures/seamless (copied) * data/branches/cleanup/images/textures/seamless/sl_floor01.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_floor02.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_floor03.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_foil.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_hull01.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_hull02.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_hull03.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_hull04.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal02.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal03.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal04.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal05.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal06.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_metal07.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_organic01.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_organic02.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_organic03.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_organic04.jpg (copied) * data/branches/cleanup/images/textures/seamless/sl_panel.jpg (copied) * data/branches/cleanup/materials/textures/sewer_001.png (deleted) * data/branches/cleanup/materials/textures/shield.png (deleted) * data/branches/cleanup/materials/textures/skypanoramagen1_bk.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen1_dn.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen1_fr.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen1_lf.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen1_rt.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen1_up.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen2_bk.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen2_dn.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen2_fr.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen2_lf.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen2_rt.jpg (deleted) * data/branches/cleanup/materials/textures/skypanoramagen2_up.jpg (deleted) * data/branches/cleanup/materials/textures/sl_floor01.jpg (deleted) * data/branches/cleanup/materials/textures/sl_floor02.jpg (deleted) * data/branches/cleanup/materials/textures/sl_floor03.jpg (deleted) * data/branches/cleanup/materials/textures/sl_foil.jpg (deleted) * data/branches/cleanup/materials/textures/sl_hull01.jpg (deleted) * data/branches/cleanup/materials/textures/sl_hull02.jpg (deleted) * data/branches/cleanup/materials/textures/sl_hull03.jpg (deleted) * data/branches/cleanup/materials/textures/sl_hull04.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal (deleted) * data/branches/cleanup/materials/textures/sl_metal.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal02.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal03.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal04.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal05.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal06.jpg (deleted) * data/branches/cleanup/materials/textures/sl_metal07.jpg (deleted) * data/branches/cleanup/materials/textures/sl_organic01.jpg (deleted) * data/branches/cleanup/materials/textures/sl_organic02.jpg (deleted) * data/branches/cleanup/materials/textures/sl_organic03.jpg (deleted) * data/branches/cleanup/materials/textures/sl_organic04.jpg (deleted) * data/branches/cleanup/materials/textures/sl_panel.jpg (deleted) * data/branches/cleanup/materials/textures/smokecolors.png (deleted) * data/branches/cleanup/materials/textures/sphere.png (deleted) * data/branches/cleanup/materials/textures/starbox_bk.jpg (deleted) * data/branches/cleanup/materials/textures/starbox_dn.jpg (deleted) * data/branches/cleanup/materials/textures/starbox_fr.jpg (deleted) * data/branches/cleanup/materials/textures/starbox_lf.jpg (deleted) * data/branches/cleanup/materials/textures/starbox_rt.jpg (deleted) * data/branches/cleanup/materials/textures/starbox_up.jpg (deleted) * data/branches/cleanup/materials/textures/stockstealth.jpg (deleted) * data/branches/cleanup/materials/textures/streak.png (deleted) * data/branches/cleanup/materials/textures/tdc.png (deleted) * data/branches/cleanup/materials/textures/tiled_floor.jpg (deleted) * data/branches/cleanup/materials/textures/wall01.jpg (deleted) * data/branches/cleanup/materials/textures/white.png (deleted) * data/branches/cleanup/images/tiled_floor.jpg (copied) * data/branches/cleanup/images/wall01.jpg (copied) * data/branches/cleanup/images/white.png (copied) * data/branches/cleanup/materials/3arrowsup.material (copied) * data/branches/cleanup/materials/Arrow.material (copied) * data/branches/cleanup/materials/Asterix.material (copied) * data/branches/cleanup/materials/Banners.material (copied) * data/branches/cleanup/materials/BlackAndWhite.material (copied) * data/branches/cleanup/materials/Bloom.material (copied) * data/branches/cleanup/materials/Bump_Specular.material (copied) * data/branches/cleanup/materials/Carrier.material (copied) * data/branches/cleanup/materials/Cone.material (copied) * data/branches/cleanup/materials/Console.material (copied) * data/branches/cleanup/materials/Cross.material (copied) * data/branches/cleanup/materials/CuboidSpaceStation.material (copied) * data/branches/cleanup/materials/DuBall.material (copied) * data/branches/cleanup/materials/Embossed.material (copied) * data/branches/cleanup/materials/Example.material (copied) * data/branches/cleanup/materials/Examples.compositor (copied) * data/branches/cleanup/materials/Examples.program (copied) * data/branches/cleanup/materials/Eye.material (copied) * data/branches/cleanup/materials/Flares.material (copied) * data/branches/cleanup/materials/Glass.material (copied) * data/branches/cleanup/materials/HXY.material (copied) * data/branches/cleanup/materials/Invert.material (copied) * data/branches/cleanup/materials/Laplace.material (copied) * data/branches/cleanup/materials/LightningGun-s.material (copied) * data/branches/cleanup/materials/LightningGun.material (copied) * data/branches/cleanup/materials/Map.material (copied) * data/branches/cleanup/materials/MotionBlur.compositor (copied) * data/branches/cleanup/materials/MotionBlur.material (copied) * data/branches/cleanup/materials/Ogre.material (copied) * data/branches/cleanup/materials/OldMovie.material (copied) * data/branches/cleanup/materials/OldTV.material (copied) * data/branches/cleanup/materials/Orxonox.material (copied) * data/branches/cleanup/materials/OrxonoxSky.material (copied) * data/branches/cleanup/materials/PE_materials.material (copied) * data/branches/cleanup/materials/Posterize.material (copied) * data/branches/cleanup/materials/RadialBlur.material (copied) * data/branches/cleanup/materials/Scene.material (copied) * data/branches/cleanup/materials/Shaders.compositor (copied) * data/branches/cleanup/materials/SharpenEdges.material (copied) * data/branches/cleanup/materials/Shield.material (copied) * data/branches/cleanup/materials/Sphere2.material (copied) * data/branches/cleanup/materials/Stats.material (copied) * data/branches/cleanup/materials/StdQuad_vp.program (copied) * data/branches/cleanup/materials/Test.material (copied) * data/branches/cleanup/materials/Tiling.material (copied) * data/branches/cleanup/materials/ToonShader.material (copied) * data/branches/cleanup/materials/Trail.material (copied) * data/branches/cleanup/materials/Transparency.material (copied) * data/branches/cleanup/materials/Transporter.material (copied) * data/branches/cleanup/materials/UEATransporter036.material (copied) * data/branches/cleanup/materials/assf.material (copied) * data/branches/cleanup/materials/assf5.material (copied) * data/branches/cleanup/materials/assff.material (copied) * data/branches/cleanup/materials/asteroid_ice.material (copied) * data/branches/cleanup/materials/asteroid_y.material (copied) * data/branches/cleanup/materials/asteroids.material (copied) * data/branches/cleanup/materials/axes.material (copied) * data/branches/cleanup/materials/can.material (copied) * data/branches/cleanup/materials/crate.material (copied) * data/branches/cleanup/materials/cube.material (copied) * data/branches/cleanup/materials/drone.material (copied) * data/branches/cleanup/materials/earth.material (copied) * data/branches/cleanup/materials/ghost.material (copied) * data/branches/cleanup/materials/h2_green.material (copied) * data/branches/cleanup/materials/hdr.material (copied) * data/branches/cleanup/materials/hoover.material (copied) * data/branches/cleanup/materials/hs-w01.material (copied) * data/branches/cleanup/materials/hs-w01_reduced.material (copied) * data/branches/cleanup/materials/hs-w01s.material (copied) * data/branches/cleanup/materials/iceplanet.material (copied) * data/branches/cleanup/materials/jumpthrust.material (copied) * data/branches/cleanup/materials/laserbeam.material (copied) * data/branches/cleanup/materials/pirate.material (copied) * data/branches/cleanup/materials/plane.material (copied) * data/branches/cleanup/materials/planet.material (copied) * data/branches/cleanup/materials/rock.material (copied) * data/branches/cleanup/materials/rocket.material (copied) * data/branches/cleanup/materials/satellite.material (copied) * data/branches/cleanup/materials/scripts (deleted) * data/branches/cleanup/materials/spacecruiser.material (copied) * data/branches/cleanup/materials/spacecruiser_16.material (copied) * data/branches/cleanup/materials/sphere.material (copied) * data/branches/cleanup/materials/starship.material (copied) * data/branches/cleanup/materials/swallow_material.material (copied) * data/branches/cleanup/materials/tomato.material (copied) * data/branches/cleanup/materials/wrench.material (copied) * data/branches/cleanup/programs (moved) * data/branches/cleanup/resources.oxr (modified) Suggestion for a clearer folder structure in the data repository. ...