# # ChangeLog for code # # Generated by Trac 1.0.9 # May 23, 2024, 5:21:36 AM Thu, 30 Jul 2009 22:52:09 GMT rgrieder [3374] * code/branches/resource2/media (added) * code/branches/resource2/media/defaultConfig (added) * code/branches/resource2/media/defaultConfig/keybindings.ini (added) * code/branches/resource2/media/defaultConfig/masterKeybindings.ini (added) * code/branches/resource2/media/gui (added) * code/branches/resource2/media/gui/configs (added) * code/branches/resource2/media/gui/configs/CEGUIConfig.xsd (added) * code/branches/resource2/media/gui/layouts (added) * code/branches/resource2/media/gui/layouts/CompositorDemo.layout (added) * code/branches/resource2/media/gui/layouts/Console.wnd (added) * code/branches/resource2/media/gui/layouts/CrowdDemo.layout (added) * code/branches/resource2/media/gui/layouts/Demo7Windows.layout (added) * code/branches/resource2/media/gui/layouts/Demo8.layout (added) * code/branches/resource2/media/gui/layouts/DragDropDemo.layout (added) * code/branches/resource2/media/gui/layouts/FontDemo.layout (added) * code/branches/resource2/media/gui/layouts/GUILayout.xsd (added) * code/branches/resource2/media/gui/layouts/InGameTest.layout (added) * code/branches/resource2/media/gui/layouts/InstancingDemo.layout (added) * code/branches/resource2/media/gui/layouts/MainMenu.layout (added) * code/branches/resource2/media/gui/layouts/MainMenu_2.layout (added) * code/branches/resource2/media/gui/layouts/PickupInventory.layout (added) * code/branches/resource2/media/gui/layouts/TabControlDemo.layout (added) * code/branches/resource2/media/gui/layouts/TabPage.layout (added) * code/branches/resource2/media/gui/layouts/TabPage1.layout (added) * code/branches/resource2/media/gui/layouts/TabPage2.layout (added) * code/branches/resource2/media/gui/layouts/TextDemo.layout (added) * code/branches/resource2/media/gui/layouts/TreeDemoTaharez.layout (added) * code/branches/resource2/media/gui/layouts/VanillaConsole.layout (added) * code/branches/resource2/media/gui/layouts/VanillaWindows.layout (added) * code/branches/resource2/media/gui/layouts/cegui8.layout (added) * code/branches/resource2/media/gui/layouts/facial.layout (added) * code/branches/resource2/media/gui/layouts/ogregui.layout (added) * code/branches/resource2/media/gui/layouts/shadows.layout (added) * code/branches/resource2/media/gui/schemes (added) * code/branches/resource2/media/gui/schemes/Demo8.scheme (added) * code/branches/resource2/media/gui/schemes/GUIScheme.xsd (added) * code/branches/resource2/media/gui/schemes/OrxonoxGUIScheme.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLook.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLookSkin.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLookWidgetAliases.scheme (added) * code/branches/resource2/media/gui/schemes/TaharezLookWidgets.scheme (added) * code/branches/resource2/media/gui/schemes/VanillaSkin.scheme (added) * code/branches/resource2/media/gui/schemes/WindowsLook.scheme (added) * code/branches/resource2/media/gui/schemes/WindowsLookWidgets.scheme (added) * code/branches/resource2/media/gui/scripts (added) * code/branches/resource2/media/gui/scripts/IConsole.lua (added) * code/branches/resource2/media/gui/scripts/InstancedInit.lua (added) * code/branches/resource2/media/gui/scripts/PickupInventory.lua (added) * code/branches/resource2/media/gui/scripts/demo8.lua (added) * code/branches/resource2/media/gui/scripts/gui.lua (added) * code/branches/resource2/media/gui/scripts/inGameTest.lua (added) * code/branches/resource2/media/gui/scripts/loadGUI.lua (added) * code/branches/resource2/media/gui/scripts/loadGUI_2.lua (added) * code/branches/resource2/media/gui/scripts/loadGUI_3.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu_2.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu_3.lua (added) * code/branches/resource2/media/gui/scripts/mainmenu_4.lua (added) * code/branches/resource2/media/levels (added) * code/branches/resource2/media/levels/empty_level.oxw (added) * code/branches/resource2/media/levels/gametype_asteroids.oxw (added) * code/branches/resource2/media/levels/gametype_underattack.oxw (added) * code/branches/resource2/media/levels/includes (added) * code/branches/resource2/media/levels/includes/CuboidSpaceStation.lua (added) * code/branches/resource2/media/levels/includes/weaponsettings1.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings2.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings3.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings_H2.oxi (added) * code/branches/resource2/media/levels/includes/weaponsettings_pirate.oxi (added) * code/branches/resource2/media/levels/old (added) * code/branches/resource2/media/levels/old/CuboidSpaceStation.oxw (added) * code/branches/resource2/media/levels/old/physicstest.oxw (added) * code/branches/resource2/media/levels/old/physicstest2.oxw (added) * code/branches/resource2/media/levels/old/planettest.oxw (added) * code/branches/resource2/media/levels/old/presentation_physics.oxw (added) * code/branches/resource2/media/levels/old/princessaeryn.oxw (added) * code/branches/resource2/media/levels/old/questsystem.oxw (added) * code/branches/resource2/media/levels/old/sample4.oxw (added) * code/branches/resource2/media/levels/old/spaceshiptemplates_physics.oxw (added) * code/branches/resource2/media/levels/old/tutorial_hs08.oxw (added) * code/branches/resource2/media/levels/pickuptest.oxw (added) * code/branches/resource2/media/levels/presentation.oxw (added) * code/branches/resource2/media/levels/presentation09.oxw (added) * code/branches/resource2/media/levels/presentation09b.oxw (added) * code/branches/resource2/media/levels/presentation_dm.oxw (added) * code/branches/resource2/media/levels/presentation_pong.oxw (added) * code/branches/resource2/media/levels/teambasematchlevel.oxw (added) * code/branches/resource2/media/levels/teamdeathmatch.oxw (added) * code/branches/resource2/media/levels/templates (added) * code/branches/resource2/media/levels/templates/spaceship_H2.oxt (added) * code/branches/resource2/media/levels/templates/spaceship_assff.oxt (added) * code/branches/resource2/media/levels/templates/spaceship_pirate.oxt (added) * code/branches/resource2/media/levels/tutorial.oxw (added) * code/branches/resource2/media/levels/waypoints.oxw (added) * code/branches/resource2/media/overlay (added) * code/branches/resource2/media/overlay/OrxonoxLoading.overlay (added) * code/branches/resource2/media/overlay/debug.oxo (added) * code/branches/resource2/media/overlay/hud.oxo (added) * code/branches/resource2/media/overlay/hudtemplates3.oxo (added) * code/branches/resource2/media/overlay/ponghud.oxo (added) * code/branches/resource2/media/overlay/stats.oxo (added) * code/branches/resource2/media/overlay/teambasematchhud.oxo (added) * code/branches/resource2/media/overlay/underattackhud.oxo (added) * code/branches/resource2/media/particle (added) * code/branches/resource2/media/particle/Example-Water.particle (added) * code/branches/resource2/media/particle/Example.particle (added) * code/branches/resource2/media/particle/ExplosionComp1.particle (added) * code/branches/resource2/media/particle/ExplosionComp2.particle (added) * code/branches/resource2/media/particle/ExplosionComp4.particle (added) * code/branches/resource2/media/particle/FireComp2.particle (added) * code/branches/resource2/media/particle/LaserGun.particle (added) * code/branches/resource2/media/particle/ThrusterFire.particle (added) * code/branches/resource2/media/particle/bigexplosion1part1.particle (added) * code/branches/resource2/media/particle/bigexplosion1part2.particle (added) * code/branches/resource2/media/particle/bigexplosion1part3.particle (added) * code/branches/resource2/media/particle/emitted_emitter.particle (added) * code/branches/resource2/media/particle/engineglow.particle (added) * code/branches/resource2/media/particle/explosion1.particle (added) * code/branches/resource2/media/particle/explosion2.particle (added) * code/branches/resource2/media/particle/explosion2b.particle (added) * code/branches/resource2/media/particle/explosion3.particle (added) * code/branches/resource2/media/particle/fairytwirl.particle (added) * code/branches/resource2/media/particle/fire3.particle (added) * code/branches/resource2/media/particle/fire4.particle (added) * code/branches/resource2/media/particle/forcefield.particle (added) * code/branches/resource2/media/particle/ray1.particle (added) * code/branches/resource2/media/particle/ray2.particle (added) * code/branches/resource2/media/particle/repairGold.particle (added) * code/branches/resource2/media/particle/repairSilver.particle (added) * code/branches/resource2/media/particle/shot1.particle (added) * code/branches/resource2/media/particle/shot2.particle (added) * code/branches/resource2/media/particle/shot2_small.particle (added) * code/branches/resource2/media/particle/shot3_small.particle (added) * code/branches/resource2/media/particle/shotTest.particle (added) * code/branches/resource2/media/particle/smoke1.particle (added) * code/branches/resource2/media/particle/smoke2.particle (added) * code/branches/resource2/media/particle/smoke3.particle (added) * code/branches/resource2/media/particle/smoke4.particle (added) * code/branches/resource2/media/particle/smoke5.particle (added) * code/branches/resource2/media/particle/smoke6.particle (added) * code/branches/resource2/media/particle/smoke7.particle (added) * code/branches/resource2/media/particle/sparks.particle (added) * code/branches/resource2/media/particle/thruster1.particle (added) * code/branches/resource2/media/particle/thruster2.particle (added) * code/branches/resource2/media/particle/thruster3.particle (added) * code/branches/resource2/media/resources.cfg (added) * code/branches/resource2/media/tcl (added) * code/branches/resource2/media/tcl/init.tcl (added) * code/branches/resource2/media/tcl/irc.tcl (added) * code/branches/resource2/media/tcl/irk (added) * code/branches/resource2/media/tcl/irk/README (added) * code/branches/resource2/media/tcl/irk/docs (added) * code/branches/resource2/media/tcl/irk/docs/changes.txt (added) * code/branches/resource2/media/tcl/irk/docs/todo.txt (added) * code/branches/resource2/media/tcl/irk/docs/usage.txt (added) * code/branches/resource2/media/tcl/irk/examples (added) * code/branches/resource2/media/tcl/irk/examples/fortunebot.tcl (added) * code/branches/resource2/media/tcl/irk/examples/mysaint.tcl (added) * code/branches/resource2/media/tcl/irk/irk.tcl (added) * code/branches/resource2/media/tcl/irk/lib (added) * code/branches/resource2/media/tcl/irk/lib/irkauth.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkcommand.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkconnect.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkctcptcl.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkdispatch.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkflow.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkqueue.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkreceive.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkservers.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkstate.tcl (added) * code/branches/resource2/media/tcl/irk/lib/irkutil.tcl (added) * code/branches/resource2/media/tcl/irk/pkgIndex.tcl (added) * code/branches/resource2/media/tcl/irk/socks (added) * code/branches/resource2/media/tcl/irk/socks/socks.tcl (added) * code/branches/resource2/media/tcl/remote.tcl (added) * code/branches/resource2/media/tcl/telnet_server.tcl (added) Added most of the text based files of the media directory (the file I ... Thu, 30 Jul 2009 13:38:10 GMT rgrieder [3373] * code/branches/resource2 (copied) Created new resource branch to actually work on resource management. Thu, 30 Jul 2009 12:22:36 GMT scheusso [3372] * code/trunk/src/network/TODO (moved) cleaned up an old todo file and moved it to the network folder (as it ... Thu, 30 Jul 2009 12:22:07 GMT rgrieder [3371] * code/trunk/cmake/TargetUtilities.cmake (modified) Build fix for the revision before the merge. Thu, 30 Jul 2009 12:10:44 GMT rgrieder [3370] * code/trunk (modified) * code/trunk/cmake/Media.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/Clock.h (modified) * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/ConfigFileManager.h (modified) * code/trunk/src/core/ConsoleCommandCompilation.cc (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/GUIManager.cc (copied) * code/trunk/src/core/GUIManager.h (copied) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Game.h (modified) * code/trunk/src/core/GameMode.h (modified) * code/trunk/src/core/GameState.cc (modified) * code/trunk/src/core/GameState.h (modified) * code/trunk/src/core/GraphicsManager.cc (copied) * code/trunk/src/core/GraphicsManager.h (copied) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/core/Language.cc (modified) * code/trunk/src/core/Language.h (modified) * code/trunk/src/core/Loader.cc (modified) * code/trunk/src/core/Loader.h (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/LuaBind.h (modified) * code/trunk/src/core/Shell.cc (modified) * code/trunk/src/core/Shell.h (modified) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclBind.h (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/InputManager.h (modified) * code/trunk/src/cpptcl/changes_orxonox.diff (modified) * code/trunk/src/cpptcl/cpptcl.cc (modified) * code/trunk/src/cpptcl/cpptcl.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/GraphicsManager.cc (deleted) * code/trunk/src/orxonox/GraphicsManager.h (deleted) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrecompiledHeaders.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PawnManager.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.h (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.h (modified) * code/trunk/src/orxonox/gui (deleted) * code/trunk/src/orxonox/objects/pickup/BaseItem.h (modified) * code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupInventory.h (modified) * code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified) * code/trunk/src/orxonox/objects/quest/QuestListener.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.h (modified) * code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationManager.h (modified) * code/trunk/src/orxonox/sound/SoundBase.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/tools/ParticleInterface.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.h (modified) * code/trunk/src/orxonox/tools/Shader.cc (modified) * code/trunk/src/util/ScopeGuard.h (modified) * code/trunk/src/util/SignalHandler.cc (modified) * code/trunk/src/util/SignalHandler.h (modified) * code/trunk/src/util/Singleton.h (copied) Merged resource branch back to the trunk. Changes: - Automated ... Thu, 30 Jul 2009 12:04:22 GMT rgrieder [3369] * code/trunk/src/core/Thread.cc (modified) * code/trunk/src/core/Thread.h (modified) * code/trunk/src/core/ThreadPool.cc (modified) * code/trunk/src/core/ThreadPool.h (modified) Removed the empty merge-info property from four files. When merging ... Thu, 30 Jul 2009 11:50:39 GMT rgrieder [3368] * code/trunk/cmake/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/tolua/CMakeLists.txt (modified) Added NO_INSTALL argument for ORXONOX_ADD_EXECUTABLE/LIBRARY and ... Wed, 29 Jul 2009 21:47:22 GMT rgrieder [3367] * code/branches/resource/src/util/Singleton.h (modified) Build fixes Wed, 29 Jul 2009 20:27:10 GMT rgrieder [3366] * code/branches/resource/src/core/Clock.h (modified) * code/branches/resource/src/core/ConfigFileManager.cc (modified) * code/branches/resource/src/core/ConfigFileManager.h (modified) * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/Core.h (modified) * code/branches/resource/src/core/GUIManager.cc (modified) * code/branches/resource/src/core/GUIManager.h (modified) * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Game.h (modified) * code/branches/resource/src/core/GraphicsManager.cc (modified) * code/branches/resource/src/core/GraphicsManager.h (modified) * code/branches/resource/src/core/Language.cc (modified) * code/branches/resource/src/core/Language.h (modified) * code/branches/resource/src/core/LuaBind.cc (modified) * code/branches/resource/src/core/LuaBind.h (modified) * code/branches/resource/src/core/Shell.cc (modified) * code/branches/resource/src/core/Shell.h (modified) * code/branches/resource/src/core/TclBind.cc (modified) * code/branches/resource/src/core/TclBind.h (modified) * code/branches/resource/src/core/TclThreadManager.cc (modified) * code/branches/resource/src/core/TclThreadManager.h (modified) * code/branches/resource/src/core/input/InputManager.cc (modified) * code/branches/resource/src/core/input/InputManager.h (modified) * code/branches/resource/src/orxonox/CameraManager.cc (modified) * code/branches/resource/src/orxonox/CameraManager.h (modified) * code/branches/resource/src/orxonox/LevelManager.cc (modified) * code/branches/resource/src/orxonox/LevelManager.h (modified) * code/branches/resource/src/orxonox/PawnManager.cc (modified) * code/branches/resource/src/orxonox/PawnManager.h (modified) * code/branches/resource/src/orxonox/PlayerManager.cc (modified) * code/branches/resource/src/orxonox/PlayerManager.h (modified) * code/branches/resource/src/orxonox/objects/pickup/BaseItem.h (modified) * code/branches/resource/src/orxonox/objects/pickup/PickupInventory.h (modified) * code/branches/resource/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/resource/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/resource/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/resource/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/branches/resource/src/orxonox/overlays/console/InGameConsole.h (modified) * code/branches/resource/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/branches/resource/src/orxonox/overlays/notifications/NotificationManager.h (modified) * code/branches/resource/src/orxonox/sound/SoundManager.cc (modified) * code/branches/resource/src/orxonox/sound/SoundManager.h (modified) * code/branches/resource/src/util/SignalHandler.cc (modified) * code/branches/resource/src/util/SignalHandler.h (modified) * code/branches/resource/src/util/Singleton.h (modified) Derived all singletons implemented in a usual manner from ... Wed, 29 Jul 2009 20:04:40 GMT rgrieder [3365] * code/branches/resource/cmake/PackageConfigMSVC.cmake (modified) Build fix for msvc8. Wed, 29 Jul 2009 16:26:22 GMT rgrieder [3364] * code/branches/resource/src/util/Singleton.h (added) Added Singleton class template. It doesn't spare much of the typing ... Wed, 29 Jul 2009 15:24:39 GMT rgrieder [3363] * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/Core.h (modified) * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Game.h (modified) Exception-safety for the Game and Core c'tors as well as load/unload- ... Wed, 29 Jul 2009 15:09:09 GMT rgrieder [3362] * code/branches/resource/src/util/ScopeGuard.h (modified) Moved ScopeGuard c'tors from protected to public section in order to ... Tue, 28 Jul 2009 15:17:49 GMT rgrieder [3361] * code/branches/resource/src/core/TclThreadManager.cc (modified) * code/branches/resource/src/core/TclThreadManager.h (modified) Two little build fixes. Tue, 28 Jul 2009 15:04:38 GMT landauf [3360] * code/branches/resource/src/core/TclBind.cc (modified) * code/branches/resource/src/core/TclBind.h (modified) * code/branches/resource/src/core/TclThreadManager.cc (modified) * code/branches/resource/src/core/TclThreadManager.h (modified) * code/branches/resource/src/cpptcl/changes_orxonox.diff (modified) * code/branches/resource/src/cpptcl/cpptcl.cc (modified) * code/branches/resource/src/cpptcl/cpptcl.h (modified) - bugfix in TclBind: Tcl_Init was only called if the constructor of ... Mon, 27 Jul 2009 21:18:17 GMT rgrieder [3359] * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Identifier.h (modified) * code/branches/resource/src/core/LuaBind.h (modified) * code/branches/resource/src/core/TclThreadManager.h (modified) - Stupid MSVC extension: map::erase delivers an iterator but it ... Mon, 27 Jul 2009 12:42:37 GMT rgrieder [3358] * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/orxonox/Main.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSRoot.cc (modified) Moved startup argument parsing (console, dedicated, server, client ... Mon, 27 Jul 2009 11:57:28 GMT rgrieder [3357] * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc (modified) Moved some GameState code from activate/deactivate to the c'tor and ... Mon, 27 Jul 2009 09:13:25 GMT rgrieder [3356] * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Game.h (modified) * code/branches/resource/src/core/GameState.cc (modified) * code/branches/resource/src/core/GameState.h (modified) * code/branches/resource/src/orxonox/gamestates/GSLevel.cc (modified) GameStates requiring graphics (Level is not one of them because it ... Sun, 26 Jul 2009 12:15:08 GMT rgrieder [3355] * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/CorePrereqs.h (modified) * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Game.h (modified) * code/branches/resource/src/core/GameMode.h (modified) * code/branches/resource/src/core/GameState.cc (modified) * code/branches/resource/src/core/GameState.h (modified) * code/branches/resource/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSClient.h (modified) * code/branches/resource/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/resource/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/resource/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSMainMenu.h (modified) * code/branches/resource/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/resource/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSServer.h (modified) * code/branches/resource/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSStandalone.h (modified) Loading and unloading graphics automatically: As soon as a GameState ... Sun, 26 Jul 2009 01:23:27 GMT landauf [3354] * code/branches/resource/src/core/TclBind.cc (modified) fixed a scoping problem with the tcl console-command (due to a nested ... Sat, 25 Jul 2009 23:02:22 GMT landauf [3353] * code/branches/resource/src/core/IRC.cc (modified) * code/branches/resource/src/core/TclBind.cc (modified) * code/branches/resource/src/core/TclThreadManager.cc (modified) fixed some possible namespace issues Sat, 25 Jul 2009 20:16:37 GMT rgrieder [3352] * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Game.h (modified) Exported larger parts of the main into separate functions to have a ... Sat, 25 Jul 2009 20:11:12 GMT rgrieder [3351] * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) Build fix for windows. Sat, 25 Jul 2009 19:46:24 GMT landauf [3350] * code/branches/resource/src/core/ConsoleCommandCompilation.cc (modified) * code/branches/resource/src/core/TclBind.cc (modified) * code/branches/resource/src/core/TclThreadManager.cc (modified) small changes relating to tcl Sat, 25 Jul 2009 12:14:05 GMT rgrieder [3349] * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/Core.h (modified) * code/branches/resource/src/core/Game.cc (modified) * code/branches/resource/src/core/Game.h (modified) * code/branches/resource/src/core/GraphicsManager.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/resource/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/resource/src/orxonox/objects/quest/QuestListener.cc (modified) * code/branches/resource/src/orxonox/objects/quest/QuestManager.cc (modified) Moved InputManager, GUIManager and GraphicsManager handling from ... Fri, 24 Jul 2009 23:14:30 GMT rgrieder [3348] * code/branches/resource/src/core/Core.cc (modified) Fixing a problem for the installed version on windows: Media path is ... Fri, 24 Jul 2009 23:10:09 GMT rgrieder [3347] * code/branches/resource/cmake/PackageConfig.cmake (modified) Update to dependencies v3.0 for MinGW and MSVC Please update your ... Fri, 24 Jul 2009 19:37:19 GMT rgrieder [3346] * code/branches/resource/src/core/CMakeLists.txt (modified) * code/branches/resource/src/core/CorePrereqs.h (modified) * code/branches/resource/src/core/GUIManager.cc (copied) * code/branches/resource/src/core/GUIManager.h (copied) * code/branches/resource/src/core/GraphicsManager.cc (moved) * code/branches/resource/src/core/GraphicsManager.h (moved) * code/branches/resource/src/orxonox/CMakeLists.txt (modified) * code/branches/resource/src/orxonox/CameraManager.cc (modified) * code/branches/resource/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/resource/src/orxonox/gui (deleted) * code/branches/resource/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/branches/resource/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/branches/resource/src/orxonox/overlays/GUIOverlay.cc (modified) * code/branches/resource/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/resource/src/orxonox/tools/Shader.cc (modified) Moved GraphicsManager and GUIManager to the core. Almost no actual ... Fri, 24 Jul 2009 19:31:31 GMT rgrieder [3345] * code/branches/resource/cmake/Media.cmake (modified) * code/branches/resource/cmake/PackageConfig.cmake (modified) * code/branches/resource/src/SpecialConfig.h.in (modified) * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/Core.h (modified) * code/branches/resource/src/core/TclBind.cc (modified) Fixed installation: The Tcl script library should now be found in the ... Fri, 24 Jul 2009 16:00:36 GMT landauf [3344] * code/branches/resource/cmake/PackageConfig.cmake (modified) * code/branches/resource/src/SpecialConfig.h.in (modified) * code/branches/resource/src/core/TclBind.cc (modified) * code/branches/resource/src/core/TclBind.h (modified) * code/branches/resource/src/core/TclThreadManager.cc (modified) tcl uses it's native library, orxonox adds new features later ... Fri, 24 Jul 2009 14:25:33 GMT rgrieder [3343] * code/branches/resource/src/core/Core.cc (modified) * code/branches/resource/src/core/Core.h (modified) * code/branches/resource/src/core/GameMode.h (modified) * code/branches/resource/src/orxonox/LevelManager.cc (modified) * code/branches/resource/src/orxonox/OrxonoxPrecompiledHeaders.h (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) Expanded Core class by loadGraphics and unloadGraphics which don't do ... Fri, 24 Jul 2009 12:14:24 GMT rgrieder [3342] * code/branches/resource/src/orxonox/sound/SoundBase.cc (modified) * code/branches/resource/src/orxonox/sound/SoundManager.cc (modified) Small stuff I found when browsing around. Fri, 24 Jul 2009 09:17:34 GMT rgrieder [3341] * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) Dedicated input thread now ends without hitting enter on Unix Thu, 23 Jul 2009 18:47:55 GMT rgrieder [3340] * code/branches/resource/src/core/LuaBind.cc (modified) * code/branches/resource/src/core/LuaBind.h (modified) * code/branches/resource/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/resource/src/orxonox/gui/GUIManager.cc (modified) Generalised use of tolua interfaces a bit: GSRoot now adds the ... Thu, 23 Jul 2009 18:04:51 GMT rgrieder [3339] * code/branches/resource/src/core/Loader.cc (modified) * code/branches/resource/src/core/Loader.h (modified) * code/branches/resource/src/orxonox/LevelManager.cc (modified) * code/branches/resource/src/orxonox/LevelManager.h (modified) * code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/resource/src/orxonox/gui/GUIManager.cc (modified) * code/branches/resource/src/orxonox/gui/GUIManager.h (modified) Moved GUIManager::getLevelList to LevelManager because the GUIManager ... Thu, 23 Jul 2009 12:20:51 GMT rgrieder [3338] * code/branches/resource/src/orxonox/GraphicsManager.cc (modified) * code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource/src/orxonox/gui/GUIManager.cc (modified) * code/branches/resource/src/orxonox/gui/GUIManager.h (modified) Improved exception-safety in the GUIManager. Thu, 23 Jul 2009 11:34:31 GMT rgrieder [3337] * code/branches/resource/src/orxonox/gui/GUIManager.cc (modified) * code/branches/resource/src/orxonox/gui/GUIManager.h (modified) * code/branches/resource/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/resource/src/orxonox/overlays/GUIOverlay.cc (modified) Removed GUIOverlay management from GUIManager: It shouldn't be the ... Thu, 23 Jul 2009 10:15:06 GMT rgrieder [3336] * code/branches/resource/src/orxonox/GraphicsManager.cc (modified) * code/branches/resource/src/orxonox/GraphicsManager.h (modified) * code/branches/resource/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/resource/src/orxonox/tools/ParticleInterface.h (modified) Moved Config value detailLevelParticle from GraphicsManager to ... Thu, 23 Jul 2009 10:09:56 GMT rgrieder [3335] * code/trunk/TODO (modified) Test commit. Wed, 22 Jul 2009 14:05:08 GMT Naaduun [3334] * code/trunk/src/orxonox/overlays/map/Map.cc (modified) =Fixed a camera bug in map Wed, 22 Jul 2009 11:00:46 GMT rgrieder [3333] * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/core/OrxonoxClass.h (modified) Adjusted orxonox_cast to support const pointers. References shall not ... Tue, 21 Jul 2009 10:54:15 GMT rgrieder [3332] * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/util/MultiType.h (modified) * code/trunk/src/util/TemplateUtils.h (modified) * code/trunk/src/util/TypeTraits.h (added) Added TypeTraits.h from the Loki library (stripped it a bit though). ... Tue, 21 Jul 2009 10:08:59 GMT rgrieder [3331] * code/trunk/src/core/input/InputManager.cc (modified) Minor problem with exception catching. Tue, 21 Jul 2009 09:53:13 GMT rgrieder [3330] * code/trunk/cmake/BuildConfig.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) Added general PCH_ENABLE option in CMake to disable PCH with one ... Sun, 19 Jul 2009 17:05:00 GMT rgrieder [3329] * code/trunk/src/core/input/JoyStick.cc (modified) Build fix for the JoyStick. Sun, 19 Jul 2009 16:01:22 GMT rgrieder [3328] * code/branches/resource (copied) Created branch to work on resource management (first) and then on the ... Sun, 19 Jul 2009 15:31:02 GMT rgrieder [3327] * code/trunk (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/OrxonoxClass.h (modified) * code/trunk/src/core/WindowEventListener.cc (copied) * code/trunk/src/core/WindowEventListener.h (copied) * code/trunk/src/core/input/Button.cc (modified) * code/trunk/src/core/input/Button.h (modified) * code/trunk/src/core/input/CMakeLists.txt (modified) * code/trunk/src/core/input/ExtendedInputState.cc (deleted) * code/trunk/src/core/input/ExtendedInputState.h (deleted) * code/trunk/src/core/input/HalfAxis.cc (modified) * code/trunk/src/core/input/HalfAxis.h (modified) * code/trunk/src/core/input/InputBuffer.cc (modified) * code/trunk/src/core/input/InputBuffer.h (modified) * code/trunk/src/core/input/InputCommands.h (modified) * code/trunk/src/core/input/InputDevice.h (copied) * code/trunk/src/core/input/InputHandler.h (copied) * code/trunk/src/core/input/InputInterfaces.h (deleted) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/InputManager.h (modified) * code/trunk/src/core/input/InputPrereqs.h (copied) * code/trunk/src/core/input/InputState.cc (copied) * code/trunk/src/core/input/InputState.h (modified) * code/trunk/src/core/input/JoyStick.cc (copied) * code/trunk/src/core/input/JoyStick.h (copied) * code/trunk/src/core/input/JoyStickDeviceNumberListener.cc (deleted) * code/trunk/src/core/input/JoyStickDeviceNumberListener.h (deleted) * code/trunk/src/core/input/JoyStickQuantityListener.cc (copied) * code/trunk/src/core/input/JoyStickQuantityListener.h (copied) * code/trunk/src/core/input/KeyBinder.cc (modified) * code/trunk/src/core/input/KeyBinder.h (modified) * code/trunk/src/core/input/KeyDetector.cc (modified) * code/trunk/src/core/input/KeyDetector.h (modified) * code/trunk/src/core/input/Keyboard.cc (copied) * code/trunk/src/core/input/Keyboard.h (copied) * code/trunk/src/core/input/Mouse.cc (copied) * code/trunk/src/core/input/Mouse.h (copied) * code/trunk/src/core/input/SimpleInputState.cc (deleted) * code/trunk/src/core/input/SimpleInputState.h (deleted) * code/trunk/src/orxonox/GraphicsManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gui/GUIManager.cc (modified) * code/trunk/src/orxonox/gui/GUIManager.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/WindowEventListener.h (deleted) * code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.h (modified) * code/trunk/src/util/StringUtils.cc (modified) * code/trunk/src/util/StringUtils.h (modified) Merged all remaining revisions from core4 back to the trunk. Sun, 19 Jul 2009 14:15:09 GMT landauf [3326] * code/trunk/src/core/TclThreadManager.cc (modified) small fix against the thread-exit assertion failure Sun, 19 Jul 2009 13:48:00 GMT rgrieder [3325] * code/trunk (modified) * code/trunk/src/core/CoreIncludes.h (modified) * code/trunk/src/core/EventIncludes.h (modified) * code/trunk/src/core/Identifier.cc (modified) * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/core/Iterator.h (modified) * code/trunk/src/core/OrxonoxClass.h (modified) * code/trunk/src/core/Super.h (modified) * code/trunk/src/core/XMLPort.h (modified) * code/trunk/src/network/NetworkFunction.h (modified) * code/trunk/src/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/orxonox/interfaces/Tickable.h (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Scene.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/objects/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified) * code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/objects/items/Engine.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Attacher.cc (modified) * code/trunk/src/orxonox/objects/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc (modified) * code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/trunk/src/orxonox/overlays/hud/AnnounceMessage.cc (modified) * code/trunk/src/orxonox/overlays/hud/DeathMessage.cc (modified) * code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDTimer.cc (modified) * code/trunk/src/orxonox/overlays/hud/KillMessage.cc (modified) * code/trunk/src/orxonox/overlays/hud/PongScore.cc (modified) * code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/orxonox/overlays/hud/UnderAttackHealthBar.cc (modified) * code/trunk/src/orxonox/overlays/map/Map.cc (modified) Merged orxonox_cast related revisions from core4 back to trunk. Sun, 19 Jul 2009 13:37:06 GMT rgrieder [3324] * code/trunk/Doxyfile (deleted) Deleted obsolete and deprecated file. The new one is in ... Sun, 19 Jul 2009 13:11:15 GMT rgrieder [3323] * code/trunk/cmake/BuildConfig.cmake (modified) * code/trunk/src/core/CommandLine.cc (modified) * code/trunk/src/core/CommandLine.h (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Game.h (modified) * code/trunk/src/orxonox/GraphicsManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) ORXONOX_USE_WINMAIN should now work as expected. Sun, 19 Jul 2009 13:08:36 GMT rgrieder [3322] * code/trunk/src/core/CorePrecompiledHeaders.h (modified) * code/trunk/src/network/NetworkPrecompiledHeaders.h (modified) * code/trunk/src/orxonox/OrxonoxPrecompiledHeaders.h (modified) Removed unnecessary PCH dependencies. Sun, 19 Jul 2009 13:07:52 GMT rgrieder [3321] * code/trunk/src/core/TclThreadManager.h (modified) Build fix for the TclThreadManager. Sun, 19 Jul 2009 13:07:22 GMT rgrieder [3320] * code/tags/0.0.3 (copied) Finally cFinally made the v0.0.3 tag (again again). Sun, 19 Jul 2009 13:06:40 GMT rgrieder [3319] * code/branches/0.0.3 (deleted) Well, well, well, and I thought I had slept enough. Sun, 19 Jul 2009 13:05:15 GMT rgrieder [3318] * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclThreadList.h (copied) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) Re-reverting TclThreadManager changes. Sun, 19 Jul 2009 13:04:51 GMT rgrieder [3317] * code/branches/0.0.3 (copied) Finally cFinally made the v0.0.3 tag (again). Sun, 19 Jul 2009 13:03:52 GMT rgrieder [3316] * code/trunk/CMakeLists.txt (modified) Version bump. We're now officially working on v0.0.3. Sun, 19 Jul 2009 13:02:21 GMT rgrieder [3315] * code/tags/0.0.3 (deleted) Deleted tag again (forgot the version bump) Sun, 19 Jul 2009 12:59:49 GMT rgrieder [3314] * code/tags/0.0.3 (copied) Finally made the v0.0.3 tag. Sun, 19 Jul 2009 12:58:24 GMT rgrieder [3313] * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclThreadList.h (deleted) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) Reverted TclThreadManager commits to make a tag (there's possibly ... Sun, 19 Jul 2009 12:36:46 GMT scheusso [3312] * code/trunk/src/network/ServerConnection.cc (modified) * code/trunk/src/network/TrafficControl.cc (modified) fix in disconnect behaviour Sun, 19 Jul 2009 10:31:28 GMT rgrieder [3311] * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/orxonox/gui/GUIManager.cc (modified) You can't watch out for unwanted changes every time... Reverting ... Sun, 19 Jul 2009 10:27:53 GMT rgrieder [3310] * code/branches/core4/src/core/input/InputDevice.h (modified) * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputState.h (modified) * code/branches/core4/src/core/input/Mouse.cc (modified) * code/branches/core4/src/orxonox/gui/GUIManager.cc (modified) Optimisations in the pathway of the input. Nobody will ever notice ... Sun, 19 Jul 2009 09:12:13 GMT rgrieder [3309] * code/trunk/cmake/PackageConfig.cmake (modified) Using the updated dependencies (you already required them by paper ... Sun, 19 Jul 2009 00:16:38 GMT landauf [3308] * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/TclThreadManager.h (modified) moved the boost forward declarations to CorePrereqs.h Sun, 19 Jul 2009 00:12:50 GMT landauf [3307] * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclThreadList.h (added) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) Completely rewrote TclThreadManager. This fixes several bugs from the ... Sat, 18 Jul 2009 23:13:43 GMT rgrieder [3306] * code/branches/core4/src/core/input/JoyStick.cc (modified) * code/branches/core4/src/core/input/JoyStick.h (modified) * code/branches/core4/src/core/input/KeyBinder.cc (modified) * code/branches/core4/src/core/input/KeyBinder.h (modified) * code/branches/core4/src/core/input/KeyDetector.cc (modified) * code/branches/core4/src/core/input/KeyDetector.h (modified) Keybindings should now map to the correct joy stick by device name ... Sat, 18 Jul 2009 16:24:38 GMT rgrieder [3305] * code/trunk/src/util/Sleep.cc (modified) Removed annoying warning on Windows. Sat, 18 Jul 2009 16:23:31 GMT rgrieder [3304] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/Clock.cc (modified) * code/trunk/src/core/ConsoleCommand.h (modified) * code/trunk/src/core/CorePrecompiledHeaders.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Executor.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/IRC.h (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) * code/trunk/src/core/Thread.cc (copied) * code/trunk/src/core/Thread.h (copied) * code/trunk/src/core/ThreadPool.cc (copied) * code/trunk/src/core/ThreadPool.h (copied) * code/trunk/src/network/CMakeLists.txt (modified) * code/trunk/src/network/ClientInformation.h (modified) * code/trunk/src/network/Connection.cc (modified) * code/trunk/src/network/GamestateClient.cc (modified) * code/trunk/src/network/GamestateClient.h (modified) * code/trunk/src/network/GamestateManager.cc (modified) * code/trunk/src/network/GamestateManager.h (modified) * code/trunk/src/network/Host.cc (modified) * code/trunk/src/network/NetworkFunction.cc (modified) * code/trunk/src/network/NetworkFunction.h (modified) * code/trunk/src/network/NetworkPrereqs.h (modified) * code/trunk/src/network/PacketBuffer.cc (deleted) * code/trunk/src/network/PacketBuffer.h (deleted) * code/trunk/src/network/Server.cc (modified) * code/trunk/src/network/Server.h (modified) * code/trunk/src/network/packet/ClassID.cc (modified) * code/trunk/src/network/packet/FunctionIDs.cc (modified) * code/trunk/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/network/synchronisable/SynchronisableSpecialisations.cc (modified) * code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/util/Math.cc (modified) * code/trunk/src/util/Serialise.h (modified) Merged netp6 branch back to the trunk. Sat, 18 Jul 2009 15:28:24 GMT scheusso [3303] * code/branches/netp6/src/network/GamestateManager.cc (modified) * code/branches/netp6/src/network/GamestateManager.h (modified) reverted some changes, which made the network multithreaded, in order ... Sat, 18 Jul 2009 15:13:38 GMT scheusso [3302] * code/branches/netp6/src/network/ClientInformation.h (modified) * code/branches/netp6/src/network/Connection.cc (modified) * code/branches/netp6/src/network/GamestateManager.cc (modified) * code/branches/netp6/src/network/Server.cc (modified) * code/branches/netp6/src/network/Server.h (modified) * code/branches/netp6/src/network/packet/ClassID.cc (modified) * code/branches/netp6/src/network/packet/FunctionIDs.cc (modified) * code/branches/netp6/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/netp6/src/network/synchronisable/SynchronisableSpecialisations.cc (modified) changed some debug output removed some uneccessary "multi"threading ... Sat, 18 Jul 2009 14:03:59 GMT rgrieder [3301] * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/ConfigValueContainer.h (modified) * code/trunk/src/core/Executor.cc (modified) * code/trunk/src/core/Executor.h (modified) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/Shell.cc (modified) * code/trunk/src/core/Super.h (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/XMLPort.h (modified) * code/trunk/src/core/input/InputBuffer.cc (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/KeyBinder.cc (modified) * code/trunk/src/network/ClientInformation.cc (modified) * code/trunk/src/network/GamestateClient.h (modified) * code/trunk/src/network/GamestateManager.cc (modified) * code/trunk/src/network/NetworkPrereqs.h (modified) * code/trunk/src/network/TrafficControl.cc (modified) * code/trunk/src/network/packet/Chat.cc (modified) * code/trunk/src/network/packet/Packet.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/objects/Scene.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/objects/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/trunk/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.cc (modified) * code/trunk/src/orxonox/tools/Shader.cc (modified) * code/trunk/src/orxonox/tools/Timer.cc (modified) * code/trunk/src/orxonox/tools/Timer.h (modified) * code/trunk/src/util/Clipboard.cc (modified) * code/trunk/src/util/MultiType.h (modified) * code/trunk/src/util/OutputHandler.cc (modified) * code/trunk/src/util/SignalHandler.cc (modified) * code/trunk/src/util/StringUtils.cc (modified) Found even more casts. They sure aren't all of them, but I hope to ... Fri, 17 Jul 2009 21:53:35 GMT rgrieder [3300] * code/trunk/src/core/CommandLine.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Shell.cc (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/objects/infos/Bot.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDBar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDTimer.cc (modified) * code/trunk/src/orxonox/overlays/map/Map.cc (modified) * code/trunk/src/orxonox/tools/TextureGenerator.cc (modified) * code/trunk/src/orxonox/tools/Timer.h (modified) * code/trunk/src/util/Math.h (modified) * code/trunk/src/util/StringUtils.cc (modified) Found a few more C-Style casts. Tue, 14 Jul 2009 21:05:04 GMT rgrieder [3299] * code/branches/netp6/src/core/Game.cc (modified) Sometimes I honestly ask myself why such things could run on Linux, ... Tue, 14 Jul 2009 15:47:06 GMT scheusso [3298] * code/branches/netp6/src/core/Thread.cc (modified) removed some (hopefully) unnecessary mutex calls Tue, 14 Jul 2009 14:50:22 GMT landauf [3297] * code/trunk/src/orxonox/PlayerManager.cc (modified) fixed ticket #318 ("client connected" message now only appears for ... Tue, 14 Jul 2009 14:46:16 GMT landauf [3296] * code/trunk/src/core/CommandEvaluation.cc (modified) 1-line-merge to trunk Tue, 14 Jul 2009 14:34:13 GMT landauf [3295] * code/branches/core4/src/core/CommandEvaluation.cc (modified) fixed a bug causing console commands to be case sensitive if called ... Tue, 14 Jul 2009 13:56:50 GMT rgrieder [3294] * code/branches/core4/src/orxonox/GraphicsManager.cc (modified) Bugfix: windowResized() was not called upon render window creation. ... Tue, 14 Jul 2009 12:19:57 GMT rgrieder [3293] * code/branches/core4/src/core/OrxonoxClass.h (modified) * code/branches/core4/src/core/input/JoyStickQuantityListener.h (modified) * code/branches/core4/src/core/input/Mouse.cc (modified) * code/branches/core4/src/core/input/Mouse.h (modified) * code/branches/core4/src/orxonox/LevelManager.h (modified) * code/branches/core4/src/orxonox/gui/GUIManager.cc (modified) Linux and GCC build fixes. Tue, 14 Jul 2009 11:59:39 GMT rgrieder [3292] * code/branches/core4/src/core/input/InputState.cc (modified) * code/branches/core4/src/core/input/InputState.h (modified) Added documentation for the InputState. Tue, 14 Jul 2009 09:50:47 GMT rgrieder [3291] * code/branches/core4/src/core/CorePrereqs.h (modified) * code/branches/core4/src/core/WindowEventListener.cc (modified) * code/branches/core4/src/core/WindowEventListener.h (modified) * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputManager.h (modified) * code/branches/core4/src/core/input/JoyStickQuantityListener.h (modified) * code/branches/core4/src/core/input/Mouse.cc (modified) * code/branches/core4/src/core/input/Mouse.h (modified) * code/branches/core4/src/orxonox/GraphicsManager.cc (modified) * code/branches/core4/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/core4/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/core4/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/core4/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/core4/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/branches/core4/src/orxonox/overlays/console/InGameConsole.h (modified) Added window size as static variable to the WindowEventListener ... Tue, 14 Jul 2009 09:30:05 GMT rgrieder [3290] * code/branches/core4/src/core/CMakeLists.txt (modified) * code/branches/core4/src/core/WindowEventListener.cc (added) * code/branches/core4/src/core/WindowEventListener.h (moved) * code/branches/core4/src/orxonox/GraphicsManager.cc (modified) * code/branches/core4/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/core4/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/core4/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/core4/src/orxonox/overlays/console/InGameConsole.h (modified) Moved WindowEventListener to the core to avoid some really ugly hacks ... Tue, 14 Jul 2009 08:09:12 GMT scheusso [3289] * code/branches/netp6/src/core/Clock.cc (modified) * code/branches/netp6/src/core/Game.cc (modified) * code/branches/netp6/src/core/Game.h (modified) * code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/netp6/src/orxonox/gamestates/GSDedicated.h (modified) a fix in Clock (more ogre-overflow safe now) moved framerate control ... Mon, 13 Jul 2009 20:43:59 GMT rgrieder [3288] * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputState.cc (modified) * code/branches/core4/src/core/input/InputState.h (modified) * code/branches/core4/src/core/input/JoyStickQuantityListener.cc (modified) * code/branches/core4/src/core/input/JoyStickQuantityListener.h (modified) * code/branches/core4/src/core/input/KeyBinder.cc (modified) * code/branches/core4/src/core/input/KeyBinder.h (modified) * code/branches/core4/src/core/input/KeyDetector.cc (modified) * code/branches/core4/src/core/input/KeyDetector.h (modified) Finally found a satisfying way to deal with interfaces that deliver ... Mon, 13 Jul 2009 19:30:36 GMT rgrieder [3287] * code/trunk/src/orxonox/gui/GUIManager.cc (modified) Console should now be visible again in the main menu (and FPS text as ... Mon, 13 Jul 2009 18:54:43 GMT rgrieder [3286] * code/branches/core4/src/core/input/InputDevice.h (modified) * code/branches/core4/src/core/input/InputHandler.h (modified) * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputManager.h (modified) * code/branches/core4/src/core/input/InputPrereqs.h (modified) * code/branches/core4/src/core/input/JoyStick.cc (modified) * code/branches/core4/src/core/input/JoyStick.h (modified) * code/branches/core4/src/core/input/JoyStickQuantityListener.cc (modified) * code/branches/core4/src/core/input/JoyStickQuantityListener.h (modified) * code/branches/core4/src/core/input/Keyboard.h (modified) * code/branches/core4/src/core/input/Mouse.cc (modified) * code/branches/core4/src/core/input/Mouse.h (modified) Added and adjusted documentation for the devices. Also removed one ... Mon, 13 Jul 2009 16:41:58 GMT rgrieder [3285] * code/branches/core4/src/core/input/InputDevice.h (modified) * code/branches/core4/src/core/input/InputHandler.h (modified) * code/branches/core4/src/core/input/InputPrereqs.h (modified) * code/branches/core4/src/core/input/JoyStick.h (modified) * code/branches/core4/src/core/input/Keyboard.h (modified) * code/branches/core4/src/core/input/Mouse.h (modified) Shoved some code around to reduce contents of 'global' InputPrereqs.h Mon, 13 Jul 2009 16:03:24 GMT rgrieder [3284] * code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc (modified) Move resource allocation to the corresponding thread and made ... Mon, 13 Jul 2009 14:59:10 GMT rgrieder [3283] * code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc (modified) Fixed a bug that caused the game to crash at random locations when ... Mon, 13 Jul 2009 12:37:03 GMT landauf [3282] * code/trunk/src/orxonox/interfaces/TeamColourable.h (modified) removed mergeinfo property (please be careful with partial merges, ... Mon, 13 Jul 2009 11:57:53 GMT rgrieder [3281] * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputManager.h (modified) Adjusted InputManager documentation. Sun, 12 Jul 2009 21:58:01 GMT rgrieder [3280] * code/trunk (modified) * code/trunk/cmake/BuildConfigMSVC.cmake (modified) * code/trunk/src/core/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/core/BaseObject.cc (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/CommandEvaluation.cc (modified) * code/trunk/src/core/CommandEvaluation.h (modified) * code/trunk/src/core/CommandExecutor.cc (modified) * code/trunk/src/core/CommandLine.cc (modified) * code/trunk/src/core/CommandLine.h (modified) * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/ConfigValueContainer.cc (modified) * code/trunk/src/core/ConfigValueIncludes.h (modified) * code/trunk/src/core/ConsoleCommand.h (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Executor.cc (modified) * code/trunk/src/core/Executor.h (modified) * code/trunk/src/core/Functor.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Game.h (modified) * code/trunk/src/core/GameState.cc (modified) * code/trunk/src/core/GameState.h (modified) * code/trunk/src/core/IRC.cc (modified) * code/trunk/src/core/Identifier.cc (modified) * code/trunk/src/core/Language.cc (modified) * code/trunk/src/core/Language.h (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/OrxonoxClass.cc (modified) * code/trunk/src/core/OrxonoxClass.h (modified) * code/trunk/src/core/Shell.cc (modified) * code/trunk/src/core/Shell.h (modified) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/input/Button.cc (modified) * code/trunk/src/core/input/Button.h (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/KeyBinder.cc (modified) * code/trunk/src/network/NetworkPrereqs.h (modified) * code/trunk/src/network/packet/Acknowledgement.cc (modified) * code/trunk/src/network/packet/Chat.cc (modified) * code/trunk/src/network/packet/ClassID.cc (modified) * code/trunk/src/network/packet/DeleteObjects.cc (modified) * code/trunk/src/network/packet/FunctionCalls.cc (modified) * code/trunk/src/network/packet/FunctionIDs.cc (modified) * code/trunk/src/network/packet/Gamestate.h (modified) * code/trunk/src/network/packet/Packet.cc (modified) * code/trunk/src/network/packet/Packet.h (modified) * code/trunk/src/network/packet/Welcome.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/GraphicsManager.cc (modified) * code/trunk/src/orxonox/GraphicsManager.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.h (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.h (modified) * code/trunk/src/orxonox/gui/GUIManager.cc (modified) * code/trunk/src/orxonox/gui/GUIManager.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/TeamColourable.h (modified) * code/trunk/src/orxonox/objects/GlobalShader.cc (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Scene.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/orxonox/objects/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/objects/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/objects/items/Engine.cc (modified) * code/trunk/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/objects/pickup/ModifierPickup.cc (modified) * code/trunk/src/orxonox/objects/pickup/ModifierPickup.h (modified) * code/trunk/src/orxonox/objects/pickup/ModifierType.h (modified) * code/trunk/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupCollection.h (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/Quest.cc (modified) * code/trunk/src/orxonox/objects/quest/Quest.h (modified) * code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/QuestListener.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestListener.h (modified) * code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/trunk/src/orxonox/objects/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/objects/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/objects/worldentities/FadingBillboard.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Light.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Light.h (modified) * code/trunk/src/orxonox/objects/worldentities/Model.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/trunk/src/orxonox/objects/worldentities/Planet.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/EventTrigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/EventTrigger.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OverlayText.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDBar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDTimer.cc (modified) * code/trunk/src/orxonox/overlays/hud/PongScore.cc (modified) * code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/orxonox/overlays/stats/CreateLines.cc (modified) * code/trunk/src/orxonox/overlays/stats/Stats.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/tools/BillboardSet.cc (modified) * code/trunk/src/orxonox/tools/Mesh.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.h (modified) * code/trunk/src/orxonox/tools/TextureGenerator.cc (modified) * code/trunk/src/util/CMakeLists.txt (modified) * code/trunk/src/util/Convert.h (modified) * code/trunk/src/util/Exception.cc (modified) * code/trunk/src/util/Exception.h (modified) * code/trunk/src/util/Math.h (modified) * code/trunk/src/util/MultiType.cc (modified) * code/trunk/src/util/MultiType.h (modified) * code/trunk/src/util/MultiTypeValue.h (modified) * code/trunk/src/util/RefToValue.h (copied) * code/trunk/src/util/ScopeGuard.h (copied) * code/trunk/src/util/String.cc (deleted) * code/trunk/src/util/String.h (deleted) * code/trunk/src/util/StringUtils.cc (copied) * code/trunk/src/util/StringUtils.h (copied) * code/trunk/src/util/UtilPrereqs.h (modified) Merged most of the core4 revisions back to the trunk except for: - ... Sun, 12 Jul 2009 21:08:50 GMT rgrieder [3279] * code/branches/core4/src/core/input/Button.cc (modified) * code/branches/core4/src/core/input/HalfAxis.cc (modified) * code/branches/core4/src/core/input/InputDevice.h (modified) * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputManager.h (modified) * code/branches/core4/src/core/input/InputState.h (modified) * code/branches/core4/src/core/input/KeyBinder.cc (modified) * code/branches/core4/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/core4/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core4/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core4/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/branches/core4/src/orxonox/overlays/GUIOverlay.cc (modified) * code/branches/core4/src/orxonox/overlays/console/InGameConsole.cc (modified) Heavy clean up in the InputManager; not many real code changes ... Sun, 12 Jul 2009 21:06:41 GMT rgrieder [3278] * code/branches/core4/src/core/Game.cc (modified) Bugfix: When requesting a game that that wasn't child or parent but ... Sun, 12 Jul 2009 17:20:39 GMT scheusso [3277] * code/branches/netp6/src/network/NetworkFunction.h (modified) fixed a 64bit issue and inserted some static asserts to prevent ... Sun, 12 Jul 2009 14:49:41 GMT rgrieder [3276] * code/branches/core4/src/core/input/InputManager.cc (modified) * code/branches/core4/src/core/input/InputManager.h (modified) * code/branches/core4/src/core/input/Mouse.cc (modified) * code/branches/core4/src/core/input/Mouse.h (modified) Moved grab/ungrab mouse hack for Linux from InputManager to Mouse. Sun, 12 Jul 2009 14:44:27 GMT rgrieder [3275] * code/branches/core4/src/core/input/Keyboard.cc (modified) * code/branches/core4/src/core/input/Keyboard.h (modified) * code/branches/core4/src/core/input/Mouse.h (modified) Build fixes for actual compilers ^^