# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 22, 2024, 3:08:55 PM Wed, 27 Oct 2010 20:39:48 GMT dafrick [7594] * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) Small adjustment to MainMenu.lua to illustrate how to change how a ... Wed, 27 Oct 2010 20:01:08 GMT rgrieder [7592] * code/branches/ois_update/src/external/ogreceguirenderer/CMakeLists.txt (modified) OgreCEGUIRenderer should not have a version number because none can ... Wed, 27 Oct 2010 15:47:50 GMT youngk [7591] * code/branches/ois_update/cmake/PackageConfigOSX.cmake (modified) * code/branches/ois_update/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/ois_update/src/orxonox/sound/SoundManager.cc (modified) * code/branches/ois_update/src/orxonox/sound/WorldSound.cc (modified) Adjusted inclusion of ALUT header files for mac and edited the ... Wed, 27 Oct 2010 14:16:08 GMT smerkli [7590] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (modified) done for today, everything compiles, test client as well. beginning ... Wed, 27 Oct 2010 13:24:56 GMT smerkli [7589] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.cpp (modified) * code/branches/masterserver/src/modules/masterserver/TestClient.cpp (added) wrote some test client and further implemented the master server ... Wed, 27 Oct 2010 11:15:28 GMT dafrick [7588] * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) * code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc (modified) Adjustments to allow key input in MainMenu and first steps towards ... Wed, 27 Oct 2010 11:11:24 GMT konrad [7587] * code/branches/menu/data/gui/layouts/HostMenu.layout (added) * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/menu/data/gui/scripts/HostMenu.lua (added) * code/branches/menu/data/gui/scripts/MenuSheet.lua (modified) * code/branches/menu/data/gui/scripts/MultiplayerMenu.lua (modified) changes in the multiplayer menu, 2 buttons instead of 3: host and ... Tue, 26 Oct 2010 19:14:45 GMT jo [7586] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) HUD bug removed. Tue, 26 Oct 2010 19:01:48 GMT jo [7585] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) With collisionshapes. Still problems with collisionshapes and movable ... Mon, 25 Oct 2010 21:49:25 GMT jo [7584] * code/branches/lastmanstanding/data/levels/gametype_asteroids.oxw (modified) Changed values in the Asteroid Gametype. Now it's a challenge, but ... Mon, 25 Oct 2010 21:11:04 GMT jo [7583] * code/branches/lastmanstanding/data/overlays/dynamicmatchhud.oxo (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Changed inheritance. instead of Gametype it's Deathmatch. Mon, 25 Oct 2010 21:05:34 GMT rgrieder [7582] * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) * code/branches/ois_update/cmake/PackageConfig.cmake (modified) * code/branches/ois_update/cmake/PackageConfigOSX.cmake (copied) * code/branches/ois_update/cmake/tools/CheckPackageVersion.cmake (copied) Added CMake code for OS X package configuration. Not guaranteed to ... Mon, 25 Oct 2010 20:21:53 GMT jo [7581] * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (added) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Almost finished. Yeay. Sun, 24 Oct 2010 18:33:58 GMT smerkli [7580] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.h (modified) Further implementation, constructing a testing environment soon. Fri, 22 Oct 2010 14:19:40 GMT jo [7579] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/data/overlays/dynamicmatchhud.oxo (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Jetzt auch mit einfachem HUD. Thu, 21 Oct 2010 21:45:26 GMT youngk [7578] * code/branches/ois_update/src/libraries/network/LANDiscoverable.cc (modified) Added missing inclusion of Debug.h in network target. Thu, 21 Oct 2010 21:32:28 GMT rgrieder [7577] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Trying another fix: Load plugins on OS X as we do on Linux. Thu, 21 Oct 2010 21:26:17 GMT rgrieder [7576] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Fixed typo. Thu, 21 Oct 2010 21:16:39 GMT rgrieder [7575] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Copied code for Ogre::mac_loadDylib to DynLib.h because the symbol ... Wed, 20 Oct 2010 21:34:21 GMT smerkli [7574] * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (added) * code/branches/masterserver/src/modules/masterserver/PeerList.h (added) initial peerlist stuff, implementation to follow sometime this week Wed, 20 Oct 2010 21:26:44 GMT jo [7573] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) Looks a little bit more like Stonehenge:-) Wed, 20 Oct 2010 20:46:38 GMT rgrieder [7572] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) Reverted changes in BaseObject.h Wed, 20 Oct 2010 15:35:10 GMT youngk [7571] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) * code/branches/ois_update/src/libraries/core/PathConfig.cc (modified) * code/branches/ois_update/src/libraries/core/Super.h (modified) Changes to Super.h: Macro collision. Again. Wed, 20 Oct 2010 13:50:05 GMT rgrieder [7570] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) Testing... 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: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 ...