# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 25, 2024, 11:54:24 AM 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 13:27:24 GMT gionc [6806] * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) updated skybox generator 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) 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: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: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. 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: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 ... 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. 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 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 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 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: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 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 ... Tue, 13 Apr 2010 13:55:30 GMT rgrieder [6718] * 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/GUISheet.lua (moved) * 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/HUDSheet.lua (added) * 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/MenuSheet.lua (added) * 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/PickupInventory.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/gamestates2/data/lua/Tools.lua (modified) Moved BasicGUI.lua to GUISheet.lua and derived MenuSheet.lua as well ... Tue, 13 Apr 2010 12:35:16 GMT scheusso [6717] * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) removing some includes Tue, 13 Apr 2010 12:31:14 GMT scheusso [6716] * code/branches/hudelements/src/orxonox/controllers/HumanController.cc (modified) * code/branches/hudelements/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) removed some bindings to map Tue, 13 Apr 2010 12:14:27 GMT scheusso [6715] * code/branches/hudelements/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/hudelements/src/orxonox/overlays/Map.cc (deleted) * code/branches/hudelements/src/orxonox/overlays/Map.h (deleted) removing map files Tue, 13 Apr 2010 07:07:08 GMT dafrick [6708] * code/branches/ppspickups2/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups2/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups2/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ppspickups2/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/ppspickups2/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h (modified) Some cleanup. Tue, 13 Apr 2010 06:46:20 GMT dafrick [6707] * code/branches/pickup4/src/modules/pickup/PickupSpawner.cc (modified) Found bug in PickupSpawner. Mon, 12 Apr 2010 22:41:52 GMT dafrick [6706] * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) Small adaptations in SpeedPickup. Mon, 12 Apr 2010 22:09:10 GMT dafrick [6705] * code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.h (modified) * code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Minor cleanup. Mon, 12 Apr 2010 21:23:45 GMT rgrieder [6704] * code/branches/gamestates2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/BasicGUI.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/GameplayMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/InfoPopup.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/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua (modified) "filename" --> "name" table entry for GUI sheets. Mon, 12 Apr 2010 21:01:35 GMT dafrick [6703] * code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc (modified) Removed warning (and possible error, I'm not sure) in MultiStateEngine. Mon, 12 Apr 2010 20:24:30 GMT dafrick [6701] * code/branches/pickup4/data/levels/includes/pickups.oxi (modified) * code/branches/pickup4/data/levels/pickup.oxw (modified) * code/branches/pickup4/data/levels/templates/pickup_representation_templates.oxt (modified) Added a new health pickup. Mon, 12 Apr 2010 19:10:16 GMT dafrick [6700] * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) Rudimentary version of PickupInventory appears to be working now, ... Mon, 12 Apr 2010 15:32:12 GMT smerkli [6699] * code/branches/chat/src/libraries/network/ChatListener.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) shit works xD Mon, 12 Apr 2010 15:08:27 GMT smerkli [6698] * code/branches/chat/src/orxonox/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) ChatHistory is not being constructed, no idea why. Mon, 12 Apr 2010 15:04:07 GMT jo [6697] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) boost feature added Mon, 12 Apr 2010 14:52:01 GMT solex [6696] * 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) Master now limiting its formation size and revokes it with a ... Mon, 12 Apr 2010 14:18:12 GMT solex [6695] * 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) master now lists slaves Mon, 12 Apr 2010 14:08:15 GMT ebeier [6694] * code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified) * code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (modified) * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/svntest.txt (deleted) added some speedpickup templates Mon, 12 Apr 2010 14:06:46 GMT smerkli [6693] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) questions resolved, ready for in-game testing. Mon, 12 Apr 2010 14:00:30 GMT jo [6692] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) some bugs removed, with friendlyfire option Mon, 12 Apr 2010 13:48:24 GMT kolibri7 [6691] * code/branches/lod/data/levels/presentationLOD.oxw (added) * code/branches/lod/data/levels/presentationLODdif.oxw (added) * code/branches/lod/src/orxonox/Level.cc (modified) * code/branches/lod/src/orxonox/Level.h (modified) * code/branches/lod/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (added) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (added) * code/branches/lod/src/orxonox/graphics/Model.cc (modified) * code/branches/lod/src/orxonox/graphics/Model.h (modified) implementing the XMLPort function for LoD; getting some erreors from ... Mon, 12 Apr 2010 13:30:51 GMT smerkli [6690] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) Few changes before the questions, completing doxy stuff. Mon, 12 Apr 2010 13:17:17 GMT benedict [6689] * code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi (modified) * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (modified) * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (modified) fixed some issues with the templates Mon, 12 Apr 2010 13:15:44 GMT smerkli [6688] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) Completed and tested the code as far as I could, now preparing questions. Mon, 12 Apr 2010 12:52:45 GMT jo [6686] * code/branches/dynamicmatch/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) first version- not playable yet Mon, 12 Apr 2010 12:21:39 GMT benedict [6685] * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (modified) created small, medium and huge invisibility pickup tempaltes Mon, 12 Apr 2010 11:55:31 GMT benedict [6684] * code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc (modified) minor changes in intendation & commenting Mon, 12 Apr 2010 11:24:24 GMT solex [6683] * 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) master/slave behavior enhancments Mon, 12 Apr 2010 11:11:26 GMT smerkli [6682] * code/branches/chat/src/libraries/network/ChatListener.cc (modified) added chatlistener method for debugging (ChatListener.cc) Sun, 11 Apr 2010 14:29:06 GMT ebeier [6681] * code/branches/ppspickups1/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) added svn:eol-style native Fri, 09 Apr 2010 18:30:12 GMT dafrick [6679] * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) Fixed annoying bug in PickupInventory (typos ;) ), use and drop ... Fri, 02 Apr 2010 15:35:14 GMT dafrick [6675] * code/branches/pickup4/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/pickup4/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/data/levels/includes/pickups.oxi (modified) * code/branches/pickup4/data/levels/pickup.oxw (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.h (modified) * code/branches/pickup4/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/pickup4/src/orxonox/worldentities/pawns/Pawn.cc (modified) Lua bugs fixed. Renamed name and description in PickupRepresentation ... Thu, 01 Apr 2010 14:24:59 GMT erwin [6674] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) A few new tries to fix the sound problem: no success Thu, 01 Apr 2010 14:20:47 GMT gionc [6673] * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified) * code/branches/skybox2/src/orxonox/worldentities/ControllableEntity.h (modified) First version of SkyboxGenerator Thu, 01 Apr 2010 11:52:24 GMT rgrieder [6671] * code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestates2/data/lua/Tools.lua (added) Added Tools.lua and moved 'find' in InitialiseGUI.lua to ... Thu, 01 Apr 2010 11:46:53 GMT rgrieder [6670] * code/branches/gamestates2/data/lua/LuaStateInit.lua (modified) * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Lua errors in 'doFile', 'includeFile' or 'require' should not be ... Thu, 01 Apr 2010 08:21:35 GMT dafrick [6669] * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) * code/branches/pickup4/src/modules/pickup/PickupManager.h (modified) Committing recent changes in PickupInventory, to be able to try out ... Wed, 31 Mar 2010 10:46:09 GMT rgrieder [6667] * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) Found the darn bug! The Lua error handling function may have been ... Wed, 31 Mar 2010 00:37:45 GMT rgrieder [6666] * code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestates2/data/gui/scripts/GUITools.lua (modified) Fixed problem that can occur when BasicGUI cannot be loaded.