# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 22, 2024, 2:09:23 PM Sun, 02 May 2010 21:02:27 GMT gnadler [6818] * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) latest try (see the forum thread for more info...) now Orxonox ... Sun, 02 May 2010 19:55:23 GMT gnadler [6817] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) made a mistake in previous update, but still not working... Sun, 02 May 2010 19:50:06 GMT gnadler [6816] * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) updated ~SimpleRocket but still doesn't work Sun, 02 May 2010 11:39:33 GMT gnadler [6815] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) trying to destroy RocketController within SimpleRocket destroyer but ... Sat, 01 May 2010 16:15:40 GMT gnadler [6814] * code/branches/rocket/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/RocketController.h (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) tried to fix ~RocketController() as well as that the rocket is not ... Sat, 01 May 2010 10:37:53 GMT gnadler [6813] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/RocketController.h (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) RocketController now creates rocket. compiles. but rocket doesn't spawn. Fri, 30 Apr 2010 14:42:58 GMT jo [6812] * code/branches/dynamicmatch/data/levels/gametype_asteroids.oxw (modified) * code/branches/dynamicmatch/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) adding 3rd party: killers, making the gametype playable for larger ... Fri, 30 Apr 2010 12:39:30 GMT gnadler [6811] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/RocketController.h (modified) Fri, 30 Apr 2010 12:34:37 GMT gnadler [6810] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/RocketController.h (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) Fri, 30 Apr 2010 12:34:11 GMT gnadler [6809] * code/branches/rocket/data/levels/includes/weaponsettings3.oxi (modified) Thu, 29 Apr 2010 14:05:15 GMT hallerja [6808] * data/contentcreation/pps/JanHaller/Missile.blend (modified) * data/contentcreation/pps/JanHaller/MissileLauncher.blend (added) * data/contentcreation/pps/JanHaller/MissileTexture.png (modified) * data/contentcreation/pps/JanHaller/Turret2.blend (modified) * data/contentcreation/pps/JanHaller/Turret2.xcf (added) Weapon model and texture changes Thu, 29 Apr 2010 13:40:02 GMT dafrick [6807] * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) DistanceMultiTrigger fix. Thanks to Fabian. Thu, 29 Apr 2010 13:27:24 GMT gionc [6806] * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) updated skybox generator Thu, 29 Apr 2010 13:26:43 GMT dafrick [6805] * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) Possible bug fix. Thu, 29 Apr 2010 12:21:57 GMT gionc [6804] * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified) updated skyboxgenerator Thu, 29 Apr 2010 12:10:18 GMT gnadler [6803] * code/branches/rocket/src/modules/weapons/CMakeLists.txt (modified) * code/branches/rocket/src/modules/weapons/RocketController.cc (added) * code/branches/rocket/src/modules/weapons/RocketController.h (added) * code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket/src/orxonox/controllers/RocketController.cc (deleted) * code/branches/rocket/src/orxonox/controllers/RocketController.h (deleted) Thu, 29 Apr 2010 11:52:19 GMT cdaniel [6802] * code/trunk/data/defaultConfig/keybindings.ini (modified) QuestGUI can now be opened/closed by pressing Key F3... Thu, 29 Apr 2010 11:35:57 GMT cdaniel [6801] * code/trunk/data/levels/quest_test.oxw (added) New Quest Level - still in early test phase :P Thu, 29 Apr 2010 11:16:16 GMT dafrick [6800] * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/Event.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/triggers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (added) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (added) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (added) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (added) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (added) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (added) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) Created a new class of triggers called Multitriggers. MultiTriggers ... Thu, 29 Apr 2010 10:57:23 GMT dafrick [6799] * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) Adjusted the priority of some outputs which I found to be rather anoying. Wed, 28 Apr 2010 22:04:41 GMT hallerja [6798] * data/contentcreation/pps/JanHaller/1.blend (deleted) * data/contentcreation/pps/JanHaller/MissileTexture - Kopie.png (added) * data/contentcreation/pps/JanHaller/MissileTexture.png (modified) * data/contentcreation/pps/JanHaller/Raster.png (deleted) * data/contentcreation/pps/JanHaller/Turret1.blend (added) * data/contentcreation/pps/JanHaller/Turret1.blend1 (added) * data/contentcreation/pps/JanHaller/Turret1.png (added) * data/contentcreation/pps/JanHaller/Turret2.blend (added) * data/contentcreation/pps/JanHaller/Turret2.blend1 (added) Changes at weapon models and textures Tue, 27 Apr 2010 15:54:15 GMT rgrieder [6797] * code/branches/chat/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat/src/orxonox/ChatInputHandler.h (modified) svn:eol-style "native" for all text-based files. Tue, 27 Apr 2010 15:01:43 GMT sfluecki [6796] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) Neues update Mon, 26 Apr 2010 15:02:49 GMT solex [6795] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) death of master results in forming a new formation. Correct response ... Mon, 26 Apr 2010 15:01:07 GMT kolibri7 [6794] * code/branches/lod/src/orxonox/graphics/Model.cc (modified) Trying to get the real scaleFactor, but it doesn't work yet... Mon, 26 Apr 2010 14:53:43 GMT smerkli [6793] * code/branches/chat/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat/src/orxonox/ChatInputHandler.h (modified) done for today. Mon, 26 Apr 2010 14:39:45 GMT benedict [6792] * data/contentcreation/source/materials/textures/pickups/arrow.xcf (copied) * data/contentcreation/source/materials/textures/pickups/cross.xcf (copied) * data/contentcreation/source/materials/textures/pickups/gimp_template.xcf (added) * data/contentcreation/source/materials/textures/pickups/healthpickup (deleted) * data/contentcreation/source/materials/textures/pickups/metapickup (deleted) Adding other pickup gimp files and some restructuring. Mon, 26 Apr 2010 14:35:31 GMT smerkli [6791] * code/branches/chat/data/defaultConfig/keybindings.ini (modified) * code/branches/chat/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat/src/orxonox/ChatInputHandler.h (modified) Chat works lowlevel, shortcut is set to B. needs ui now. Mon, 26 Apr 2010 14:27:04 GMT dafrick [6790] * data/contentcreation/source/materials (added) * data/contentcreation/source/materials/textures (added) * data/contentcreation/source/materials/textures/pickups (added) * data/contentcreation/source/materials/textures/pickups/asterix.xcf (added) * data/contentcreation/source/materials/textures/pickups/healthpickup (added) * data/contentcreation/source/materials/textures/pickups/healthpickup/cross.xcf (added) * data/contentcreation/source/materials/textures/pickups/metapickup (added) * data/contentcreation/source/materials/textures/pickups/metapickup/arrow.xcf (added) * data/contentcreation/source/materials/textures/pickups/sphere.xcf (added) Adding some content. (Pickups gimp-files) Mon, 26 Apr 2010 14:16:51 GMT dafrick [6789] * data/contentcreation/source (added) Creating a source directory in contentcreation to serve as a ... Mon, 26 Apr 2010 14:09:23 GMT smerkli [6788] * code/branches/chat/src/orxonox/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat/src/orxonox/ChatInputHandler.h (modified) stuff works, but keybinding still does only work in the build folder Mon, 26 Apr 2010 14:07:18 GMT kolibri7 [6787] * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified) LoD information via XML partly implemented Mon, 26 Apr 2010 14:05:45 GMT kolibri7 [6786] * code/branches/lod/data/levels/templates/lodinformation.oxt (added) * code/branches/lod/src/orxonox/Level.cc (modified) * code/branches/lod/src/orxonox/Level.h (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (modified) * code/branches/lod/src/orxonox/graphics/Model.cc (modified) Mon, 26 Apr 2010 14:04:03 GMT gnadler [6785] * code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/rocket/src/orxonox/worldentities/SimpleRocket.cc (deleted) * code/branches/rocket/src/orxonox/worldentities/SimpleRocket.h (deleted) Mon, 26 Apr 2010 14:03:27 GMT gnadler [6784] * code/branches/rocket/src/orxonox/controllers/RocketController.cc (modified) Mon, 26 Apr 2010 14:01:57 GMT gnadler [6783] * code/branches/rocket/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/rocket/src/orxonox/controllers/RocketController.cc (modified) Mon, 26 Apr 2010 13:59:43 GMT gasserlu [6782] * code/branches/ai/data/levels/pickup.oxw (modified) * code/branches/ai/data/levels/tutorial.oxw (modified) * code/branches/ai/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ai/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ai/src/modules/pickup/items/DronePickup.cc (added) * code/branches/ai/src/modules/pickup/items/DronePickup.h (added) * code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/ai/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/ai/src/orxonox/worldentities/CMakeLists.txt (modified) drone, dronecontroller implemented Mon, 26 Apr 2010 13:46:06 GMT gnadler [6781] * code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/rocket/src/orxonox/worldentities/SimpleRocket.cc (added) * code/branches/rocket/src/orxonox/worldentities/SimpleRocket.h (added) Mon, 26 Apr 2010 13:45:37 GMT gnadler [6780] * code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt (modified) Mon, 26 Apr 2010 13:40:33 GMT gnadler [6779] * code/branches/rocket/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/rocket/data/levels/tutorial.oxw (modified) Mon, 26 Apr 2010 13:40:16 GMT gnadler [6778] * code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (added) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (added) * code/branches/rocket/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc (added) * code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h (added) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (added) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h (added) * code/branches/rocket/src/orxonox/controllers/AIController.cc (modified) * code/branches/rocket/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/rocket/src/orxonox/controllers/DroneController.cc (added) * code/branches/rocket/src/orxonox/controllers/DroneController.h (added) * code/branches/rocket/src/orxonox/controllers/RocketController.cc (added) * code/branches/rocket/src/orxonox/controllers/RocketController.h (added) * code/branches/rocket/src/orxonox/gametypes/Testgame.cc (added) * code/branches/rocket/src/orxonox/gametypes/Testgame.h (added) * code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/rocket/src/orxonox/worldentities/Drone.cc (added) * code/branches/rocket/src/orxonox/worldentities/Drone.h (added) * code/branches/rocket/src/orxonox/worldentities/RocketDrone.cc (added) * code/branches/rocket/src/orxonox/worldentities/RocketDrone.h (added) Mon, 26 Apr 2010 12:48:12 GMT smerkli [6777] * code/branches/chat/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat/src/orxonox/ChatInputHandler.h (modified) Brought implementation further, now starting to link into main program. Mon, 26 Apr 2010 12:37:12 GMT smerkli [6776] * code/branches/chat/src/orxonox/ChatInputHandler.cc (added) * code/branches/chat/src/orxonox/ChatInputHandler.h (added) Added ChatInputHandler facilities and started implementing them. Mon, 26 Apr 2010 11:00:41 GMT hallerja [6775] * data/contentcreation/pps/JanHaller/MissileTexture.png (added) missile texture 1 Fri, 23 Apr 2010 09:46:11 GMT rgrieder [6774] * code/branches/gamestates3/data/lua/Strict.lua (modified) * code/branches/gamestates3/src/libraries/core/LuaState.cc (modified) * code/branches/gamestates3/src/libraries/core/LuaState.h (modified) * code/branches/gamestates3/src/orxonox/items/MultiStateEngine.cc (modified) Activated Strict.lua That means you can no longer assign to or ... Fri, 23 Apr 2010 09:41:30 GMT rgrieder [6773] * code/branches/gamestates3/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates3/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates3/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates3/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates3/data/gui/scripts/HUDSheet.lua (modified) * code/branches/gamestates3/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates3/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates3/data/gui/scripts/MenuSheet.lua (modified) * code/branches/gamestates3/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates3/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates3/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestates3/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates3/data/lua/LuaStateInit.lua (modified) Eliminated all unnecessary global Lua variables and replaced them ... Thu, 22 Apr 2010 14:27:25 GMT gionc [6772] * code/branches/skybox2/src/libraries/core/Core.cc (modified) * code/branches/skybox2/src/libraries/core/Core.h (modified) * code/branches/skybox2/src/modules/overlays/hud/GametypeStatus.cc (modified) update Skybox Generator Thu, 22 Apr 2010 14:16:09 GMT gionc [6771] * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified) update SkyboxGenerator Thu, 22 Apr 2010 13:42:27 GMT hallerja [6770] * data/contentcreation/pps/JanHaller/Missile.blend (modified) Missile Texture Thu, 22 Apr 2010 13:32:45 GMT erwin [6769] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Fixed a possible source for future problems. but still no sounds. Try ... Thu, 22 Apr 2010 13:09:29 GMT erwin [6768] * code/branches/sound4 (deleted) obsolete, sound5 is current sound dev branch Tue, 20 Apr 2010 18:31:12 GMT youngk [6767] * code/branches/sound5/src/orxonox/MoodManager.h (modified) * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundManager.h (modified) * code/branches/sound5/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sound5/src/orxonox/weaponsystem/WeaponMode.h (modified) Added descriptions and missing documentation to the classes I edited ... Tue, 20 Apr 2010 16:20:27 GMT rgrieder [6766] * code/branches/gamestates3 (copied) New branch to work on XML controlled CEGUI menus and on game states ... Tue, 20 Apr 2010 09:11:40 GMT rgrieder [6765] * code/trunk/cmake/PackageConfig.cmake (modified) Dependency acceptance update: 5.0 with OGRE 1.7 is now also allowed, ... Tue, 20 Apr 2010 09:11:01 GMT rgrieder [6764] * code/trunk/src/orxonox/sound/SoundBuffer.h (modified) Hackaround for Visual Studio 2005 (compiler bug). Mon, 19 Apr 2010 16:09:10 GMT rgrieder [6763] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) Using our own error handler (including the debugger) for Lua code ... Mon, 19 Apr 2010 15:45:29 GMT rgrieder [6762] * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff (modified) Changes from last revision --> diff file for external libraries updated. Mon, 19 Apr 2010 14:49:11 GMT rgrieder [6761] * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.cpp (modified) * code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILuaFunctor.cpp (modified) Fixed "error in error handler" problem that occurred within CEGUILua ... Mon, 19 Apr 2010 14:35:30 GMT dafrick [6760] * code/branches/pickup4 (deleted) Deleting pickup4 branch, you know the drill... Mon, 19 Apr 2010 14:35:10 GMT dafrick [6759] * code/branches/ppspickups2 (deleted) Deleting ppspickups2 branch, since it's obsolete as well. Mon, 19 Apr 2010 14:34:51 GMT dafrick [6758] * code/branches/ppspickups1 (deleted) Deleting ppspickups1 branch, since it's obsolete now. Mon, 19 Apr 2010 14:33:46 GMT dafrick [6757] * code/branches/pickup5 (copied) Creating new pickup branch for me. Mon, 19 Apr 2010 14:32:54 GMT dafrick [6756] * code/branches/ppspickups3 (copied) Creating new pps pickups branch for Eric and Benedict. Mon, 19 Apr 2010 14:12:23 GMT dafrick [6755] * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) Fixed Segfault upon dropping of InvisiblePickup, while it was being used. Mon, 19 Apr 2010 12:34:05 GMT rgrieder [6754] * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) Fixed bug in SingleplayerMenu that happened when starting a level ... Mon, 19 Apr 2010 09:14:32 GMT rgrieder [6753] * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) Some more hackery for the PlayerInfo<->GUIOverlay relation. Seems to ... Mon, 19 Apr 2010 07:37:18 GMT rgrieder [6752] * code/trunk/src/modules/pickup/PickupManager.cc (modified) Fixed PickupManager::getPawn() method against NULL pointers. ... Sat, 17 Apr 2010 20:04:43 GMT rgrieder [6751] * code/trunk/src/libraries/util/Singleton.h (modified) Removed FORCEINLINE from Singleton.h: There seems to be unexpected ... Sat, 17 Apr 2010 11:26:59 GMT dafrick [6750] * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) PickupInventory working again, just had to change TaharezLook to ... Fri, 16 Apr 2010 18:13:36 GMT rgrieder [6749] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) Background wasn't transparent upon start up --> black screen when ... Fri, 16 Apr 2010 18:09:17 GMT rgrieder [6748] * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) A GUISheet can assign its field "loadAlong" any strings designating ... Fri, 16 Apr 2010 13:01:06 GMT rgrieder [6747] * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) Added onShow and onHide as overridable methods to GUISheet.lua and ... Fri, 16 Apr 2010 12:50:16 GMT rgrieder [6746] * code/trunk (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/data/gui/configs/Falagard.xsd (deleted) * code/trunk/data/gui/configs/Font.xsd (deleted) * code/trunk/data/gui/configs/GUILayout.xsd (deleted) * code/trunk/data/gui/configs/GUIScheme.xsd (deleted) * code/trunk/data/gui/configs/Imageset.xsd (deleted) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CompositorDemo.layout (deleted) * code/trunk/data/gui/layouts/Console.wnd (deleted) * code/trunk/data/gui/layouts/ControlsMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/CrowdDemo.layout (deleted) * code/trunk/data/gui/layouts/DecisionPopup.layout (modified) * code/trunk/data/gui/layouts/Demo7Windows.layout (deleted) * code/trunk/data/gui/layouts/Demo8.layout (deleted) * code/trunk/data/gui/layouts/DragDropDemo.layout (deleted) * code/trunk/data/gui/layouts/FontDemo.layout (deleted) * code/trunk/data/gui/layouts/GameplayMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/InGameTest.layout (modified) * code/trunk/data/gui/layouts/InfoPopup.layout (modified) * code/trunk/data/gui/layouts/InstancingDemo.layout (deleted) * code/trunk/data/gui/layouts/KeyBindMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MouseControlsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/layouts/TabControlDemo.layout (deleted) * code/trunk/data/gui/layouts/TabPage.layout (deleted) * code/trunk/data/gui/layouts/TabPage1.layout (deleted) * code/trunk/data/gui/layouts/TabPage2.layout (deleted) * code/trunk/data/gui/layouts/TextDemo.layout (deleted) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/trunk/data/gui/layouts/VanillaConsole.layout (deleted) * code/trunk/data/gui/layouts/VanillaWindows.layout (deleted) * code/trunk/data/gui/layouts/cegui8.layout (deleted) * code/trunk/data/gui/layouts/facial.layout (deleted) * code/trunk/data/gui/layouts/ogregui.layout (deleted) * code/trunk/data/gui/layouts/shadows.layout (deleted) * code/trunk/data/gui/schemes/Demo8.scheme (deleted) * code/trunk/data/gui/schemes/Looks.txt (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceLook.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaLook.scheme (copied) * code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (deleted) * code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (modified) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/BasicGUI.lua (deleted) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GameplayMenu.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HUDSheet.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/InfoPopup.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (copied) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/lua/Debugger.lua (copied) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/lua/Strict.lua (copied) * code/trunk/data/lua/Tools.lua (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (modified) * code/trunk/src/libraries/core/IOConsole.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/TriBool.h (copied) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (copied) * code/trunk/src/orxonox/overlays/GUISheet.h (copied) Merged gamestates2 branch back to trunk. This brings in some heavy ... Fri, 16 Apr 2010 11:42:28 GMT rgrieder [6745] * code/branches/gamestates2/src/libraries/core/input/InputDevice.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputHandler.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.h (modified) Branch now compiling with GCC as well: Added an removed a few ... Fri, 16 Apr 2010 11:41:25 GMT rgrieder [6744] * code/branches/gamestates2/cmake/LibraryConfigTardis.cmake (modified) Boost_VERSION was missing on Tardis because of manual configuration Fri, 16 Apr 2010 11:07:57 GMT rgrieder [6743] * code/branches/gamestates2/data/gui/scripts/MenuSheet.lua (modified) * code/branches/gamestates2/data/gui/scripts/SheetManager.lua (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) - Bugfix in keyESC. - Default behaviour for GUI sheet InputStates is ... Fri, 16 Apr 2010 10:53:16 GMT rgrieder [6742] * code/branches/gamestates2/data/lua/Tools.lua (modified) Fixed typo. Fri, 16 Apr 2010 10:50:52 GMT rgrieder [6741] * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h (modified) Removed obsolete InputState from GSMainMenu. Fri, 16 Apr 2010 10:48:24 GMT rgrieder [6740] * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) Trivial bug fix. Fri, 16 Apr 2010 10:24:56 GMT rgrieder [6739] * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) Applied background image changes to GSMainMenu.cc Fri, 16 Apr 2010 10:22:52 GMT rgrieder [6738] * code/branches/gamestates2/src/libraries/core/input/InputManager.cc (modified) Cosmetic changes in InputManager. Fri, 16 Apr 2010 10:22:12 GMT rgrieder [6737] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SheetManager.lua (copied) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.h (modified) Background image of the GUI is now managed by GUIManager and kept in ... Fri, 16 Apr 2010 10:11:57 GMT rgrieder [6736] * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) All CEGUI calls that can execute Lua code should be protected against ... Fri, 16 Apr 2010 10:06:45 GMT rgrieder [6735] * code/branches/gamestates2/src/orxonox/CameraManager.h (modified) * code/branches/gamestates2/src/orxonox/Level.cc (modified) * code/branches/gamestates2/src/orxonox/LevelManager.h (modified) * code/branches/gamestates2/src/orxonox/PlayerManager.cc (modified) Removed getInstancePtr() from all Singletons. Use "exists()" (check) ... Thu, 15 Apr 2010 14:06:27 GMT hallerja [6734] * data/contentcreation/pps/JanHaller/Missile.blend (added) * data/contentcreation/pps/JanHaller/PlasmaDrop.blend (added) Missile and plasma drop models Thu, 15 Apr 2010 13:42:24 GMT erwin [6733] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Added some hacks, now the source is playing, but there are no ... Thu, 15 Apr 2010 13:35:31 GMT scheusso [6732] * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) correcting initial speed of projectiles Thu, 15 Apr 2010 12:47:39 GMT dafrick [6731] * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) PickupCollection is broken for now because to make it work drastic ... Thu, 15 Apr 2010 11:57:51 GMT erwin [6730] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) Transfer changes again Thu, 15 Apr 2010 11:32:59 GMT erwin [6729] * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Commit changes to transfer to netbook Thu, 15 Apr 2010 11:15:11 GMT dafrick [6728] * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) No more seg faults with pickups (at least that's what I hope. ;)) Wed, 14 Apr 2010 17:54:41 GMT scheusso [6727] * code/branches/hudelements/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDRadar.h (modified) * code/branches/hudelements/src/orxonox/Radar.cc (modified) * code/branches/hudelements/src/orxonox/Radar.h (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarListener.h (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/hudelements/src/orxonox/worldentities/pawns/Pawn.cc (modified) HUDRadar now working again Wed, 14 Apr 2010 12:19:32 GMT erwin [6726] * code/branches/sound5/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound5/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) Some more atempts to fix maybe it's platform specific... Tue, 13 Apr 2010 20:39:54 GMT dafrick [6725] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) Resolved bug, that caused orxonox to crash whenever a level with ... Tue, 13 Apr 2010 20:11:36 GMT rgrieder [6724] * code/branches/lod/data/levels/presentationLOD.oxw (modified) * code/branches/lod/data/levels/presentationLODdif.oxw (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (modified) svn:eol-style "native" for all text-based files. Tue, 13 Apr 2010 20:09:00 GMT rgrieder [6723] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) Using /MP instead of /MP2 for MSVC. That way the number of processes ... Tue, 13 Apr 2010 16:17:51 GMT rgrieder [6722] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc (modified) Renamed showGUI and hideGUI to showMenuSheet and hideMenuSheet. Tue, 13 Apr 2010 15:58:55 GMT rgrieder [6721] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) Fixed cross hair showing in in game menu. Tue, 13 Apr 2010 13:58:56 GMT rgrieder [6720] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUISheet.lua (modified) * code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) "init" lua function --> "onLoad" to make it clear that it is a user ... Tue, 13 Apr 2010 13:56:17 GMT rgrieder [6719] * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Fixed error reporting problem in LuaState.cc when parsing ...