# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 24, 2024, 6:48:54 PM Thu, 12 May 2011 12:24:39 GMT smerkli [8460] * code/branches/portals2 (copied) created. Thu, 12 May 2011 12:24:26 GMT smerkli [8459] * code/branches/spaceboundaries2 (copied) Thu, 12 May 2011 11:22:55 GMT anbueche [8455] * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) * code/branches/portals/src/modules/portals/PortalLink.cc (modified) * code/branches/portals/src/modules/portals/PortalLink.h (modified) comments added Thu, 12 May 2011 11:17:38 GMT anbueche [8454] * code/branches/portals/data/levels/portals.oxw (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) comments added Wed, 11 May 2011 22:31:23 GMT dafrick [8453] * code/branches/tutoriallevel3 (modified) * code/branches/tutoriallevel3/data/gui/layouts/QuestGUI.layout (modified) * code/branches/tutoriallevel3/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel3/data/gui/scripts/QuestGUI.lua (modified) * code/branches/tutoriallevel3/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/tutoriallevel3/data/levels/quests.oxw (copied) * code/branches/tutoriallevel3/data/overlays/debug.oxo (modified) * code/branches/tutoriallevel3/doc/api/groups/Triggers.dox (modified) * code/branches/tutoriallevel3/src/libraries/core/GUIManager.cc (modified) * code/branches/tutoriallevel3/src/libraries/core/GUIManager.h (modified) * code/branches/tutoriallevel3/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/tutoriallevel3/src/libraries/util/SubString.h (modified) * code/branches/tutoriallevel3/src/modules/notifications/CMakeLists.txt (modified) * code/branches/tutoriallevel3/src/modules/notifications/Notification.cc (deleted) * code/branches/tutoriallevel3/src/modules/notifications/Notification.h (deleted) * code/branches/tutoriallevel3/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/branches/tutoriallevel3/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/tutoriallevel3/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/tutoriallevel3/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/branches/tutoriallevel3/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/branches/tutoriallevel3/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/tutoriallevel3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/tutoriallevel3/src/modules/questsystem/QuestManager.h (modified) * code/branches/tutoriallevel3/src/orxonox/LevelManager.cc (modified) * code/branches/tutoriallevel3/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/tutoriallevel3/src/orxonox/gametypes/Gametype.h (modified) * code/branches/tutoriallevel3/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/tutoriallevel3/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/tutoriallevel3/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/tutoriallevel3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/tutoriallevel3/src/orxonox/interfaces/NotificationListener.cc (copied) * code/branches/tutoriallevel3/src/orxonox/interfaces/NotificationListener.h (modified) Merging tutoriallevel2 branch into tutoriallevel3 branch. Wed, 11 May 2011 22:17:26 GMT dafrick [8452] * code/branches/tutoriallevel3 (copied) New tutoriallevel branch to start testing network in, since in the ... Wed, 11 May 2011 22:15:05 GMT dafrick [8451] * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) Modifying the currently active notification queues. Wed, 11 May 2011 22:11:53 GMT dafrick [8450] * code/branches/tutoriallevel2/data/overlays/debug.oxo (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/branches/tutoriallevel2/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/tutoriallevel2/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/branches/tutoriallevel2/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/branches/tutoriallevel2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/tutoriallevel2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/tutoriallevel2/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/tutoriallevel2/src/orxonox/infos/GametypeInfo.h (modified) Replacing GametypeStatus overlay with notifications. Wed, 11 May 2011 20:55:30 GMT dafrick [8449] * code/branches/tutoriallevel2/src/modules/notifications/CMakeLists.txt (modified) * code/branches/tutoriallevel2/src/modules/notifications/Notification.cc (deleted) * code/branches/tutoriallevel2/src/modules/notifications/Notification.h (deleted) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.cc (modified) Moving the Notification class int NotificationManager, since it is ... Wed, 11 May 2011 20:45:56 GMT dafrick [8448] * code/branches/tutoriallevel2/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel2/src/modules/notifications/Notification.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h (modified) Extending NotificationQueueCEGUI. Wed, 11 May 2011 20:44:25 GMT dafrick [8447] * code/branches/tutoriallevel2/doc/api/groups/Triggers.dox (modified) * code/branches/tutoriallevel2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/tutoriallevel2/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/tutoriallevel2/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/tutoriallevel2/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/tutoriallevel2/src/modules/questsystem/QuestManager.cc (modified) Resolving some doxygen warnings. Wed, 11 May 2011 10:21:32 GMT dafrick [8446] * code/branches/tutoriallevel2/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel2/src/modules/notifications/CMakeLists.txt (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.cc (added) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.h (added) Removing editMode stuff, since that doesn't work anymore and that ... Tue, 10 May 2011 21:37:22 GMT dafrick [8445] * code/branches/tutoriallevel2/src/modules/notifications/Notification.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/Notification.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h (modified) NotificationListener is new an entity which is informed of new ... Tue, 10 May 2011 19:27:03 GMT dafrick [8444] * code/branches/tutoriallevel2/src/libraries/util/SubString.h (modified) Fixing typo. Mon, 09 May 2011 16:49:10 GMT rgrieder [8440] * code/branches/unity_build (copied) New branch to work on so called 'Unity Builds', known in Orxonox as ... Mon, 09 May 2011 14:47:38 GMT marwegma [8435] * code/branches/environment2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/environment2/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.cc (added) * code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.h (added) GlobalGodrayShader added, but not yet finished. Mon, 09 May 2011 14:26:37 GMT sven [8434] * code/branches/dockingsystem2/data/gui/layouts/DockingDialog.layout (added) * code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua (added) * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.h (modified) Added simple GUI for docking.. Mon, 09 May 2011 13:58:48 GMT ssgier [8433] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) working on continuous shrinking Mon, 09 May 2011 13:56:13 GMT mastalde [8431] * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) added lift_ and stallSpeed_ for better flight behavior without errors... Mon, 09 May 2011 13:52:35 GMT mastalde [8430] * code/branches/steering/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/steering/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h (modified) added lift_ and stallSpeed_ for better flight behavior Mon, 09 May 2011 13:38:24 GMT jonas [8429] * code/branches/weapons/data/levels/emptyLevel.oxw (modified) * code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi (modified) model attached, flare stimmt, effect noch nicht... Mon, 09 May 2011 13:29:57 GMT msalomon [8428] * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.h (modified) Space Race gamtype with a clock and a set to save the time of the player. Mon, 09 May 2011 13:19:22 GMT dboehi [8427] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Shake effect now depends on the velocity of the space ship Mon, 09 May 2011 12:59:07 GMT decryphe [8426] * code/branches/bigships/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/bigships/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/bigships/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/branches/bigships/src/orxonox/controllers/HumanController.cc (modified) * code/branches/bigships/src/orxonox/controllers/HumanController.h (modified) * code/branches/bigships/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/bigships/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/bigships/src/orxonox/items/Engine.cc (modified) * code/branches/bigships/src/orxonox/items/Engine.h (modified) * code/branches/bigships/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/bigships/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/bigships/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/bigships/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.h (modified) - Moved handling of blur effect from Engine.cc to SpaceShip.cc. - ... Sun, 08 May 2011 21:45:32 GMT dafrick [8422] * code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/pickup/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc (modified) Documenting collision shapes in an effort to understand them and ... Thu, 05 May 2011 14:14:07 GMT kmaurus [8404] * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) some adaptations and improvements Thu, 05 May 2011 13:27:39 GMT smerkli [8401] * code/branches/masterserver2/src/libraries/network/WANDiscoverable.cc (modified) nothing actually changed. Tue, 03 May 2011 18:52:26 GMT simonmie [8395] * code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi (added) * code/branches/gameimmersion/data/levels/templates/spaceshipImmTest.oxt (added) test-Spaceship and test-WeaponSettings files added Mon, 02 May 2011 21:50:21 GMT youngk [8391] * code/branches/mac_osx2/data/levels/planets.oxw (modified) Added gravitational pull to both planets. This is getting fun! Mon, 02 May 2011 20:54:01 GMT youngk [8390] * code/branches/mac_osx2/data/levels/planets.oxw (modified) * code/branches/mac_osx2/src/modules/objects/Planet.cc (modified) Yess-a-doo! Okay, planets now have collision shapes. Follow the ... Mon, 02 May 2011 20:30:40 GMT youngk [8389] * code/branches/mac_osx2/data/levels/planets.oxw (modified) * code/branches/mac_osx2/src/modules/objects/Planet.cc (modified) Adding Collision Shapes to Planets. Doesn't currently work. Mon, 02 May 2011 20:30:09 GMT youngk [8388] * code/branches/mac_osx2/CMakeLists.txt (modified) * code/branches/mac_osx2/cmake/BundleConfig.cmake (modified) Disabling CPack again. Needs a LOT of adjustments still. Mon, 02 May 2011 15:17:20 GMT simonmie [8386] * code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/gameimmersion/src/orxonox/controllers/Controller.h (modified) * code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) New shielddamage implemented, depending functions changed, bugs ... Mon, 02 May 2011 14:19:43 GMT sven [8383] * code/branches/dockingsystem2/src/modules/docking/Dock.h (modified) Fixed an include. Mon, 02 May 2011 14:16:27 GMT sven [8382] * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified) * code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified) Added dock/undock console commands. Mon, 02 May 2011 13:58:10 GMT ssgier [8381] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) started creating a more efficient code structure Mon, 02 May 2011 12:18:04 GMT dboehi [8379] * code/branches/gameimmersion (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.cc (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.h (modified) * code/branches/gameimmersion/src/orxonox/items/Engine.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Changed the camera shake effect to work with the updated boost code. Mon, 02 May 2011 11:58:12 GMT dafrick [8378] * code/branches/tutoriallevel2/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h (modified) Notification text alignment can be set per queue. Mon, 02 May 2011 11:33:24 GMT dafrick [8377] * code/branches/tutoriallevel2/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/tutoriallevel2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h (modified) Text coloring in notification queue now working. Mon, 02 May 2011 11:31:18 GMT dafrick [8376] * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.cc (added) Forgot to add NotificationListener. Mon, 02 May 2011 11:22:15 GMT ssgier [8375] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (added) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (added) added source files for ShrinkPickup Mon, 02 May 2011 08:20:45 GMT dafrick [8374] * code/branches/tutoriallevel2/src/modules/notifications/Notification.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/Notification.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h (modified) Changes in notifications module structure. Notifications can now be ... Sun, 01 May 2011 12:43:33 GMT dafrick [8371] * code/branches/tutoriallevel2 (modified) * code/branches/tutoriallevel2/data/gui/layouts/QuestGUI.layout (modified) * code/branches/tutoriallevel2/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/tutoriallevel2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/tutoriallevel2/data/levels/quests.oxw (copied) * code/branches/tutoriallevel2/src/libraries/core/GUIManager.cc (modified) * code/branches/tutoriallevel2/src/libraries/core/GUIManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel2/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/tutoriallevel2/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/tutoriallevel2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/tutoriallevel2/src/modules/questsystem/QuestManager.h (modified) * code/branches/tutoriallevel2/src/orxonox/LevelManager.cc (modified) Merging tutoriallevel branch into tutoriallevel2 branch. Sun, 01 May 2011 12:16:43 GMT dafrick [8370] * code/branches/tutoriallevel/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel/src/modules/notifications/NotificationManager.cc (modified) Committing changes before merge. Sun, 01 May 2011 12:05:51 GMT dafrick [8369] * code/branches/tutoriallevel2 (copied) New branch to work on tutorial level. Thu, 28 Apr 2011 20:27:45 GMT youngk [8360] * code/branches/mac_osx2/CMakeLists.txt (modified) * code/branches/mac_osx2/cmake/BundleConfig.cmake (modified) * code/branches/mac_osx2/cmake/PrepareDevBundle.cmake (modified) * code/branches/mac_osx2/contrib/mac (moved) Moved Apple bundle files to contrib. Thu, 28 Apr 2011 14:29:37 GMT rgrieder [8356] * code/branches/mac_osx2 (modified) * code/branches/mac_osx2/cmake/tools/TargetUtilities.cmake (modified) * code/branches/mac_osx2/data/mac/Orxonox-Info.plist (modified) * code/branches/mac_osx2/src/CMakeLists.txt (modified) * code/branches/mac_osx2/src/Orxonox.cc (modified) * code/branches/mac_osx2/src/OrxonoxMac.mm (modified) * code/branches/mac_osx2/src/external/CMakeLists.txt (modified) * code/branches/mac_osx2/src/external/cmcrashreporter (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporter.h (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporter.m (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporter.tmproj (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterGlobal.h (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterGlobal.m (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterWindow.h (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterWindow.m (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterWindow.nib (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterWindow.nib/designable.nib (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterWindow.nib/keyedobjects.nib (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMCrashReporterWindow.xib (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/CMakeLists.txt (copied) * code/branches/mac_osx2/src/external/cmcrashreporter/read-me.txt (copied) Merged remaining revisions in mac_osx to mac_osx2 branch. Thu, 28 Apr 2011 14:24:03 GMT rgrieder [8355] * code/branches/environment2 (copied) Created environment2 branch as part of a branch update. Thu, 28 Apr 2011 09:58:46 GMT youngk [8354] * code/branches/mac_osx2/cmake/LibraryConfig.cmake (modified) Logs aren't very useful if nothing is in them. Thu, 28 Apr 2011 09:42:09 GMT youngk [8353] * code/branches/mac_osx2 (copied) Creating branch mac_osx2 from trunk. Thu, 28 Apr 2011 01:51:38 GMT rgrieder [8350] * code/branches/kicklib2/cmake/LibraryConfig.cmake (modified) Moved Apple specific variables into APPLE section. Thu, 28 Apr 2011 00:47:09 GMT youngk [8349] * code/branches/kicklib2/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib2/cmake/PackageConfigOSX.cmake (modified) The Mac OS X dependency package is now downloaded and installed ... Wed, 27 Apr 2011 22:04:34 GMT youngk [8348] * code/branches/kicklib2/cmake/PackageConfigOSX.cmake (modified) Version bump of dependency package. Anything from kicklib2 and up ... Wed, 27 Apr 2011 19:45:02 GMT rgrieder [8347] * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) No --no-undefined for apple. Wed, 27 Apr 2011 13:58:12 GMT rgrieder [8345] * code/branches/kicklib2/src/libraries/util/CMakeLists.txt (modified) Build time optimisation in util (not that it actually matters...) Wed, 27 Apr 2011 03:11:55 GMT rgrieder [8344] * code/branches/kicklib2/src/libraries/network/CMakeLists.txt (modified) * code/branches/kicklib2/src/libraries/tools/CMakeLists.txt (modified) * code/branches/kicklib2/src/orxonox/CMakeLists.txt (modified) Cleaned up library dependencies a little bit to list exactly those ... Wed, 27 Apr 2011 00:38:40 GMT rgrieder [8343] * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) Orxonox compiles fine now with --no-undefined Wed, 27 Apr 2011 00:34:56 GMT rgrieder [8342] * code/branches/kicklib2/src/external/enet/CMakeLists.txt (modified) ENet has recently been updated to v1.3.1. Wed, 27 Apr 2011 00:34:12 GMT rgrieder [8341] * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib2/src/external/enet/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/ois/CMakeLists.txt (modified) * code/branches/kicklib2/src/libraries/core/CMakeLists.txt (modified) Added new library linking keywords for the Add Target Command. That ... Tue, 26 Apr 2011 20:50:18 GMT rgrieder [8340] * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) * code/branches/kicklib2/src/libraries/util/CMakeLists.txt (modified) Remove some extra code that removes warnings in older GCC versions (< ... Tue, 26 Apr 2011 20:39:56 GMT rgrieder [8339] * code/branches/kicklib2/src/external/enet/CMakeLists.txt (modified) Some more hackery that isn't necessary anymore. Tue, 26 Apr 2011 20:34:23 GMT rgrieder [8338] * code/branches/kicklib2/src/external/ois/CMakeLists.txt (modified) Random hack not anymore required. Tue, 26 Apr 2011 16:33:00 GMT rgrieder [8337] * code/branches/kicklib2/CMakeLists.txt (modified) * code/branches/kicklib2/cmake/LibraryConfigTardis.cmake (modified) * code/branches/kicklib2/contrib/CMakeLists.txt (modified) * code/branches/kicklib2/src/OrxonoxConfig.cmake (modified) Defined CMake variable LINUX. Tue, 26 Apr 2011 04:49:49 GMT rgrieder [8336] * code/branches/kicklib2/src/libraries/core/GUIManager.cc (modified) * code/branches/kicklib2/src/libraries/core/GUIManager.h (modified) Added solution to the rendering order problem proposed by Crazy ... Tue, 26 Apr 2011 04:43:42 GMT rgrieder [8335] * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) --no-undefined reveals that OIS is missing some symbols. However I ... Tue, 26 Apr 2011 04:14:54 GMT rgrieder [8334] * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) * code/branches/kicklib2/src/libraries/util/Exception.cc (modified) Two build fixes for GCC 4.6 (thx ultimA) Tue, 26 Apr 2011 02:46:26 GMT rgrieder [8333] * code/branches/kicklib2/src/libraries/util/Math.h (modified) * code/branches/kicklib2/src/modules/designtools/CreateStars.cc (modified) * code/branches/kicklib2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/kicklib2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/kicklib2/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/branches/kicklib2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) Removed double precision versions of the mathematical constants and ... Tue, 26 Apr 2011 00:52:04 GMT rgrieder [8332] * code/branches/kicklib2/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/branches/kicklib2/src/orxonox/graphics/BlinkingBillboard.h (modified) BlinkingBillboard should not use long double for storing the time ... Tue, 26 Apr 2011 00:50:03 GMT rgrieder [8331] * code/branches/kicklib2/src/libraries/util/ExprParser.cc (modified) * code/branches/kicklib2/src/libraries/util/ExprParser.h (modified) Converted ExprParser to use float instead of double. Mon, 25 Apr 2011 22:33:09 GMT scheusso [8330] * code/branches/network6 (deleted) removing old network6 branch Mon, 25 Apr 2011 18:49:59 GMT rgrieder [8328] * code/branches/kicklib2/CMakeLists.txt (modified) Orxonox only works with newer CMake builds if using Visual Studio 2010. Mon, 25 Apr 2011 13:29:58 GMT rgrieder [8326] * code/branches/kicklib2/src/libraries/util/SignalHandler.cc (modified) Use C++ version of C headers. Mon, 25 Apr 2011 08:09:04 GMT dafrick [8325] * code/branches/kicklib2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/kicklib2/src/orxonox/sound/SoundManager.h (modified) AudioMenu is only accessible if the SoundManager exists. Mon, 25 Apr 2011 08:06:49 GMT dafrick [8324] * code/branches/kicklib2/src/libraries/util/SignalHandler.cc (modified) Added missing include. Now also compiles on ubntu. Mon, 25 Apr 2011 00:52:25 GMT rgrieder [8323] * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) * code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake (modified) Enable non standard compliant floating point optimisations like a * ... Sun, 24 Apr 2011 22:47:15 GMT rgrieder [8322] * code/branches/kicklib2/src/orxonox/sound/SoundManager.cc (modified) OpenAL message not anymore necessary: problem fixed by adding ... Sun, 24 Apr 2011 20:39:59 GMT rgrieder [8321] * code/branches/kicklib2/CMakeLists.txt (modified) * code/branches/kicklib2/cmake/InstallCheck.cmake (added) Prevent installation of debug builds (not supported). Sun, 24 Apr 2011 04:48:55 GMT rgrieder [8320] * code/branches/kicklib2/src/libraries/util/CMakeLists.txt (modified) Removed SignalHandler.cc from StableCompilation.cc in util because it ... Sun, 24 Apr 2011 04:19:47 GMT rgrieder [8319] * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) String compare seems different with cmake 2.6.0 Sun, 24 Apr 2011 03:48:53 GMT rgrieder [8318] * code/branches/kicklib2/cmake/InstallConfig.cmake (modified) * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib2/src/OrxonoxConfig.cmake (modified) RPATH handling was broken in certain cases, esp. for "turn-key" ... Sun, 24 Apr 2011 03:46:26 GMT rgrieder [8317] * code/branches/kicklib2/bin/CMakeLists.txt (modified) * code/branches/kicklib2/cmake/InstallConfig.cmake (modified) * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib2/src/SpecialConfig.h.in (modified) Do not specify the CMAKE_INSTALL_PREFIX when using the INSTALL ... Sat, 23 Apr 2011 20:28:14 GMT scheusso [8315] * code/branches/network6/src/libraries/network/GamestateManager.cc (modified) fixing an assertion Sat, 23 Apr 2011 02:52:30 GMT rgrieder [8313] * code/branches/kicklib2/src/libraries/network/ClientInformation.cc (modified) * code/branches/kicklib2/src/libraries/network/ClientInformation.h (modified) * code/branches/kicklib2/src/libraries/network/Server.cc (modified) * code/branches/kicklib2/src/libraries/network/Server.h (modified) Not using doubles at all in Orxonox because the Renderer (DirectX in ... Sat, 23 Apr 2011 00:28:24 GMT rgrieder [8312] * code/branches/kicklib2/src/libraries/core/ConfigValueContainer.cc (modified) * code/branches/kicklib2/src/libraries/core/input/KeyBinder.cc (modified) Fixed warning and removed unreachable and strange line of code. Fri, 22 Apr 2011 23:26:52 GMT rgrieder [8311] * code/branches/kicklib2/bin/masterserver.bat.in (modified) * code/branches/kicklib2/bin/masterserver.in (modified) * code/branches/kicklib2/cmake/BundleConfig.cmake (modified) * code/branches/kicklib2/cmake/PrepareDevBundle.cmake (modified) * code/branches/kicklib2/contrib/CMakeLists.txt (modified) * code/branches/kicklib2/contrib/orxonox.desktop (modified) * code/branches/kicklib2/contrib/orxonox.manpage.xml (modified) * code/branches/kicklib2/data/levels/lastTeamStandingII.oxw (modified) * code/branches/kicklib2/data/levels/planets.oxw (modified) * code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings (modified) * code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib (modified) * code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib (modified) * code/branches/kicklib2/data/mac/Orxonox-Info.plist (modified) * code/branches/kicklib2/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/kicklib2/doc/api/groups/Notifications.dox (modified) * code/branches/kicklib2/doc/api/groups/Pickup.dox (modified) * code/branches/kicklib2/doc/api/groups/Questsystem.dox (modified) * code/branches/kicklib2/doc/api/groups/Triggers.dox (modified) * code/branches/kicklib2/src/OrxonoxMac.h (modified) * code/branches/kicklib2/src/OrxonoxMac.mm (modified) * code/branches/kicklib2/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/kicklib2/src/libraries/network/LANDiscoverable.h (modified) * code/branches/kicklib2/src/libraries/network/LANDiscovery.cc (modified) * code/branches/kicklib2/src/libraries/network/LANDiscovery.h (modified) * code/branches/kicklib2/src/libraries/network/MasterServer.cc (modified) * code/branches/kicklib2/src/libraries/network/MasterServer.h (modified) * code/branches/kicklib2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/kicklib2/src/libraries/network/MasterServerComm.h (modified) * code/branches/kicklib2/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/kicklib2/src/libraries/network/PeerList.cc (modified) * code/branches/kicklib2/src/libraries/network/PeerList.h (modified) * code/branches/kicklib2/src/libraries/network/ServerList.cc (modified) * code/branches/kicklib2/src/libraries/network/ServerList.h (modified) * code/branches/kicklib2/src/libraries/network/WANDiscoverable.cc (modified) * code/branches/kicklib2/src/libraries/network/WANDiscoverable.h (modified) * code/branches/kicklib2/src/libraries/network/WANDiscovery.cc (modified) * code/branches/kicklib2/src/libraries/network/WANDiscovery.h (modified) * code/branches/kicklib2/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/kicklib2/src/libraries/network/packet/ServerInformation.h (modified) * code/branches/kicklib2/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/branches/kicklib2/src/modules/questsystem/effects/CMakeLists.txt (modified) * code/branches/kicklib2/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/kicklib2/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/branches/kicklib2/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/branches/kicklib2/src/orxonox/interfaces/PickupListener.cc (modified) * code/branches/kicklib2/src/orxonox/interfaces/PickupListener.h (modified) svn:eol-style "native" for all text based files. Also removed the ... Fri, 22 Apr 2011 20:32:43 GMT rgrieder [8308] * code/branches/kicklib2/src/libraries/core/command/TclThreadManager.cc (modified) Delete standard Tcl interpreter bundle when closing the application. ... Fri, 22 Apr 2011 20:23:04 GMT rgrieder [8307] * code/branches/kicklib2/src/orxonox/PawnManager.cc (modified) * code/branches/kicklib2/src/orxonox/PawnManager.h (modified) * code/branches/kicklib2/src/orxonox/worldentities/pawns/Pawn.cc (modified) Manage PawnManager by Scopes. Then the singleton should get deleted ... Fri, 22 Apr 2011 18:43:36 GMT rgrieder [8304] * code/branches/kicklib2/src/libraries/core/GUIManager.cc (modified) New CEGUI (>= v0.7) doesn't delete the Logger anymore. Fri, 22 Apr 2011 16:42:42 GMT kmaurus [8301] * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) several billboards that represent the boundary can be displayed now Fri, 22 Apr 2011 16:26:47 GMT rgrieder [8299] * code/branches/kicklib2/src/CMakeLists.txt (modified) Define minimum Windows version we build Orxonox for. That also ... Fri, 22 Apr 2011 16:23:45 GMT rgrieder [8298] * code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/kicklib2/src/external/cpptcl/changes_orxonox.diff (modified) * code/branches/kicklib2/src/external/cpptcl/cpptcl.cc (modified) Fixed build for MSVC 10: disabling the C++0x features seems a bad ... Fri, 22 Apr 2011 06:48:08 GMT dafrick [8296] * code/branches/kicklib2/src/modules/pong/Pong.h (modified) Pong CenterPoint should be PongCenterpoint. Fri, 22 Apr 2011 02:07:25 GMT rgrieder [8295] * code/branches/kicklib2/src/libraries/core/DynLib.cc (modified) Use our own platform macros Fri, 22 Apr 2011 01:39:14 GMT rgrieder [8294] * code/branches/kicklib2/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/kicklib2/src/modules/pong/Pong.h (modified) Added two missing includes not showing up when compiling with PCH. Fri, 22 Apr 2011 01:38:10 GMT rgrieder [8293] * code/branches/kicklib2/src/libraries/core/Core.cc (modified) Trying to operate a console while there is none is not exactly well ... Fri, 22 Apr 2011 01:36:39 GMT rgrieder [8292] * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) Fixed mistaken warning message for the case compilations are disabled. Fri, 22 Apr 2011 00:14:05 GMT rgrieder [8291] * code/branches/kicklib2/src/libraries/network/NetworkPrecompiledHeaders.h (modified) What a surprise: Fixed msvc 8 build again, related to ENet... I ... Thu, 21 Apr 2011 20:48:55 GMT dafrick [8290] * code/branches/portals/data/levels/portals.oxw (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) Moving the things done with the eventTemplate into the PortalEndPoint ... Thu, 21 Apr 2011 20:45:42 GMT dafrick [8289] * code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.h (modified) Adding possibility to have a string of temporaryControls. Thu, 21 Apr 2011 18:29:30 GMT rgrieder [8288] * code/branches/kicklib2/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/kicklib2/src/modules/designtools/SkyboxGenerator.cc (modified) Resource::DEFAULT_GROUP has been replaced and ...