# # ChangeLog for code/branches/presentation3 # # Generated by Trac 1.0.9 # Nov 28, 2024, 2:22:57 PM Tue, 01 Jun 2010 22:02:50 GMT landauf [7073] * code/branches/presentation3 (modified) * code/branches/presentation3/cmake/LibraryConfig.cmake (modified) * code/branches/presentation3/data/levels/fps_test.oxw (copied) * code/branches/presentation3/data/levels/includes/weaponsettings_fps.oxi (copied) * code/branches/presentation3/data/levels/presentation_FS10.oxw (copied) * code/branches/presentation3/data/levels/presentation_FS10_ed.oxw (copied) * code/branches/presentation3/data/levels/templates/fps.oxt (copied) * code/branches/presentation3/data/overlays/hudtamplates_fps.oxo (copied) * code/branches/presentation3/src/libraries/tools/CMakeLists.txt (modified) * code/branches/presentation3/src/libraries/tools/bsp (copied) * code/branches/presentation3/src/libraries/tools/bsp/CMakeLists.txt (copied) * code/branches/presentation3/src/libraries/tools/bsp/DemoApp.cpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/DemoApp.hpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/ExampleApplication.h (copied) * code/branches/presentation3/src/libraries/tools/bsp/ExampleFrameListener.h (copied) * code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.cpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.hpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map.cpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map.h (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.cpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.h (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.cpp (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.h (copied) * code/branches/presentation3/src/libraries/tools/bsp/Q3Map_misc.h (copied) * code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc (copied) * code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h (copied) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified) merged fps branch to presentation3 Tue, 01 Jun 2010 19:28:28 GMT dafrick [7072] * code/branches/presentation3/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation3/data/gui/scripts/QuestGUI.lua (modified) * code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified) * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/src/libraries/core/GUIManager.h (modified) * code/branches/presentation3/src/modules/questsystem/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/questsystem/Quest.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestGUI.cc (deleted) * code/branches/presentation3/src/modules/questsystem/QuestGUI.h (deleted) * code/branches/presentation3/src/modules/questsystem/QuestGUINode.cc (deleted) * code/branches/presentation3/src/modules/questsystem/QuestGUINode.h (deleted) * code/branches/presentation3/src/modules/questsystem/QuestHint.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/infos/PlayerInfo.h (modified) Made the QuestGUI completely lua based in an attempt to remove a ... Mon, 31 May 2010 21:18:29 GMT decapitb [7069] * code/branches/presentation3/data/levels/includes/weaponsettings_swallow.oxi (added) * code/branches/presentation3/data/levels/templates/spaceship_swallow.oxt (added) basic template and weaponsettings for swallow spaceship Mon, 31 May 2010 16:18:50 GMT solex [7066] * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified) formationflight final commit before presentation (probably...) Mon, 31 May 2010 16:06:51 GMT scheusso [7065] * code/branches/presentation3/data/levels/screenshot.oxw (added) small testlevel for the presentation screenshot Mon, 31 May 2010 16:06:03 GMT scheusso [7064] * code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified) fixed a bug in ArtificialController::sameTeam Mon, 31 May 2010 15:21:40 GMT jo [7063] * code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (modified) * code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (modified) stable version without the ghost-spaceship Mon, 31 May 2010 14:55:05 GMT jo [7062] * code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (modified) * code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (modified) * code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation3/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h (modified) coloured messages, different spaceships in one level, with bug Mon, 31 May 2010 14:44:51 GMT dafrick [7061] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (deleted) * code/branches/presentation3/data/levels/Level(UnderAttack).oxw (deleted) * code/branches/presentation3/data/levels/empty_level.oxw (modified) * code/branches/presentation3/data/levels/mylevel.oxw (deleted) * code/branches/presentation3/data/levels/old/presentationLOD.oxw (moved) * code/branches/presentation3/data/levels/quest_test.oxw (deleted) * code/branches/presentation3/data/levels/test_ghost.oxw (deleted) Cleaning up some levels. Mon, 31 May 2010 14:44:02 GMT gasserlu [7060] * code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.h (modified) drone shootingRange implemented Mon, 31 May 2010 14:21:56 GMT stmathia [7058] * code/branches/presentation3/data/levels/Fight in our Back.oxw (added) * code/branches/presentation3/data/levels/The Time Machine.oxw (added) * code/branches/presentation3/data/levels/empty_level.oxw (modified) empty_level:erased unnecessary code Fight in our Back: added quests ... Mon, 31 May 2010 14:19:14 GMT scheusso [7056] * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) adjusted speed of rocket Mon, 31 May 2010 14:03:06 GMT kolibri7 [7054] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * slightly changed the algorithm for computing the distvalues for lod ... Mon, 31 May 2010 13:33:14 GMT scheusso [7051] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified) HUDNavigation overlays are coloured now Mon, 31 May 2010 13:17:25 GMT sfluecki [7050] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified) Added a ConfigValue to limit the amount of marked entities Mon, 31 May 2010 13:08:51 GMT smerkli [7049] * code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified) some comments made, no code changes. Mon, 31 May 2010 13:01:59 GMT kolibri7 [7048] * code/branches/presentation3/data/levels/presentationLOD.oxw (modified) * code/branches/presentation3/data/levels/presentationLODdif.oxw (deleted) *deleted old lod levels *changed presentationLOD.oxw for better view ... Mon, 31 May 2010 12:30:17 GMT kolibri7 [7047] * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * modified the formula for computation of distances for lod Mon, 31 May 2010 12:20:12 GMT scheusso [7046] * code/branches/presentation3/data/levels/presentationFS10.oxw (moved) using lod templates in this level renamed the filename Mon, 31 May 2010 12:10:35 GMT scheusso [7045] * code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified) RadarViewable need a worldentity* when constructing i really thought ... Mon, 31 May 2010 12:07:31 GMT scheusso [7044] * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified) fixed build Mon, 31 May 2010 12:02:39 GMT smerkli [7043] * code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified) * code/branches/presentation3/src/orxonox/ChatInputHandler.h (modified) Mon, 31 May 2010 11:41:26 GMT dafrick [7042] * code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation3/data/levels/PresentationFS10.oxw (modified) Updates in presentation level. Mon, 31 May 2010 11:30:58 GMT rgrieder [7041] * code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified) ScreenshotManager working now, though there might be a memory leak in ... Mon, 31 May 2010 10:06:55 GMT gnadler [7040] * code/branches/presentation3/data/defaultConfig/keybindings.ini (modified) changed Rocket-keybindings: T (as before for the original ... Mon, 31 May 2010 07:33:09 GMT rgrieder [7039] * code/branches/presentation3/src/libraries/network/ChatListener.h (modified) * code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified) * code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h (modified) * code/branches/presentation3/src/modules/weapons/RocketController.h (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/orxonox/Level.h (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.h (modified) Removed some tabs. Mon, 31 May 2010 07:24:33 GMT dafrick [7038] * code/branches/presentation3/data/levels/includes/pickups.oxi (modified) * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/presentation3/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified) Updated pickups level and template and include file to properly ... Mon, 31 May 2010 07:21:07 GMT rgrieder [7037] * code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified) Using C++ includes (limits.h --> climits). Mon, 31 May 2010 07:02:48 GMT scheusso [7036] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (modified) * code/branches/presentation3/data/levels/Level(UnderAttack).oxw (modified) * code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified) * code/branches/presentation3/data/levels/events.oxw (modified) * code/branches/presentation3/data/levels/mylevel.oxw (modified) * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/data/levels/presentation.oxw (modified) * 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/quest_test.oxw (modified) * code/branches/presentation3/data/levels/sound.oxw (modified) * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) * code/branches/presentation3/data/levels/test_ghost.oxw (modified) * code/branches/presentation3/data/levels/test_stars.oxw (modified) * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/levels/waypoints.oxw (modified) * code/branches/presentation3/src/orxonox/Level.cc (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.h (modified) some changes regarding lod: - added lodtemplate in different levels ... Mon, 31 May 2010 05:43:51 GMT dafrick [7035] * code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified) Added include in ArtificialController to make it work under linux. ... Mon, 31 May 2010 03:31:50 GMT landauf [7034] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/presentation3/data/levels/templates/spaceship_pirate.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/DronePickup.cc (copied) * code/branches/presentation3/src/modules/pickup/items/DronePickup.h (copied) * code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (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/WaypointPatrolController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified) * 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) merged ai branch to presentation3 Mon, 31 May 2010 02:52:31 GMT landauf [7032] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (modified) * code/branches/presentation3/data/levels/Level(UnderAttack).oxw (modified) * code/branches/presentation3/data/levels/PresentationFS10.oxw (modified) * code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified) * code/branches/presentation3/data/levels/mylevel.oxw (modified) * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/data/levels/quest_test.oxw (modified) * code/branches/presentation3/data/levels/test_stars.oxw (modified) eol-style native Mon, 31 May 2010 02:42:57 GMT landauf [7031] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (copied) * code/branches/presentation3/data/overlays/dynamicmatchhud.oxo (copied) * code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentation3/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.cc (copied) * code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h (copied) * code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (copied) * code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (copied) * code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation3/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (copied) * code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (copied) * code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation3/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h (modified) merged dynamicmatch to presentation3 Mon, 31 May 2010 02:22:29 GMT landauf [7030] * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) removed mergeinfo Sun, 30 May 2010 20:21:41 GMT rgrieder [7028] * code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified) * code/branches/presentation3/src/modules/designtools/CreateStars.h (modified) Fixed M_PI problem (not C++). Note: For the future, we should define ... Sun, 30 May 2010 18:22:19 GMT decapitb [7027] * code/branches/presentation3/data/levels/PresentationFS10.oxw (added) * code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (modified) got to work on that level... minor cosmetic changes to AnimatedModel.cc Sun, 30 May 2010 15:40:21 GMT dafrick [7025] * 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) Some cleanup. Sun, 30 May 2010 14:46:17 GMT scheusso [7024] * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) accidentially disabled lod Sun, 30 May 2010 14:36:43 GMT dafrick [7023] * code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified) Made gametype_asteroids level easier to play and erased some debug ... Sun, 30 May 2010 14:09:45 GMT scheusso [7022] * code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified) fixed some includes Sun, 30 May 2010 13:57:05 GMT gnadler [7021] * 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/SimpleRocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) documentation & formatting commit Sun, 30 May 2010 13:46:08 GMT scheusso [7020] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) some enhancements to lod (can be disabled now in the lodinformation ... Sun, 30 May 2010 13:44:22 GMT scheusso [7019] * 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) some network related fixes 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:53:26 GMT scheusso [7017] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) low lod level for high-quality hsw01 (still used on some spaceships) 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 ... Sat, 29 May 2010 15:09:58 GMT dafrick [7006] * code/branches/presentation3/data/gui/layouts/MiscConfigMenu.layout (added) * code/branches/presentation3/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (added) * code/branches/presentation3/data/gui/scripts/SettingsMenu.lua (modified) Added Menu to display and edit config values. But the list of ... Fri, 28 May 2010 08:23:14 GMT scheusso [7005] * code/branches/presentation3/data/levels/includes/weaponsettings_HXY.oxi (modified) * code/branches/presentation3/data/levels/includes/weaponsettings_ghost.oxi (modified) same for ghost and HXY Fri, 28 May 2010 08:22:05 GMT scheusso [7004] * code/branches/presentation3/data/levels/includes/weaponsettings_pirate.oxi (modified) less damage for the pirate ships Fri, 28 May 2010 08:20:35 GMT scheusso [7003] * code/branches/presentation3/data/levels/includes/weaponsettings_H2.oxi (modified) less damage for the H2 ships Thu, 27 May 2010 21:55:18 GMT dafrick [7000] * code/branches/presentation3/data/levels/includes/pickups.oxi (modified) Renamed Triple Pickup to Tri Pickup. This was important. Believe me... 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 19:23:07 GMT scheusso [6990] * code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified) changed weapon damage and added fire mode 3 (use with fire 3) the ... 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 17:08:12 GMT rgrieder [6982] * code/branches/presentation3/data/defaultConfig/keybindings.ini (modified) Removed 'openMap' keybinding (it was removed and therefore caused ... Thu, 27 May 2010 17:07:54 GMT decapitb [6981] * code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified) added hsw01_reduced to assff, should improve fps Thu, 27 May 2010 16:18:27 GMT cdaniel [6977] * code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (added) Quest level updated 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:46:15 GMT dafrick [6946] * code/branches/presentation3/data/levels/princessaeryn.oxw (modified) * code/branches/presentation3/data/levels/questsystem2.oxw (modified) Small thing that I forgot (and probably should mention as well). ... 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:39:03 GMT cdaniel [6939] * code/branches/presentation3/data/levels/quest_test.oxw (modified) Quest level updated 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 12:38:40 GMT scheusso [6932] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) this way the default values will not be set when applying this template 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 ...