# # ChangeLog for / # # Generated by Trac 1.0.9 # May 23, 2024, 7:39:06 AM Wed, 15 Dec 2010 13:51:39 GMT smerkli [7763] * code/branches/presentation/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/Server.h (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) disconnect implemented, switching to only use the MSC object of ... Wed, 15 Dec 2010 13:05:48 GMT smerkli [7762] * code/branches/presentation/src/libraries/network/Server.cc (modified) changes for testing Wed, 15 Dec 2010 12:39:56 GMT smerkli [7761] * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) disconnect implemented, getting ready for testing. Wed, 15 Dec 2010 09:59:10 GMT dafrick [7760] * code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme (moved) * code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme (moved) * code/branches/presentation/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) Making the GUI scheme configurable through a config value. Tue, 14 Dec 2010 19:54:00 GMT scheusso [7759] * code/branches/network5/src/libraries/network/Client.cc (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.h (modified) * code/branches/network5/src/libraries/network/GamestateClient.cc (modified) * code/branches/network5/src/libraries/network/GamestateClient.h (modified) * code/branches/network5/src/libraries/network/GamestateHandler.h (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.h (modified) * code/branches/network5/src/libraries/network/MasterServerComm.cc (modified) * code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.h (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/libraries/network/synchronisable/Synchronisable.h (modified) a lot of changes: - some fixes (mostly gamestate:diff) - ... Sun, 12 Dec 2010 22:13:01 GMT scheusso [7758] * code/branches/network5 (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network5/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/network5/src/modules/weapons/MuzzleFlash.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.h (modified) merging network4 into network5 branch Sun, 12 Dec 2010 21:50:14 GMT scheusso [7757] * code/branches/network5 (copied) creating new network5 branch out of presentation branch Sat, 11 Dec 2010 20:07:55 GMT smerkli [7756] * code/branches/presentation/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) started implementing server pings, but need a change to ... Sat, 11 Dec 2010 15:12:21 GMT scheusso [7755] * code/branches/network4/src/libraries/network/GamestateManager.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc (modified) build fix Fri, 10 Dec 2010 19:13:57 GMT scheusso [7754] * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc (modified) some optimisations (mostly including gamestateheader inside gamestate) Fri, 10 Dec 2010 16:07:02 GMT scheusso [7753] * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network4/src/orxonox/gametypes/Gametype.h (modified) * code/branches/network4/src/orxonox/worldentities/ControllableEntity.cc (modified) -(hopefully) fixed that nasty bug -some cleaning up -readding ... Fri, 10 Dec 2010 12:47:34 GMT dafrick [7752] * code/branches/presentation/bin/CMakeLists.txt (modified) * code/branches/presentation/bin/masterserver.bat.in (added) * code/branches/presentation/bin/masterserver.in (added) Adding runscript for masterserver. So far only tested under ubuntu. Thu, 09 Dec 2010 11:45:33 GMT dafrick [7751] * code/branches/presentation/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation/src/orxonox/LevelManager.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Boost now runs out (and reloads). Also fixed a few typos. Wed, 08 Dec 2010 18:33:11 GMT smerkli [7750] * code/branches/presentation/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) documentation. Wed, 08 Dec 2010 16:56:33 GMT smerkli [7749] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) whoops, I did it again. sorry. Wed, 08 Dec 2010 16:45:40 GMT smerkli [7748] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) whoops. Wed, 08 Dec 2010 16:43:21 GMT smerkli [7747] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) removed the space in the WANDiscovery list (hopefully) Wed, 08 Dec 2010 16:36:22 GMT dafrick [7746] * code/branches/presentation/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/presentation/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/branches/presentation/data/gui/scripts/ChatBox.lua (modified) Fixing chatbox. Wed, 08 Dec 2010 16:35:36 GMT smerkli [7745] * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) * code/branches/presentation/src/libraries/network/packet/ServerInformation.cc (modified) Removed some things and fixed some bugs Wed, 08 Dec 2010 16:18:10 GMT smerkli [7744] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) port fixed. Wed, 08 Dec 2010 16:13:03 GMT smerkli [7743] * code/branches/presentation/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation/src/orxonox/Main.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (modified) made mastserserver mode non-blocking Wed, 08 Dec 2010 16:04:15 GMT dafrick [7742] * data/trunk/gui/looknfeels/OrxonoxLook.looknfeel (modified) Rectifying error that crept in. Wed, 08 Dec 2010 15:54:58 GMT dafrick [7741] * code/branches/presentation/data/gui/scripts/MultiplayerMenu.lua (modified) Server discovery just once insetad of (redundantly) twice. Wed, 08 Dec 2010 15:39:04 GMT smerkli [7740] * code/branches/presentation/src/libraries/network/Server.cc (modified) fixed server startup Wed, 08 Dec 2010 15:25:52 GMT dafrick [7739] * code/branches/presentation (modified) * code/branches/presentation/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/presentation/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation/src/libraries/network/MasterServer.cc (copied) * code/branches/presentation/src/libraries/network/MasterServer.h (copied) * code/branches/presentation/src/libraries/network/MasterServerComm.cc (copied) * code/branches/presentation/src/libraries/network/MasterServerComm.h (copied) * code/branches/presentation/src/libraries/network/MasterServerProtocol.h (copied) * code/branches/presentation/src/libraries/network/PeerList.cc (copied) * code/branches/presentation/src/libraries/network/PeerList.h (copied) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/Server.h (modified) * code/branches/presentation/src/libraries/network/ServerList.cc (copied) * code/branches/presentation/src/libraries/network/ServerList.h (copied) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (copied) * code/branches/presentation/src/libraries/network/WANDiscovery.h (copied) * code/branches/presentation/src/libraries/network/packet/ServerInformation.h (modified) * code/branches/presentation/src/orxonox/Main.cc (modified) * code/branches/presentation/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/branches/presentation/src/orxonox/gamestates/GSMasterServer.h (copied) Merging masterserver branch to new presentation branch. Wed, 08 Dec 2010 15:13:02 GMT smerkli [7738] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) aaaand it works Wed, 08 Dec 2010 15:08:22 GMT smerkli [7737] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) pre-merge Wed, 08 Dec 2010 15:00:30 GMT dafrick [7736] * code/branches/presentation (copied) Creating presentation branch. Wed, 08 Dec 2010 14:58:38 GMT dafrick [7735] * data/trunk/AUTHORS (modified) * data/trunk/fonts/airstrip.ttf (added) * data/trunk/gui/imagesets/OrxonoxLook.imageset (added) * data/trunk/gui/looknfeels/OrxonoxLook.looknfeel (added) * data/trunk/gui/looknfeels/TaharezGreenLook.looknfeel (modified) * data/trunk/images/GLX_icon.png (modified) * data/trunk/images/gui/OrxonoxLook.png (added) * data/trunk/images/gui/main_menu_1.jpg (modified) Adding new font and new gui look (OrxonoxLook). Also updated icon. Wed, 08 Dec 2010 14:42:53 GMT dafrick [7734] * code/trunk/data/gui/schemes/OrxonoxLook.scheme (added) * code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (added) * code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (added) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) Adding new looknfeel (still experimental, thus not new default). Wed, 08 Dec 2010 14:36:53 GMT smerkli [7733] * code/branches/masterserver/src/orxonox/Main.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (modified) fixed a segfault Wed, 08 Dec 2010 14:29:28 GMT konrad [7732] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) Credits Menu is now scrollable Wed, 08 Dec 2010 14:11:59 GMT smerkli [7731] * code/branches/masterserver/src/modules/CMakeLists.txt (modified) Wed, 08 Dec 2010 14:05:07 GMT smerkli [7730] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver (deleted) * code/branches/masterserver/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (modified) changes done, use --masterserver to launch master server Wed, 08 Dec 2010 13:33:54 GMT smerkli [7729] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServer.cc (copied) * code/branches/masterserver/src/libraries/network/MasterServer.h (copied) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/PeerList.cc (copied) * code/branches/masterserver/src/libraries/network/PeerList.h (copied) * code/branches/masterserver/src/libraries/network/ServerList.cc (copied) * code/branches/masterserver/src/libraries/network/ServerList.h (copied) * code/branches/masterserver/src/libraries/network/masterserver (deleted) moved some files. Wed, 08 Dec 2010 12:52:14 GMT smerkli [7728] * code/branches/masterserver/src/libraries/network/masterserver (copied) Wed, 08 Dec 2010 12:49:39 GMT smerkli [7727] * code/branches/masterserver/src/orxonox/Main.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (copied) Before conversion of masterserver from module to library Wed, 08 Dec 2010 12:27:51 GMT konrad [7726] * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) decision popup in ingame menu has been changed Mon, 06 Dec 2010 20:14:27 GMT smerkli [7725] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) fixed some warnings Fri, 03 Dec 2010 13:58:02 GMT dafrick [7724] * code/trunk/src/orxonox/LevelManager.cc (modified) Changing default level, since it has been renamed. Fri, 03 Dec 2010 13:56:54 GMT dafrick [7723] * code/branches/data_cleanup (deleted) * data/branches/cleanup (deleted) Removing merged cleanup branches. Fri, 03 Dec 2010 13:40:06 GMT dafrick [7722] * code/branches/ggz2/data/resources.oxr (modified) Forgot to change resources.oxr file. Fri, 03 Dec 2010 13:39:19 GMT dafrick [7721] * code/branches/tutorial2/data/DefaultResources.oxr (modified) * code/branches/tutorial2/src/libraries/core/GUIManager.cc (modified) * code/branches/tutorial2/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:39:02 GMT dafrick [7720] * code/branches/sound5/data/DefaultResources.oxr (modified) * code/branches/sound5/src/libraries/core/GUIManager.cc (modified) * code/branches/sound5/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:57 GMT dafrick [7719] * code/branches/ois_update/data/DefaultResources.oxr (modified) * code/branches/ois_update/src/libraries/core/GUIManager.cc (modified) * code/branches/ois_update/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:51 GMT dafrick [7718] * code/branches/network4/data/DefaultResources.oxr (modified) * code/branches/network4/src/libraries/core/GUIManager.cc (modified) * code/branches/network4/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:46 GMT dafrick [7717] * code/branches/masterserver/data/DefaultResources.oxr (modified) * code/branches/masterserver/src/libraries/core/GUIManager.cc (modified) * code/branches/masterserver/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:42 GMT dafrick [7716] * code/branches/lastmanstanding2/data/DefaultResources.oxr (modified) * code/branches/lastmanstanding2/src/libraries/core/GUIManager.cc (modified) * code/branches/lastmanstanding2/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:37 GMT dafrick [7715] * code/branches/ipv6/data/DefaultResources.oxr (modified) * code/branches/ipv6/src/libraries/core/GUIManager.cc (modified) * code/branches/ipv6/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:29 GMT dafrick [7714] * code/branches/ggz2/src/libraries/core/GUIManager.cc (modified) * code/branches/ggz2/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:23 GMT dafrick [7713] * code/branches/gamestates3/data/DefaultResources.oxr (modified) * code/branches/gamestates3/src/libraries/core/GUIManager.cc (modified) * code/branches/gamestates3/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:18 GMT dafrick [7712] * code/branches/consolecommands3/data/DefaultResources.oxr (modified) * code/branches/consolecommands3/src/libraries/core/GUIManager.cc (modified) * code/branches/consolecommands3/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:38:14 GMT dafrick [7711] * code/branches/consolecommands2/data/DefaultResources.oxr (modified) * code/branches/consolecommands2/src/libraries/core/GUIManager.cc (modified) * code/branches/consolecommands2/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:37:17 GMT dafrick [7710] * code/branches/ai/data/DefaultResources.oxr (modified) * code/branches/ai/src/libraries/core/GUIManager.cc (modified) * code/branches/ai/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Fri, 03 Dec 2010 13:37:11 GMT dafrick [7709] * code/trunk (modified) * code/trunk/data/DefaultResources.oxr (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) Merging data_cleanup branch. You will need to update your data ... Fri, 03 Dec 2010 13:36:50 GMT dafrick [7708] * data/trunk (modified) * data/trunk/AUTHORS (modified) * data/trunk/gui/imagesets/DriveIcons.png (deleted) * data/trunk/gui/imagesets/FairChar.png (deleted) * data/trunk/gui/imagesets/GPN-2000-001437.png (deleted) * data/trunk/gui/imagesets/ReadMe.txt (deleted) * data/trunk/gui/imagesets/SleekSpace.png (deleted) * data/trunk/gui/imagesets/TaharezGreenLook.png (deleted) * data/trunk/gui/imagesets/TaharezLook.png (deleted) * data/trunk/gui/imagesets/WindowsLook.png (deleted) * data/trunk/gui/imagesets/main_menu_1.jpg (deleted) * data/trunk/gui/imagesets/pickup.png (deleted) * data/trunk/gui/imagesets/vanilla.png (deleted) * data/trunk/gui/looknfeel (deleted) * data/trunk/gui/looknfeels (copied) * data/trunk/gui/looknfeels/Falagard.xsd (copied) * data/trunk/gui/looknfeels/SleekSpace.looknfeel (copied) * data/trunk/gui/looknfeels/TaharezGreenLook.looknfeel (copied) * data/trunk/gui/looknfeels/TaharezLook.looknfeel (copied) * data/trunk/gui/looknfeels/Vanilla.looknfeel (copied) * data/trunk/gui/looknfeels/WindowsLook.looknfeel (copied) * data/trunk/images (copied) * data/trunk/images/GLX_icon.png (copied) * data/trunk/images/GLX_icon_old.png (copied) * data/trunk/images/decals (copied) * data/trunk/images/decals/decal.jpg (copied) * data/trunk/images/effects (copied) * data/trunk/images/effects/3arrowsup.png (copied) * data/trunk/images/effects/LightningBall_1.png (copied) * data/trunk/images/effects/LightningBall_2.png (copied) * data/trunk/images/effects/LightningBall_3.png (copied) * data/trunk/images/effects/LightningBall_4.png (copied) * data/trunk/images/effects/LightningBall_5.png (copied) * data/trunk/images/effects/LightningBall_6.png (copied) * data/trunk/images/effects/LightningBall_7.png (copied) * data/trunk/images/effects/LightningBall_8.png (copied) * data/trunk/images/effects/Sepia1D.png (copied) * data/trunk/images/effects/arrow.png (copied) * data/trunk/images/effects/asterix.png (copied) * data/trunk/images/effects/atmosphere.png (copied) * data/trunk/images/effects/atmospheretype1.png (copied) * data/trunk/images/effects/atmospheretype2.png (copied) * data/trunk/images/effects/atmospheretype3.png (copied) * data/trunk/images/effects/atmospheretype4.png (copied) * data/trunk/images/effects/atmospheretype5.png (copied) * data/trunk/images/effects/backlightflare.png (copied) * data/trunk/images/effects/backlighttrail.png (copied) * data/trunk/images/effects/backlighttrail2.png (copied) * data/trunk/images/effects/bigflame.png (copied) * data/trunk/images/effects/bigflare1.png (copied) * data/trunk/images/effects/clouds.png (copied) * data/trunk/images/effects/cross.png (copied) * data/trunk/images/effects/explosion.png (copied) * data/trunk/images/effects/explosion3.png (copied) * data/trunk/images/effects/eye.png (copied) * data/trunk/images/effects/flare.png (copied) * data/trunk/images/effects/flare2.png (copied) * data/trunk/images/effects/flare2_1.png (copied) * data/trunk/images/effects/flaretrail.png (copied) * data/trunk/images/effects/mapgrid.png (copied) * data/trunk/images/effects/ring_flare.png (copied) * data/trunk/images/effects/ring_flare2.png (copied) * data/trunk/images/effects/shield.png (copied) * data/trunk/images/effects/smoke.png (copied) * data/trunk/images/effects/smoke2.png (copied) * data/trunk/images/effects/smoke3.png (copied) * data/trunk/images/effects/smoke4.png (copied) * data/trunk/images/effects/smokecolors.png (copied) * data/trunk/images/effects/sphere.png (copied) * data/trunk/images/effects/streak.png (copied) * data/trunk/images/gui (copied) * data/trunk/images/gui/DriveIcons.png (copied) * data/trunk/images/gui/FairChar.png (copied) * data/trunk/images/gui/ReadMe.txt (copied) * data/trunk/images/gui/SleekSpace.png (copied) * data/trunk/images/gui/TaharezGreenLook.png (copied) * data/trunk/images/gui/TaharezLook.png (copied) * data/trunk/images/gui/WindowsLook.png (copied) * data/trunk/images/gui/main_menu_1.jpg (copied) * data/trunk/images/gui/pickup.png (copied) * data/trunk/images/gui/vanilla.png (copied) * data/trunk/images/ogrelogo-small.jpg (copied) * data/trunk/images/ogrelogo.png (copied) * data/trunk/images/overlay (copied) * data/trunk/images/overlay/DroneBanner.png (copied) * data/trunk/images/overlay/Formation.png (copied) * data/trunk/images/overlay/Pickups.png (copied) * data/trunk/images/overlay/RadarDot.png (copied) * data/trunk/images/overlay/RadarSquare.png (copied) * data/trunk/images/overlay/RadarTriangle.png (copied) * data/trunk/images/overlay/arrows.png (copied) * data/trunk/images/overlay/bar1.png (copied) * data/trunk/images/overlay/bar2.png (copied) * data/trunk/images/overlay/bar2a.png (copied) * data/trunk/images/overlay/bar2b.png (copied) * data/trunk/images/overlay/bar2c.png (copied) * data/trunk/images/overlay/centeroverlay.png (copied) * data/trunk/images/overlay/console2.png (copied) * data/trunk/images/overlay/console3.png (copied) * data/trunk/images/overlay/console4.png (copied) * data/trunk/images/overlay/console5.png (copied) * data/trunk/images/overlay/crosshair.png (copied) * data/trunk/images/overlay/crosshair2.png (copied) * data/trunk/images/overlay/crosshair3.png (copied) * data/trunk/images/overlay/cursor.png (copied) * data/trunk/images/overlay/cursor_console.png (copied) * data/trunk/images/overlay/damageoverlaybottom.png (copied) * data/trunk/images/overlay/damageoverlayleft.png (copied) * data/trunk/images/overlay/damageoverlayright.png (copied) * data/trunk/images/overlay/damageoverlaytop.png (copied) * data/trunk/images/overlay/directionarrows.png (copied) * data/trunk/images/overlay/directionarrows1.png (copied) * data/trunk/images/overlay/directionarrows2.png (copied) * data/trunk/images/overlay/directionarrows3.png (copied) * data/trunk/images/overlay/directionarrows4.png (copied) * data/trunk/images/overlay/healthbar_bar.png (copied) * data/trunk/images/overlay/healthbar_bg.png (copied) * data/trunk/images/overlay/radar.png (copied) * data/trunk/images/overlay/tdc.png (copied) * data/trunk/images/skyboxes (copied) * data/trunk/images/skyboxes/skypanoramagen1_bk.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen1_dn.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen1_fr.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen1_lf.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen1_rt.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen1_up.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen2_bk.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen2_dn.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen2_fr.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen2_lf.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen2_rt.jpg (copied) * data/trunk/images/skyboxes/skypanoramagen2_up.jpg (copied) * data/trunk/images/skyboxes/starbox_bk.jpg (copied) * data/trunk/images/skyboxes/starbox_dn.jpg (copied) * data/trunk/images/skyboxes/starbox_fr.jpg (copied) * data/trunk/images/skyboxes/starbox_lf.jpg (copied) * data/trunk/images/skyboxes/starbox_rt.jpg (copied) * data/trunk/images/skyboxes/starbox_up.jpg (copied) * data/trunk/images/textures (copied) * data/trunk/images/textures/CockpitGlass.jpg (copied) * data/trunk/images/textures/CockpitNose.jpg (copied) * data/trunk/images/textures/CockpitSide.png (copied) * data/trunk/images/textures/CuboidConnectionBodySide.jpg (copied) * data/trunk/images/textures/CuboidConnectionBodyTop.jpg (copied) * data/trunk/images/textures/Dirt.jpg (copied) * data/trunk/images/textures/DuBall1.jpg (copied) * data/trunk/images/textures/DuBall2.jpg (copied) * data/trunk/images/textures/GreenSkin.jpg (copied) * data/trunk/images/textures/LightningGun-s.png (copied) * data/trunk/images/textures/LightningGun.png (copied) * data/trunk/images/textures/Lightning_gun4.png (copied) * data/trunk/images/textures/Lightning_gun_pic2.png (copied) * data/trunk/images/textures/MetalBare.jpg (copied) * data/trunk/images/textures/MetalBase0020_thumbhuge.jpg (copied) * data/trunk/images/textures/MetalBase0030_thumbhuge.jpg (copied) * data/trunk/images/textures/MetalEdge.jpg (copied) * data/trunk/images/textures/OrxonoxBlack.png (copied) * data/trunk/images/textures/OrxonoxGREEN.png (copied) * data/trunk/images/textures/OrxonoxORANGE.png (copied) * data/trunk/images/textures/OrxonoxRED.png (copied) * data/trunk/images/textures/OrxonoxYELLOW.png (copied) * data/trunk/images/textures/PSO1024.jpg (copied) * data/trunk/images/textures/PlasmaAufh_Aufh.jpg (copied) * data/trunk/images/textures/PlasmaBlau.png (copied) * data/trunk/images/textures/RustySteel.jpg (copied) * data/trunk/images/textures/SpaceShipTransporter036_engine.jpg (copied) * data/trunk/images/textures/SpaceShipTransporter036_newtexture.jpg (copied) * data/trunk/images/textures/SpaceshipWings.jpg (copied) * data/trunk/images/textures/Spaceshipbody.jpg (copied) * data/trunk/images/textures/Triebwerk1_Cylinder.jpg (copied) * data/trunk/images/textures/assff.JPG (copied) * data/trunk/images/textures/asteroid.png (copied) * data/trunk/images/textures/asteroid_ice.png (copied) * data/trunk/images/textures/babel-base2.jpg (copied) * data/trunk/images/textures/babel-trim3b.jpg (copied) * data/trunk/images/textures/babel-wall1a.jpg (copied) * data/trunk/images/textures/babel-wall1b.jpg (copied) * data/trunk/images/textures/babel-wall6a.jpg (copied) * data/trunk/images/textures/babel-wall6b.jpg (copied) * data/trunk/images/textures/can.png (copied) * data/trunk/images/textures/crate.png (copied) * data/trunk/images/textures/dirt01.jpg (copied) * data/trunk/images/textures/dish.jpg (copied) * data/trunk/images/textures/drone.png (copied) * data/trunk/images/textures/final_gold.png (copied) * data/trunk/images/textures/flare3.png (copied) * data/trunk/images/textures/ghost_complete-texture_Cube.jpg (copied) * data/trunk/images/textures/glass01.png (copied) * data/trunk/images/textures/glass02.png (copied) * data/trunk/images/textures/hs-w01.png (copied) * data/trunk/images/textures/hs-w01_reduced.png (copied) * data/trunk/images/textures/hs-w01s.png (copied) * data/trunk/images/textures/iceplanet.png (copied) * data/trunk/images/textures/laserbeam.png (copied) * data/trunk/images/textures/pirate.jpg (copied) * data/trunk/images/textures/planet.jpg (copied) * data/trunk/images/textures/plasmaSilver_Tube.png (copied) * data/trunk/images/textures/plasmagunParabol_Cylinder002.jpg (copied) * data/trunk/images/textures/rock.png (copied) * data/trunk/images/textures/rockettex.jpg (copied) * data/trunk/images/textures/rust.png (copied) * data/trunk/images/textures/seamless (copied) * data/trunk/images/textures/seamless/sl_floor01.jpg (copied) * data/trunk/images/textures/seamless/sl_floor02.jpg (copied) * data/trunk/images/textures/seamless/sl_floor03.jpg (copied) * data/trunk/images/textures/seamless/sl_foil.jpg (copied) * data/trunk/images/textures/seamless/sl_hull01.jpg (copied) * data/trunk/images/textures/seamless/sl_hull02.jpg (copied) * data/trunk/images/textures/seamless/sl_hull03.jpg (copied) * data/trunk/images/textures/seamless/sl_hull04.jpg (copied) * data/trunk/images/textures/seamless/sl_metal.jpg (copied) * data/trunk/images/textures/seamless/sl_metal02.jpg (copied) * data/trunk/images/textures/seamless/sl_metal03.jpg (copied) * data/trunk/images/textures/seamless/sl_metal04.jpg (copied) * data/trunk/images/textures/seamless/sl_metal05.jpg (copied) * data/trunk/images/textures/seamless/sl_metal06.jpg (copied) * data/trunk/images/textures/seamless/sl_metal07.jpg (copied) * data/trunk/images/textures/seamless/sl_metal_001.png (copied) * data/trunk/images/textures/seamless/sl_metal_002.png (copied) * data/trunk/images/textures/seamless/sl_metal_003.png (copied) * data/trunk/images/textures/seamless/sl_metal_004.png (copied) * data/trunk/images/textures/seamless/sl_metal_005.png (copied) * data/trunk/images/textures/seamless/sl_metal_006.png (copied) * data/trunk/images/textures/seamless/sl_metal_007.png (copied) * data/trunk/images/textures/seamless/sl_metal_008.png (copied) * data/trunk/images/textures/seamless/sl_metal_009.png (copied) * data/trunk/images/textures/seamless/sl_metal_010.png (copied) * data/trunk/images/textures/seamless/sl_metal_011.png (copied) * data/trunk/images/textures/seamless/sl_metal_012.png (copied) * data/trunk/images/textures/seamless/sl_metal_013.png (copied) * data/trunk/images/textures/seamless/sl_metal_014.png (copied) * data/trunk/images/textures/seamless/sl_metal_015.png (copied) * data/trunk/images/textures/seamless/sl_metal_016.png (copied) * data/trunk/images/textures/seamless/sl_metal_017.png (copied) * data/trunk/images/textures/seamless/sl_metal_018.png (copied) * data/trunk/images/textures/seamless/sl_metal_019.png (copied) * data/trunk/images/textures/seamless/sl_metal_020.png (copied) * data/trunk/images/textures/seamless/sl_metal_021.png (copied) * data/trunk/images/textures/seamless/sl_metal_022.png (copied) * data/trunk/images/textures/seamless/sl_metal_023.png (copied) * data/trunk/images/textures/seamless/sl_metal_024.png (copied) * data/trunk/images/textures/seamless/sl_metal_025.png (copied) * data/trunk/images/textures/seamless/sl_metal_026.png (copied) * data/trunk/images/textures/seamless/sl_metal_027.png (copied) * data/trunk/images/textures/seamless/sl_metal_028.png (copied) * data/trunk/images/textures/seamless/sl_metal_029.png (copied) * data/trunk/images/textures/seamless/sl_metal_030.png (copied) * data/trunk/images/textures/seamless/sl_metal_031.png (copied) * data/trunk/images/textures/seamless/sl_metal_032.png (copied) * data/trunk/images/textures/seamless/sl_metal_034.png (copied) * data/trunk/images/textures/seamless/sl_metal_035.png (copied) * data/trunk/images/textures/seamless/sl_metal_036.png (copied) * data/trunk/images/textures/seamless/sl_metal_037.png (copied) * data/trunk/images/textures/seamless/sl_organic01.jpg (copied) * data/trunk/images/textures/seamless/sl_organic02.jpg (copied) * data/trunk/images/textures/seamless/sl_organic03.jpg (copied) * data/trunk/images/textures/seamless/sl_organic04.jpg (copied) * data/trunk/images/textures/seamless/sl_panel.jpg (copied) * data/trunk/images/textures/snowyWhite.jpg (copied) * data/trunk/images/textures/spacecruiser_16.jpg (copied) * data/trunk/images/textures/spacesruiser.png (copied) * data/trunk/images/textures/starship.png (copied) * data/trunk/images/textures/swallow_tex.png (copied) * data/trunk/images/textures/texture.jpg (copied) * data/trunk/images/textures/thrust.jpg (copied) * data/trunk/images/textures/tiled_floor.jpg (copied) * data/trunk/images/textures/transporter5Fluegel_Cube.jpg (copied) * data/trunk/images/textures/transporter5Huelle_Cube.001.jpg (copied) * data/trunk/images/textures/wall01.jpg (copied) * data/trunk/materials/3arrowsup.material (copied) * data/trunk/materials/Arrow.material (copied) * data/trunk/materials/Asterix.material (copied) * data/trunk/materials/Banners.material (copied) * data/trunk/materials/BlackAndWhite.material (copied) * data/trunk/materials/Bloom.material (copied) * data/trunk/materials/Bump_Specular.material (copied) * data/trunk/materials/Carrier.material (copied) * data/trunk/materials/Cone.material (copied) * data/trunk/materials/Console.material (copied) * data/trunk/materials/Cross.material (copied) * data/trunk/materials/CuboidSpaceStation.material (copied) * data/trunk/materials/DuBall.material (copied) * data/trunk/materials/Embossed.material (copied) * data/trunk/materials/Example.material (copied) * data/trunk/materials/Examples.compositor (copied) * data/trunk/materials/Examples.program (copied) * data/trunk/materials/Eye.material (copied) * data/trunk/materials/Flares.material (copied) * data/trunk/materials/Glass.material (copied) * data/trunk/materials/HXY.material (copied) * data/trunk/materials/Invert.material (copied) * data/trunk/materials/Laplace.material (copied) * data/trunk/materials/LightningGun-s.material (copied) * data/trunk/materials/LightningGun.material (copied) * data/trunk/materials/Map.material (copied) * data/trunk/materials/MotionBlur.compositor (copied) * data/trunk/materials/MotionBlur.material (copied) * data/trunk/materials/Ogre.material (copied) * data/trunk/materials/OldMovie.material (copied) * data/trunk/materials/OldTV.material (copied) * data/trunk/materials/Orxonox.material (copied) * data/trunk/materials/OrxonoxSky.material (copied) * data/trunk/materials/PE_materials.material (copied) * data/trunk/materials/Posterize.material (copied) * data/trunk/materials/RadialBlur.material (copied) * data/trunk/materials/Scene.material (copied) * data/trunk/materials/Shaders.compositor (copied) * data/trunk/materials/SharpenEdges.material (copied) * data/trunk/materials/Shield.material (copied) * data/trunk/materials/Sphere2.material (copied) * data/trunk/materials/Stats.material (copied) * data/trunk/materials/StdQuad_vp.program (copied) * data/trunk/materials/Test.material (copied) * data/trunk/materials/Tiling.material (copied) * data/trunk/materials/ToonShader.material (copied) * data/trunk/materials/Trail.material (copied) * data/trunk/materials/Transparency.material (copied) * data/trunk/materials/Transporter.material (copied) * data/trunk/materials/UEATransporter036.material (copied) * data/trunk/materials/assf.material (copied) * data/trunk/materials/assf5.material (copied) * data/trunk/materials/assff.material (copied) * data/trunk/materials/asteroid_ice.material (copied) * data/trunk/materials/asteroid_y.material (copied) * data/trunk/materials/asteroids.material (copied) * data/trunk/materials/axes.material (copied) * data/trunk/materials/can.material (copied) * data/trunk/materials/crate.material (copied) * data/trunk/materials/cube.material (copied) * data/trunk/materials/drone.material (copied) * data/trunk/materials/earth.material (copied) * data/trunk/materials/ghost.material (copied) * data/trunk/materials/h2_green.material (copied) * data/trunk/materials/hdr.material (copied) * data/trunk/materials/hoover.material (copied) * data/trunk/materials/hs-w01.material (copied) * data/trunk/materials/hs-w01_reduced.material (copied) * data/trunk/materials/hs-w01s.material (copied) * data/trunk/materials/iceplanet.material (copied) * data/trunk/materials/jumpthrust.material (copied) * data/trunk/materials/laserbeam.material (copied) * data/trunk/materials/pirate.material (copied) * data/trunk/materials/plane.material (copied) * data/trunk/materials/planet.material (copied) * data/trunk/materials/programs (deleted) * data/trunk/materials/rock.material (copied) * data/trunk/materials/rocket.material (copied) * data/trunk/materials/satellite.material (copied) * data/trunk/materials/scripts (deleted) * data/trunk/materials/spacecruiser.material (copied) * data/trunk/materials/spacecruiser_16.material (copied) * data/trunk/materials/sphere.material (copied) * data/trunk/materials/starship.material (copied) * data/trunk/materials/swallow_material.material (copied) * data/trunk/materials/textures (deleted) * data/trunk/materials/tomato.material (copied) * data/trunk/materials/wrench.material (copied) * data/trunk/models/Cone.mesh (deleted) * data/trunk/models/UEATransporter036.mesh (deleted) * data/trunk/models/UEATransporter036T.mesh (deleted) * data/trunk/models/assff_lod_med.mesh (deleted) * data/trunk/models/asteroid.mesh (deleted) * data/trunk/models/asteroid1.mesh (deleted) * data/trunk/models/asteroid2.mesh (deleted) * data/trunk/models/asteroid3.mesh (deleted) * data/trunk/models/asteroid4.mesh (deleted) * data/trunk/models/asteroid_UV_lq.mesh (deleted) * data/trunk/models/cube_yellow.mesh (deleted) * data/trunk/models/cwrench.mesh (deleted) * data/trunk/models/gwrench.mesh (deleted) * data/trunk/models/jumpthrust.mesh (deleted) * data/trunk/models/ogrehead.mesh (deleted) * data/trunk/models/spacecruiser_16.mesh (deleted) * data/trunk/models/starship.mesh (deleted) * data/trunk/models/unused (copied) * data/trunk/models/unused/Cone.mesh (copied) * data/trunk/models/unused/UEATransporter036.mesh (copied) * data/trunk/models/unused/UEATransporter036T.mesh (copied) * data/trunk/models/unused/assff_lod_med.mesh (copied) * data/trunk/models/unused/asteroid.mesh (copied) * data/trunk/models/unused/asteroid1.mesh (copied) * data/trunk/models/unused/asteroid2.mesh (copied) * data/trunk/models/unused/asteroid3.mesh (copied) * data/trunk/models/unused/asteroid4.mesh (copied) * data/trunk/models/unused/asteroid_UV_lq.mesh (copied) * data/trunk/models/unused/cube_yellow.mesh (copied) * data/trunk/models/unused/cwrench.mesh (copied) * data/trunk/models/unused/gwrench.mesh (copied) * data/trunk/models/unused/jumpthrust.mesh (copied) * data/trunk/models/unused/ogrehead.mesh (copied) * data/trunk/models/unused/spacecruiser_16.mesh (copied) * data/trunk/models/unused/starship.mesh (copied) * data/trunk/programs (copied) * data/trunk/programs/AmbientOneTexture.glsl (copied) * data/trunk/programs/Blur0_ps20.hlsl (copied) * data/trunk/programs/Blur0_vs.glsl (copied) * data/trunk/programs/Blur0_vs11.hlsl (copied) * data/trunk/programs/Blur1_ps20.hlsl (copied) * data/trunk/programs/Blur1_vs.glsl (copied) * data/trunk/programs/Blur1_vs11.hlsl (copied) * data/trunk/programs/Blur_ps.glsl (copied) * data/trunk/programs/BumpMapping.cg (copied) * data/trunk/programs/Combine_fp.cg (copied) * data/trunk/programs/Example_Basic.cg (copied) * data/trunk/programs/Example_Basic.hlsl (copied) * data/trunk/programs/GlassFP.cg (copied) * data/trunk/programs/Grass.cg (copied) * data/trunk/programs/GrayScale.cg (copied) * data/trunk/programs/InvertFP.cg (copied) * data/trunk/programs/LaplaceFP.cg (copied) * data/trunk/programs/OldMovieFP.cg (copied) * data/trunk/programs/OldTV.cg (copied) * data/trunk/programs/PosterizeFP.cg (copied) * data/trunk/programs/Radial_Blur_FP.cg (copied) * data/trunk/programs/SharpenEdgesFP.cg (copied) * data/trunk/programs/StdQuad_vp.cg (copied) * data/trunk/programs/StdQuad_vp.glsl (copied) * data/trunk/programs/TilingFP.cg (copied) * data/trunk/programs/ToonShaderPS.cg (copied) * data/trunk/programs/ToonShader_ps.frag (copied) * data/trunk/programs/ToonShader_vs.vert (copied) * data/trunk/programs/hdr.cg (copied) * data/trunk/programs/hdr.hlsl (copied) * data/trunk/programs/hdr_bloom.glsl (copied) * data/trunk/programs/hdr_downscale2x2luminence.glsl (copied) * data/trunk/programs/hdr_downscale3x3.glsl (copied) * data/trunk/programs/hdr_downscale3x3brightpass.glsl (copied) * data/trunk/programs/hdr_finalToneMapping.glsl (copied) * data/trunk/programs/hdr_tonemap_util.glsl (copied) * data/trunk/programs/skinningTwoWeightsShadowCasterVp.glsl (copied) * data/trunk/programs/skinningTwoWeightsVp.glsl (copied) * data/trunk/resources.oxr (modified) Merging cleanup branch. You will need to update your data repository ... Fri, 03 Dec 2010 08:29:35 GMT dafrick [7707] * code/branches/doc (deleted) Has been merged. Fri, 03 Dec 2010 08:29:14 GMT dafrick [7706] * code/branches/menu (deleted) Has been merged. Fri, 03 Dec 2010 08:28:36 GMT dafrick [7705] * code/branches/notifications (deleted) Has already been merged, as well. Fri, 03 Dec 2010 08:27:06 GMT dafrick [7704] * code/branches/releasetodo (deleted) Removing because it has been merged. Fri, 03 Dec 2010 08:26:05 GMT dafrick [7703] * code/branches/tutorial (deleted) Removing because it's been replaced by tutorial2. Fri, 03 Dec 2010 08:24:20 GMT dafrick [7702] * code/branches/lastmanstanding (deleted) Deleting branch since it is no longer neede. Thu, 02 Dec 2010 23:40:39 GMT rgrieder [7701] * code/branches/ois_update/src/orxonox/sound/SoundManager.cc (modified) Clear openAL error before starting. Thu, 02 Dec 2010 22:33:41 GMT jo [7700] * code/branches/lastmanstanding/data/levels/lastteamstanding.oxw (deleted) * code/branches/lastmanstanding/data/overlays/lastteamstandinghud.oxo (deleted) * code/branches/lastmanstanding/src/modules/overlays/hud/LastTeamStandingInfos.cc (deleted) * code/branches/lastmanstanding/src/modules/overlays/hud/LastTeamStandingInfos.h (deleted) * code/branches/lastmanstanding/src/orxonox/gametypes/LastTeamStanding.cc (deleted) * code/branches/lastmanstanding/src/orxonox/gametypes/LastTeamStanding.h (deleted) Remve files that shouldn't have been added here. Now the old state ... Thu, 02 Dec 2010 22:26:05 GMT jo [7699] * code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified) Finally using the right branch - already compiling, but with memory- ... Thu, 02 Dec 2010 11:56:44 GMT jo [7698] * code/branches/lastmanstanding/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/lastmanstanding/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/CMakeLists.txt (modified) Reverting changes. Thu, 02 Dec 2010 11:10:26 GMT dafrick [7697] * code/branches/lastmanstanding2/data/levels/lastTeamStanding.oxw (added) * code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (added) * code/branches/lastmanstanding2/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/lastmanstanding2/src/modules/overlays/hud/LastTeamStandingInfos.cc (added) * code/branches/lastmanstanding2/src/modules/overlays/hud/LastTeamStandingInfos.h (added) * code/branches/lastmanstanding2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (added) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (added) Manually merging changes in lastmanstanding branch to ... Thu, 02 Dec 2010 06:33:55 GMT dafrick [7696] * code/branches/lastmanstanding2 (copied) Creating new lastmanstanding branch. Wed, 01 Dec 2010 22:51:16 GMT jo [7695] * code/branches/lastmanstanding/src/orxonox/gametypes/LastTeamStanding.cc (modified) that wasnt it either Wed, 01 Dec 2010 21:34:17 GMT jo [7694] * code/branches/lastmanstanding/src/orxonox/OrxonoxPrereqs.h (modified) Still searching for the real error. Wed, 01 Dec 2010 21:23:07 GMT jo [7693] * code/branches/lastmanstanding/data/levels/lastteamstanding.oxw (added) * code/branches/lastmanstanding/data/overlays/lastteamstandinghud.oxo (added) * code/branches/lastmanstanding/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/LastTeamStandingInfos.cc (added) * code/branches/lastmanstanding/src/modules/overlays/hud/LastTeamStandingInfos.h (added) * code/branches/lastmanstanding/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastTeamStanding.cc (added) * code/branches/lastmanstanding/src/orxonox/gametypes/LastTeamStanding.h (added) Argh. Wed, 01 Dec 2010 15:28:46 GMT smerkli [7692] * code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) done for today, didn't get bug to leave, and connect doesn't quite ... Wed, 01 Dec 2010 15:28:06 GMT youngk [7691] * code/branches/ois_update/src/external/ois/mac/MacKeyboard.cpp (modified) Marked output of OIS TODO section. Fixme. Wed, 01 Dec 2010 14:21:11 GMT dafrick [7690] * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) Adjusting some small thing that got forgotten while merging. Wed, 01 Dec 2010 14:00:19 GMT dafrick [7689] * code/trunk (modified) * code/trunk/data/gui/layouts/HostMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HostMenu.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) Merging menu branch to trunk. Wed, 01 Dec 2010 13:11:44 GMT smerkli [7688] * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) further debugging. Wed, 01 Dec 2010 13:04:54 GMT konrad [7687] * code/branches/menu/data/gui/scripts/AudioMenu.lua (modified) * code/branches/menu/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/menu/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/menu/data/gui/scripts/GUITools.lua (modified) * code/branches/menu/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/menu/data/gui/scripts/HostMenu.lua (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) * code/branches/menu/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/menu/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/menu/data/gui/scripts/SingleplayerMenu.lua (modified) --function to iterate throgh a menusheet by using arrowkeys is added Wed, 01 Dec 2010 13:01:48 GMT dafrick [7686] * code/branches/data_cleanup/data/DefaultResources.oxr (modified) * code/branches/data_cleanup/data/gui/looknfeels (deleted) Connected to the previos commit. Wed, 01 Dec 2010 12:58:48 GMT dafrick [7685] * data/branches/cleanup/gui/looknfeels (added) * data/branches/cleanup/gui/looknfeels/Falagard.xsd (added) * data/branches/cleanup/gui/looknfeels/SleekSpace.looknfeel (added) * data/branches/cleanup/gui/looknfeels/TaharezGreenLook.looknfeel (added) * data/branches/cleanup/gui/looknfeels/TaharezLook.looknfeel (added) * data/branches/cleanup/gui/looknfeels/Vanilla.looknfeel (added) * data/branches/cleanup/gui/looknfeels/WindowsLook.looknfeel (added) * data/branches/cleanup/resources.oxr (modified) Re-adding looknfeels, for the time being. We'll move them when there ... Wed, 01 Dec 2010 12:51:15 GMT smerkli [7684] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) further testing. Tue, 30 Nov 2010 22:09:18 GMT youngk [7683] * code/branches/ois_update/data/tcl/init.tcl (modified) Tcl will now initialize properly on Mac. Tue, 30 Nov 2010 22:08:38 GMT youngk [7682] * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) * code/branches/ois_update/cmake/LibraryConfigApple.cmake (deleted) * code/branches/ois_update/cmake/LibraryConfigOSX.cmake (added) * code/branches/ois_update/cmake/PackageConfigOSX.cmake (modified) * code/branches/ois_update/src/SpecialConfig.h.in (modified) Changed handling of the dependency package and increased consistence ... Tue, 30 Nov 2010 21:55:06 GMT rgrieder [7681] * code/branches/ois_update/src/OrxonoxConfig.cmake (modified) Disabled PCH on OS X. Tue, 30 Nov 2010 21:40:06 GMT dafrick [7680] * code/trunk/data/levels/presentationPong.oxw (moved) Forgot to rename one level file. Sun, 28 Nov 2010 22:21:20 GMT dafrick [7679] * code/trunk/data/levels/FPSTest.oxw (moved) * code/trunk/data/levels/asteroids.oxw (moved) * code/trunk/data/levels/dynamicMatch.oxw (moved) * code/trunk/data/levels/emptyLevel.oxw (moved) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (moved) * code/trunk/data/levels/includes/weaponSettings1.oxi (moved) * code/trunk/data/levels/includes/weaponSettings2.oxi (moved) * code/trunk/data/levels/includes/weaponSettings3.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsH2.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsPirate.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (moved) * code/trunk/data/levels/lastManStanding.oxw (moved) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/physicsTest.oxw (moved) * code/trunk/data/levels/old/physicsTest2.oxw (moved) * code/trunk/data/levels/old/planetTest.oxw (moved) * code/trunk/data/levels/old/presentationLOD.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (moved) * code/trunk/data/levels/old/princessAeryn.oxw (moved) * code/trunk/data/levels/old/questSystem.oxw (moved) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/old/spaceshipTemplatesPhysics.oxw (moved) * code/trunk/data/levels/old/tutorialHS08.oxw (moved) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (moved) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (moved) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (moved) * code/trunk/data/levels/presentationFS10Ed.oxw (moved) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_pong.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (moved) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (moved) * code/trunk/data/levels/teamDeathMatch.oxw (moved) * code/trunk/data/levels/templates/FPS.oxt (moved) * code/trunk/data/levels/templates/lodInformation.oxt (moved) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (moved) * code/trunk/data/levels/templates/spaceshipAssff.oxt (moved) * code/trunk/data/levels/templates/spaceshipGhost.oxt (moved) * code/trunk/data/levels/templates/spaceshipH2.oxt (moved) * code/trunk/data/levels/templates/spaceshipHXY.oxt (moved) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (moved) * code/trunk/data/levels/templates/spaceshipPirate.oxt (moved) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (moved) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (moved) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (moved) * code/trunk/data/levels/testStars.oxw (moved) * code/trunk/data/levels/testSwallow.oxw (moved) * code/trunk/data/levels/theTimeMachine.oxw (moved) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (moved) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUD.oxo (moved) * code/trunk/data/overlays/HUDTemplates3.oxo (moved) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (moved) * code/trunk/data/overlays/dynamicMatchHUD.oxo (moved) * code/trunk/data/overlays/lastManStandingHUD.oxo (moved) * code/trunk/data/overlays/pongHUD.oxo (moved) * code/trunk/data/overlays/teamBaseMatchHUD.oxo (moved) * code/trunk/data/overlays/underAttackHUD.oxo (moved) * code/trunk/doc/api/Groups.dox (modified) Renaming levelfiles (and some other) according to our new naming ... Fri, 26 Nov 2010 12:40:00 GMT dafrick [7678] * code/trunk/src/modules/objects/ForceField.h (modified) Adding documentation for invertedSphere ForceField. Fri, 26 Nov 2010 12:25:56 GMT dafrick [7677] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Adding yet another class of ForceFields and using it in The Time Machine. Fri, 26 Nov 2010 07:44:48 GMT dafrick [7676] * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Some documentation and simplification Thu, 25 Nov 2010 23:06:43 GMT dafrick [7675] * code/trunk/data/levels/The Time Machine.oxw (modified) Forgot to revert The Time Machine Thu, 25 Nov 2010 23:01:53 GMT dafrick [7674] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Resolving some stupid bugs and some adding some minor improvements. Thu, 25 Nov 2010 22:24:50 GMT dafrick [7673] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) Documenting and extending ForceField. A little cleaning up in The ... Wed, 24 Nov 2010 22:12:30 GMT smerkli [7672] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) just added some notes so I understand my own stuff next week. Wed, 24 Nov 2010 20:47:57 GMT dafrick [7671] * code/branches/menu/data/gui/scripts/SheetManager.lua (modified) Removing some cout I forgot. Wed, 24 Nov 2010 19:58:13 GMT dafrick [7670] * code/branches/menu/data/gui/scripts/InGameMenu.lua (modified) * code/branches/menu/data/gui/scripts/SheetManager.lua (modified) ESC behavior is once again correct. Kind of hackish, though, but I ... Wed, 24 Nov 2010 17:17:40 GMT youngk [7669] * code/branches/ois_update/src/libraries/core/PathConfig.cc (modified) Small adjustment or Macs Wed, 24 Nov 2010 16:12:49 GMT dafrick [7668] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) fix this... Wed, 24 Nov 2010 16:12:36 GMT dafrick [7667] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) fix this... Wed, 24 Nov 2010 15:13:04 GMT smerkli [7666] * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) further corrections. Wed, 24 Nov 2010 14:58:46 GMT smerkli [7665] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) and another one. Wed, 24 Nov 2010 14:48:56 GMT youngk [7664] * code/branches/ois_update/src/external/openal (added) * code/branches/ois_update/src/external/openal/MacOSX_OALExtensions.h (added) * code/branches/ois_update/src/external/openal/README (added) * code/branches/ois_update/src/external/openal/al.h (added) * code/branches/ois_update/src/external/openal/alc.h (added) * code/branches/ois_update/src/libraries/core/GraphicsManager.cc (modified) * code/branches/ois_update/src/orxonox/sound/BaseSound.cc (modified) * code/branches/ois_update/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/ois_update/src/orxonox/sound/SoundStreamer.cc (modified) Corrected some serious bug in OpenAL Mac and reduced warnings.