# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 22, 2024, 5:00:33 PM 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 12:10:30 GMT scheusso [6714] * code/tags/map (copied) creating map tag in order to ditch it Tue, 13 Apr 2010 08:49:13 GMT dafrick [6713] * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) Adjusted SpeedPickup such that the Engine is the actual PickupCarrier ... Tue, 13 Apr 2010 08:46:39 GMT dafrick [6712] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/pickups_invisible.oxi (deleted) * code/trunk/data/levels/includes/pickups_speed.oxi (deleted) * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/data/levels/pickup_pps_invi.oxw (modified) * code/trunk/data/levels/pickup_ppstest1.oxw (modified) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/levels/templates/pickup_representation_templates_invisible.oxt (deleted) * code/trunk/data/levels/templates/pickup_representation_templates_speed.oxt (deleted) Merged pickup_representation_templates into one. Merged pickups.oxi ... Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711] * code/trunk (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/data/overlays/hudtemplates3.oxo (modified) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged pickup4 branch back to trunk. Tue, 13 Apr 2010 07:50:11 GMT dafrick [6710] * code/trunk (modified) * code/trunk/data/levels/includes/pickups_invisible.oxi (copied) * code/trunk/data/levels/pickup_pps_invi.oxw (copied) * code/trunk/data/levels/templates/pickup_representation_templates_invisible.oxt (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (copied) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (copied) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) Merged ppspickups2 branch into trunk. Tue, 13 Apr 2010 07:32:08 GMT dafrick [6709] * code/trunk (modified) * code/trunk/data/levels/includes/pickups_speed.oxi (copied) * code/trunk/data/levels/pickup_ppstest1.oxw (copied) * code/trunk/data/levels/templates/pickup_representation_templates_speed.oxt (copied) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (copied) * code/trunk/src/modules/pickup/items/SpeedPickup.h (copied) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged ppspickups1 into trunk. 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 ... Tue, 06 Apr 2010 13:04:26 GMT scheusso [6677] * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) this removes problems with the HUDSpeedBar on some machines (by ... Tue, 06 Apr 2010 09:00:44 GMT rgrieder [6676] * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) Removed some msvc float warnings. 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. Wed, 31 Mar 2010 00:36:48 GMT rgrieder [6665] * code/branches/gamestates2/data/lua/LuaStateInit.lua (modified) Fixed problems with the return value of require() Tue, 30 Mar 2010 23:11:21 GMT rgrieder [6664] * code/branches/gamestates2/data/gui/schemes/SleekSpaceHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/SleekSpaceLook.scheme (modified) * code/branches/gamestates2/data/gui/schemes/SleekSpaceMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/TaharezMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/VanillaHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/VanillaMenuWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/WindowsHUDWidgets.scheme (modified) * code/branches/gamestates2/data/gui/schemes/WindowsMenuWidgets.scheme (modified) svn:eol-style "native" for all text based files. Tue, 30 Mar 2010 23:06:55 GMT rgrieder [6663] * code/branches/gamestates2/data/lua/Debugger.lua (modified) * code/branches/gamestates2/data/lua/Strict.lua (modified) svn:eol-style "native" for all text based files. Tue, 30 Mar 2010 23:05:28 GMT rgrieder [6662] * code/branches/gamestates2 (modified) * 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/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/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/Debugger.lua (copied) * code/branches/gamestates2/data/lua/LuaStateInit.lua (modified) * code/branches/gamestates2/data/lua/Strict.lua (copied) * code/branches/gamestates2/src/libraries/core/Core.cc (modified) * code/branches/gamestates2/src/libraries/core/Core.h (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates2/src/libraries/core/GUIManager.h (modified) * code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) * code/branches/gamestates2/src/libraries/core/LuaState.h (modified) * code/branches/gamestates2/src/libraries/core/Resource.cc (modified) * code/branches/gamestates2/src/libraries/core/Resource.h (modified) * 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/InputManager.cc (modified) * code/branches/gamestates2/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/gamestates2/src/libraries/core/input/InputState.h (modified) * code/branches/gamestates2/src/libraries/util/Singleton.h (modified) Merged revisions 6621-6661 to gamestates2. Tue, 30 Mar 2010 22:54:35 GMT rgrieder [6661] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) Fixed Lua stack trace output if Debugger could not be started. Tue, 30 Mar 2010 22:04:30 GMT rgrieder [6660] * code/branches/gamestate/data/lua/Debugger.lua (modified) * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) Improved Lua error handling: Clearer messages and debugger hook. So, ... Tue, 30 Mar 2010 14:34:01 GMT rgrieder [6659] * code/branches/gamestate/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestate/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified) Use "P." instead of "P:" when using our sheets as objects, not ... Tue, 30 Mar 2010 13:41:15 GMT rgrieder [6658] * code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/gamestate/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestate/src/libraries/core/GUIManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestate/src/orxonox/gamestates/GSMainMenu.cc (modified) Restructured InitialiseGUI.lua a little bit. Also sorted out cursor ... Tue, 30 Mar 2010 10:13:33 GMT rgrieder [6657] * code/branches/gamestate/src/libraries/core/input/InputDevice.h (modified) * code/branches/gamestate/src/libraries/core/input/InputHandler.h (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.cc (modified) * code/branches/gamestate/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputState.h (modified) * code/branches/gamestate/src/libraries/util/Singleton.h (modified) Implemented indirect function calls for input events. It simply means ... Tue, 30 Mar 2010 09:28:21 GMT rgrieder [6656] * code/branches/gamestate/src/libraries/core/input/InputManager.h (modified) * code/branches/gamestate/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/gamestate/src/libraries/core/input/InputState.h (modified) Moved InputStatePriority from InputState.h to InputPrereqs.h Mon, 29 Mar 2010 21:27:36 GMT rgrieder [6655] * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) Fixed a bug in LuaState that caused Lua Debugger to malfunction when ... Mon, 29 Mar 2010 21:03:31 GMT rgrieder [6653] * code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi (modified) * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (modified) svn:eol-style "native" for all text based files. Mon, 29 Mar 2010 21:01:51 GMT rgrieder [6652] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) * code/branches/chat/src/orxonox/ChatHistory.h (modified) svn:eol-style "native" for all text based files. Mon, 29 Mar 2010 14:47:28 GMT smerkli [6649] * code/branches/chat/src/orxonox/ChatHistory.cc (modified) Minor commenting. Mon, 29 Mar 2010 14:44:54 GMT ebeier [6648] * code/branches/ppspickups1/svntest.txt (modified) Mon, 29 Mar 2010 14:44:24 GMT ebeier [6647] * code/branches/ppspickups1/svntest.txt (modified) Mon, 29 Mar 2010 14:43:20 GMT benedict [6646] * code/branches/ppspickups1/svntest.txt (modified) test 1 Mon, 29 Mar 2010 14:41:31 GMT ebeier [6645] * code/branches/ppspickups1/svntest.txt (added) a svn test Mon, 29 Mar 2010 14:41:19 GMT smerkli [6644] * code/branches/chat/src/orxonox/ChatHistory.cc (added) * code/branches/chat/src/orxonox/ChatHistory.h (added) Added initial chathistory cc file and header. Very basic, still, and ... Mon, 29 Mar 2010 14:39:25 GMT ebeier [6643] * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.h (modified) * code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc (modified) engine stripes now working correctly Mon, 29 Mar 2010 14:35:06 GMT benedict [6642] * code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi (added) * code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt (added) added 2 files (pickup definitions) Mon, 29 Mar 2010 14:33:22 GMT benedict [6641] * code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw (modified) * code/branches/ppspickups2/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups2/src/modules/pickup/Pickup.h (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) * code/branches/ppspickups2/src/orxonox/interfaces/PickupCarrier.h (modified) Invisibility works. Timer for invi works. Mon, 29 Mar 2010 14:23:08 GMT solex [6640] * 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) * code/branches/ai/src/orxonox/worldentities/pawns/Pawn.h (modified) first bot master/slave behavior Mon, 29 Mar 2010 14:01:57 GMT edwind [6639] * code/branches/fps/cmake/LibraryConfig.cmake (modified) adding ogre bsp plugin Mon, 29 Mar 2010 12:00:30 GMT smerkli [6637] * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) Removed ChatBox and CEGuiSample from CMakeLists.txt Mon, 29 Mar 2010 11:52:33 GMT smerkli [6636] * code/branches/chat/src/orxonox/graphics/CEGuiSample.cc (added) * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) Added CEGuiSample.cc for testing of Chatbox class Mon, 29 Mar 2010 11:46:38 GMT scheusso [6635] * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) ChatBox.cc compiles fine now Mon, 29 Mar 2010 11:44:13 GMT smerkli [6634] * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) ChatBox Changes, DemoSample correctly named ChatBox now Mon, 29 Mar 2010 11:29:48 GMT scheusso [6633] * code/branches/chat/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.cc (modified) * code/branches/chat/src/orxonox/graphics/ChatBox.h (modified) some adjustments (tabs to spaces, etc.) Mon, 29 Mar 2010 10:30:32 GMT dafrick [6632] * code/branches/pickup4/data/gui/layouts/PickupInventory.layout (modified) * code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) * code/branches/pickup4/data/gui/scripts/QuestGUI.lua (modified) * code/branches/pickup4/data/overlays/hudtemplates3.oxo (modified) * code/branches/pickup4/src/modules/pickup/CMakeLists.txt (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/PickupPrereqs.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/CMakeLists.txt (modified) * code/branches/pickup4/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup4/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/pickup4/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/pickup4/src/orxonox/worldentities/pawns/Pawn.h (modified) Working towards a functioning PickupInventory. Mon, 29 Mar 2010 09:28:59 GMT sfluecki [6631] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) damit semi alles hat Sun, 28 Mar 2010 20:47:27 GMT rgrieder [6630] * code/branches/gamestate/data/lua/Strict.lua (added) Added Strict.lua: When activated with require("Strict"), it will ... Sun, 28 Mar 2010 20:46:07 GMT rgrieder [6629] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) Fixed LuaState::doFile return value issue. Sun, 28 Mar 2010 18:54:46 GMT rgrieder [6628] * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) Lua Debugger is not written for Lua 5.0. Only include it for 5.1 and ... Sun, 28 Mar 2010 17:45:40 GMT rgrieder [6627] * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) Added Lua debugging support for XML embedded Lua code (even steps ... Sun, 28 Mar 2010 17:16:12 GMT rgrieder [6626] * code/branches/gamestate/data/lua/Debugger.lua (modified) * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/LuaState.h (modified) Modified Debugger.lua so we can debug any Lua files from our ... Sun, 28 Mar 2010 13:21:44 GMT rgrieder [6625] * code/branches/gamestate/src/libraries/core/LuaState.cc (modified) * code/branches/gamestate/src/libraries/core/Resource.cc (modified) * code/branches/gamestate/src/libraries/core/Resource.h (modified) Lua debugger working perfectly by supplying the fully qualified ... Sat, 27 Mar 2010 16:51:54 GMT rgrieder [6624] * code/branches/gamestate/data/lua/Debugger.lua (added) * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) Added Debugger.lua by Dave Nichols of Match-IT Limited. It is a ... Sat, 27 Mar 2010 16:48:34 GMT rgrieder [6623] * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestate/data/lua/LuaStateInit.lua (modified) The lua "print" function was previously stored in "debug" --> changed ... Sat, 27 Mar 2010 16:39:26 GMT rgrieder [6622] * code/branches/gamestate/src/libraries/core/Core.cc (modified) * code/branches/gamestate/src/libraries/core/Core.h (modified) Made IOConsole optional: use "--noIOConsole" or set config value ... Fri, 26 Mar 2010 19:51:37 GMT rgrieder [6621] * code/branches/gamestate/data/gui/scripts/AudioMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/BasicGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/GUITools.lua (modified) * code/branches/gamestate/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InGameMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/InfoPopup.lua (modified) * code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MainMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/PickupInventory.lua (modified) * code/branches/gamestate/data/gui/scripts/QuestGUI.lua (modified) * code/branches/gamestate/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua (modified) Simplified GUI sheet creation (first lines in the lua file) a lot by ... Thu, 25 Mar 2010 22:03:20 GMT rgrieder [6620] * code/trunk/src/external/tinyxml/VERSION (modified) * code/trunk/src/external/tinyxml/tinyxml.cpp (modified) * code/trunk/src/external/tinyxml/tinyxml.h (modified) * code/trunk/src/external/tinyxml/tinyxmlparser.cpp (modified) Updated TinyXML++ to the latest trunk revision. Only adds a function ... Thu, 25 Mar 2010 19:03:17 GMT rgrieder [6619] * code/branches/skybox2/src/modules/designtools/CMakeLists.txt (modified) * code/branches/skybox2/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified) svn:eol-style "native" for all text based files. Thu, 25 Mar 2010 14:34:00 GMT gionc [6616] * code/branches/skybox2/src/modules/designtools/CMakeLists.txt (modified) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (added) * code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (added) Added SkyboxGenerator class, implemented console command Wed, 24 Mar 2010 08:39:54 GMT sfluecki [6615] * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) Grössenangaben / Ausrichtung von Close_button & Titelbar im PickupHUD ... Wed, 24 Mar 2010 08:11:12 GMT scurcio [6614] * code/branches/hudelements/data/gui/layouts/InGameMenu.layout (modified) * code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) close button pickup Tue, 23 Mar 2010 15:50:04 GMT rgrieder [6611] * code/branches/png/data/overlays/hudtemplates3.oxo (modified) * code/branches/png/data/overlays/underattackhud.oxo (modified) * code/branches/png/data/particle/smoke1.particle (modified) Replaced *.tga with *.png Tue, 23 Mar 2010 15:48:10 GMT rgrieder [6610] * code/branches/png (copied) Creating TGA -> PNG test branch. Mon, 22 Mar 2010 21:45:09 GMT ebeier [6607] * code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/Pickup.h (modified) * code/branches/ppspickups1/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.cc (modified) * code/branches/ppspickups1/src/orxonox/items/Engine.h (modified) * code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.h (modified) first working version of the SpeedPickup, needs some more work for ...