# # ChangeLog for code/branches/presentation3/src # # Generated by Trac 1.0.9 # Nov 24, 2024, 5:48:16 PM Sun, 30 May 2010 13:19:49 GMT scheusso [7018] * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/particle/simplerocketfire.particle (copied) * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation3/src/modules/weapons/RocketController.h (modified) * code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) merged rocket2 branch back into presentation3 branch Sun, 30 May 2010 12:52:34 GMT scheusso [7016] * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) change in LoD: use volume of the bounding box instead of scalefactor ... Sun, 30 May 2010 12:51:33 GMT scheusso [7015] * code/branches/presentation3/src/modules/designtools/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (added) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (added) adding ScreenshotManager in order to be able to make high-resolution ... Sun, 30 May 2010 12:50:19 GMT scheusso [7014] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) small fix in hudnavigation (making sure we don't remove the players ... Sun, 30 May 2010 12:10:13 GMT dafrick [7013] * code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) Added some config value to the menu and greyed-out the reset button, ... Sun, 30 May 2010 11:37:33 GMT dafrick [7012] * code/branches/presentation3/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation3/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation3/src/libraries/core/GUIManager.h (modified) Config values can now be changed in a menu. Sat, 29 May 2010 19:58:53 GMT dafrick [7010] * code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) Loading PickupInventory when the PickupManager gets created to avoid ... Sat, 29 May 2010 19:56:07 GMT dafrick [7009] * code/branches/presentation3/data/gui/layouts/ChatBox.layout (modified) * code/branches/presentation3/data/gui/scripts/ChatBox.lua (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/ChatInputHandler.h (modified) Enabled the ChatBox to be closed by pressing the close button in the ... Sat, 29 May 2010 19:33:33 GMT dafrick [7008] * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/src/libraries/core/OrxonoxClass.h (modified) * code/branches/presentation3/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation3/src/modules/pickup/Pickup.h (modified) * code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc (modified) Fixed a bug in pickups that caused the clone method of Pickup.h not ... Sat, 29 May 2010 18:41:19 GMT dafrick [7007] * code/branches/presentation3/data/levels/empty_level.oxw (modified) * code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation3/data/levels/gametype_underattack.oxw (modified) * code/branches/presentation3/data/levels/mylevel.oxw (modified) * code/branches/presentation3/data/levels/pickups.oxw (moved) * code/branches/presentation3/data/levels/presentation09.oxw (modified) * code/branches/presentation3/data/levels/presentation09b.oxw (modified) * code/branches/presentation3/data/levels/presentationHS09.oxw (modified) * code/branches/presentation3/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation3/data/levels/presentationLOD.oxw (modified) * code/branches/presentation3/data/levels/presentationLODdif.oxw (modified) * code/branches/presentation3/data/levels/presentation_dm.oxw (modified) * code/branches/presentation3/data/levels/presentation_pong.oxw (modified) * code/branches/presentation3/data/levels/princessaeryn.oxw (modified) * code/branches/presentation3/data/levels/questsystem2.oxw (deleted) * code/branches/presentation3/data/levels/sound.oxw (modified) * code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified) * code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified) * code/branches/presentation3/data/levels/test_ghost.oxw (modified) * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/levels/waypoints.oxw (modified) * code/branches/presentation3/src/modules/pickup/Pickup.cc (modified) Tested and cleaned all levels (except for the ones that someone is ... Thu, 27 May 2010 21:54:05 GMT dafrick [6999] * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) Commented some unused variables in RocketController that generated ... Thu, 27 May 2010 21:50:24 GMT dafrick [6998] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/includes/pickups.oxi (modified) * code/branches/presentation3/data/levels/pickup.oxw (modified) * code/branches/presentation3/data/levels/pickup_pps_invi.oxw (deleted) * code/branches/presentation3/data/levels/pickup_ppstest1.oxw (deleted) * code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/presentation3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc (copied) * code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h (copied) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged pickup branch into presentation3 branch. Seems to be working ... Thu, 27 May 2010 20:44:10 GMT dafrick [6996] * code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation3/src/libraries/core/GUIManager.h (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation3/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/presentation3/src/orxonox/interfaces/Rewardable.h (modified) Loads of changes. 1) PickupInventory should now be working even for ... Thu, 27 May 2010 20:31:25 GMT scheusso [6994] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/test_stars.oxw (copied) * code/branches/presentation3/data/particle/fog.particle (copied) * code/branches/presentation3/src/libraries/core/Core.cc (modified) * code/branches/presentation3/src/modules/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/designtools (copied) * code/branches/presentation3/src/modules/designtools/CMakeLists.txt (copied) * code/branches/presentation3/src/modules/designtools/CreateStars.cc (copied) * code/branches/presentation3/src/modules/designtools/CreateStars.h (copied) * code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h (copied) * code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc (copied) * code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h (copied) * code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h (modified) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h (modified) merged skybox2 branch to presentation merger branch Thu, 27 May 2010 17:11:36 GMT scheusso [6984] * code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc (modified) fix in hudradar which caused sigabrts when using a gametype Thu, 27 May 2010 13:58:24 GMT sfluecki [6971] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified) Final changes in HUDNavigation. marker are now working and are ... Mon, 24 May 2010 14:59:23 GMT dafrick [6965] * code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified) Cleaned up in PickupInventory, to be able to improve it at a later stage. Sat, 22 May 2010 18:43:39 GMT scheusso [6964] * code/branches/presentation3/src/libraries/network/packet/ClassID.cc (modified) * code/branches/presentation3/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) fix in ClassID (thanks reto) fix in Rocket small improvements in ... Fri, 21 May 2010 16:50:07 GMT scheusso [6961] * code/branches/presentation3/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation3/src/orxonox/Level.cc (modified) * code/branches/presentation3/src/orxonox/Scene.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified) fixed to make everything network-compliant again Fri, 21 May 2010 16:49:29 GMT scheusso [6960] * code/branches/presentation3/src/libraries/network/packet/ClassID.cc (modified) can't imagine how this worked so long Fri, 21 May 2010 12:11:47 GMT scheusso [6957] * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.cc (deleted) * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.h (deleted) * code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (deleted) * code/branches/presentation3/src/orxonox/controllers/DroneController.h (deleted) * code/branches/presentation3/src/orxonox/gametypes/Testgame.cc (deleted) * code/branches/presentation3/src/orxonox/gametypes/Testgame.h (deleted) * code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.cc (deleted) * code/branches/presentation3/src/orxonox/worldentities/Drone.h (deleted) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.cc (deleted) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.h (deleted) deleting some unnesseccary files Fri, 21 May 2010 08:30:42 GMT scheusso [6953] * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) now the bots can shoot again Fri, 21 May 2010 08:25:27 GMT scheusso [6951] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/particle/rocketfire2.particle (copied) * code/branches/presentation3/src/modules/weapons/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/weapons/RocketController.cc (copied) * code/branches/presentation3/src/modules/weapons/RocketController.h (copied) * code/branches/presentation3/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (copied) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.cc (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.h (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (copied) * code/branches/presentation3/src/orxonox/controllers/DroneController.h (copied) * code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/presentation3/src/orxonox/gametypes/Testgame.cc (copied) * code/branches/presentation3/src/orxonox/gametypes/Testgame.h (copied) * code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.cc (copied) * code/branches/presentation3/src/orxonox/worldentities/Drone.h (copied) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.cc (copied) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.h (copied) merged rocket branch into presentation3 and cleaned up some things ... Fri, 21 May 2010 06:36:32 GMT scheusso [6947] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed a bug which caused a segfault when shooting a rocket Thu, 20 May 2010 20:36:48 GMT dafrick [6945] * code/branches/presentation3/src/modules/questsystem/AddQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/AddQuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/AddReward.cc (modified) * code/branches/presentation3/src/modules/questsystem/CompleteQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/FailQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/Quest.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestDescription.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestNotification.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestNotification.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/Notification.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.h (modified) * code/branches/presentation3/src/orxonox/interfaces/NotificationListener.h (modified) A lot of cleanup, mostly increasing output levels, which means, that ... Thu, 20 May 2010 19:43:45 GMT dafrick [6944] * code/branches/presentation3/data/levels/quest_test.oxw (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.h (modified) No more seg-faults when restarting a game, quests still not working ... Thu, 20 May 2010 18:30:38 GMT scheusso [6942] * code/branches/presentation3 (modified) * code/branches/presentation3/data/gui/layouts/InGamePickupHUD.layout (copied) * code/branches/presentation3/data/gui/scripts/InGamePickupHUD.lua (copied) * code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h (modified) * code/branches/presentation3/src/orxonox/Radar.cc (modified) * code/branches/presentation3/src/orxonox/Radar.h (modified) * code/branches/presentation3/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation3/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarListener.h (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation3/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/overlays/Map.cc (deleted) * code/branches/presentation3/src/orxonox/overlays/Map.h (deleted) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified) merging hudelements into presentation3 and reducing (or increasing) ... Thu, 20 May 2010 17:38:53 GMT dafrick [6940] * code/branches/presentation3/src/modules/questsystem/AddQuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/branches/presentation3/src/modules/questsystem/Quest.cc (modified) * code/branches/presentation3/src/modules/questsystem/Quest.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.h (modified) Resolved issue with the Questsystem causing a segfault when a level ... Thu, 20 May 2010 14:35:48 GMT dafrick [6938] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) * code/branches/presentation3/src/libraries/core/Template.cc (modified) * code/branches/presentation3/src/libraries/core/Template.h (modified) Resolved issue with lod-template. Now, template inherit the ... Thu, 20 May 2010 14:34:49 GMT decapitb [6937] * code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (added) * code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h (added) * code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/graphics/Model.h (modified) Predefined Armature-Animated Models supported. Thu, 20 May 2010 12:50:59 GMT dafrick [6935] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (modified) * code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified) Some changed in a level also in Triggers... Thu, 20 May 2010 12:45:03 GMT cdaniel [6934] * code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified) Fixed Include file destination (For Visual Studio under Windows) Thu, 20 May 2010 12:40:53 GMT scheusso [6933] * code/branches/presentation3/src/orxonox/LevelManager.cc (modified) make sure this won't happen again Thu, 20 May 2010 09:33:07 GMT scheusso [6928] * code/branches/presentation3 (modified) * code/branches/presentation3/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (copied) * code/branches/presentation3/data/gui/layouts/ChatBox.layout (copied) * code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (copied) * code/branches/presentation3/data/gui/scripts/ChatBox.lua (copied) * code/branches/presentation3/src/libraries/network/ChatListener.cc (modified) * code/branches/presentation3/src/libraries/network/ChatListener.h (modified) * code/branches/presentation3/src/libraries/network/Host.h (modified) * code/branches/presentation3/src/libraries/network/packet/Chat.cc (modified) * code/branches/presentation3/src/libraries/network/packet/Chat.h (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/ChatHistory.cc (copied) * code/branches/presentation3/src/orxonox/ChatHistory.h (copied) * code/branches/presentation3/src/orxonox/ChatInputHandler.cc (copied) * code/branches/presentation3/src/orxonox/ChatInputHandler.h (copied) * code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (copied) * code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (copied) mergine chat2 into presentation merger branch Thu, 20 May 2010 08:28:10 GMT scheusso [6927] * code/branches/presentation3/src/orxonox/LevelManager.cc (modified) fix in levelmanager: if a template was assigned to the Level the ... Thu, 20 May 2010 08:23:22 GMT scheusso [6926] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/empty_level.oxw (modified) * code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation3/data/levels/gametype_underattack.oxw (modified) * code/branches/presentation3/data/levels/presentationLOD.oxw (copied) * code/branches/presentation3/data/levels/presentationLODdif.oxw (copied) * code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified) * code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified) * code/branches/presentation3/data/levels/templates/lodinformation.oxt (copied) * code/branches/presentation3/src/libraries/core/BaseObject.cc (modified) * code/branches/presentation3/src/libraries/core/BaseObject.h (modified) * code/branches/presentation3/src/orxonox/Level.cc (modified) * code/branches/presentation3/src/orxonox/Level.h (modified) * code/branches/presentation3/src/orxonox/LevelManager.cc (modified) * code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (copied) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (copied) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.h (modified) merging lod branch into presentation3 merger branch Mon, 17 May 2010 14:57:26 GMT stmathia [6920] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (added) * code/branches/presentation3/data/levels/Level(UnderAttack).oxw (added) * code/branches/presentation3/data/levels/mylevel.oxw (added) * code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified) Changes in level files. Addition to TemaDeathmatch, should now be ... Mon, 17 May 2010 13:31:49 GMT scheusso [6912] * code/branches/presentation3 (copied) creating new presentation merger branch Mon, 17 May 2010 11:22:26 GMT dafrick [6906] * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/triggers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (added) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (added) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) Added DistanceTriggerBeacon, which is a device which can be attached ...