# # ChangeLog for / # # Generated by Trac 1.0.9 # May 28, 2024, 9:47:38 PM Mon, 05 Nov 2012 15:06:21 GMT mottetb [9434] * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified) aimMarkerSize aendert nichts im Spiel Mon, 05 Nov 2012 15:05:31 GMT davidsa [9433] * code/branches/shaders/data/levels/shadertest.oxw (modified) Modified shader test level, added proper collision shape and changed ... Mon, 05 Nov 2012 14:58:03 GMT purgham [9432] * code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h (modified) * code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceBot.cc (added) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceBot.h (added) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified) first working Version Mon, 05 Nov 2012 14:55:40 GMT keuschr [9431] * data/contentcreation/pps/keuschr/121022_2236_keuschrs_starship_collateral_damage.blend (added) * data/contentcreation/pps/keuschr/121029_1326_keuschrs_starship_collateral_damage.blend (added) * data/contentcreation/pps/keuschr/121029_1326_keuschrs_starship_collateral_damage.blend1 (added) * data/contentcreation/pps/keuschr/121029_1326_keuschrs_starship_collateral_damage.blend2 (added) * data/contentcreation/pps/keuschr/171012_2206_keuschrs_starship.blend2 (added) * data/contentcreation/pps/keuschr/211012_1540_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/221012_1520_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/light_map.png (added) * data/contentcreation/pps/keuschr/light_map.psd (added) * data/contentcreation/pps/keuschr/step_by_step/10.png (added) * data/contentcreation/pps/keuschr/step_by_step/background_drawing.jpg (added) * data/contentcreation/pps/keuschr/temp.png (added) * data/contentcreation/pps/keuschr/uv_layout.png (added) * data/contentcreation/pps/keuschr/uv_layout.psd (added) first texture tries Mon, 05 Nov 2012 13:45:57 GMT mottetb [9430] * data/trunk/images/overlay/target.png (added) Bild fuer neues Overlay Mon, 05 Nov 2012 13:30:37 GMT mottetb [9429] * code/branches/spaceNavigation/data/overlays/HUD.oxo (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified) aimMarkerSize Problem Mon, 05 Nov 2012 13:15:34 GMT davidsa [9428] * code/branches/shaders/src/orxonox/graphics/Model.cc (modified) FIX: changed standard render group to main, this prevents that ... Sun, 04 Nov 2012 13:02:47 GMT davidsa [9427] * data/trunk/materials/glow.material (modified) FIX: changed nested comments into single line comments, as it turns ... Sun, 04 Nov 2012 12:51:48 GMT davidsa [9426] * code/branches/shaders/data/levels/shadertest.oxw (modified) Changed shader test level so that it uses a round object, since you ... Wed, 31 Oct 2012 17:02:05 GMT davidsa [9425] * data/trunk/materials/glow.material (modified) * data/trunk/programs/ps_glow.cg (modified) * data/trunk/programs/vs_glow.cg (modified) Improved glow effect, added some minor documentation to the ... Mon, 29 Oct 2012 16:04:10 GMT davidsa [9424] * data/trunk/materials/glow.material (modified) changed the glow-material to use a different color of glow Mon, 29 Oct 2012 16:02:47 GMT davidsa [9423] * code/branches/shaders/data/levels/shadertest.oxw (modified) Slightly modified the shader test level to use the new XML Port and ... Mon, 29 Oct 2012 16:00:19 GMT davidsa [9422] * code/branches/shaders/src/orxonox/graphics/Model.cc (modified) * code/branches/shaders/src/orxonox/graphics/Model.h (modified) Added some documentation to orxonox::Model and refined the XML Port ... Mon, 29 Oct 2012 15:22:11 GMT mottetb [9421] * code/branches/spaceNavigation/data/overlays/HUD.oxo (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h (modified) Oct 29th, works pretty well! Mon, 29 Oct 2012 15:16:17 GMT davidsa [9420] * code/branches/shaders/src/orxonox/RenderQueueListener.cc (modified) * code/branches/shaders/src/orxonox/Scene.cc (modified) * code/branches/shaders/src/orxonox/Scene.h (modified) Added some documentation to orxonox::Scene Mon, 29 Oct 2012 14:48:20 GMT davidsa [9419] * code/branches/shaders/src/orxonox/RenderQueueListener.cc (modified) * code/branches/shaders/src/orxonox/RenderQueueListener.h (modified) Added documentation to orxonox::RenderQueueListener Mon, 29 Oct 2012 14:46:26 GMT moralelastix [9418] * data/contentcreation/pps/dawalser/Head/Head.blend (modified) * data/contentcreation/pps/dawalser/Head/Head.blend1 (modified) * data/contentcreation/pps/dawalser/Head/Textures (added) * data/contentcreation/pps/dawalser/Head/Textures/Head Farbe.xcf (added) * data/contentcreation/pps/dawalser/Head/Textures/Head Reflektion.xcf (added) * data/contentcreation/pps/dawalser/Head/Textures/Head.png (moved) * data/contentcreation/pps/dawalser/Socket/Socket.blend (modified) * data/contentcreation/pps/dawalser/Socket/Socket.blend1 (modified) * data/contentcreation/pps/dawalser/Socket/Textures (added) * data/contentcreation/pps/dawalser/Socket/Textures/Socket Farbe.xcf (added) * data/contentcreation/pps/dawalser/Socket/Textures/Socket Reflektion.xcf (added) * data/contentcreation/pps/dawalser/Socket/Textures/Socket.png (moved) Texture Files Mon, 29 Oct 2012 14:35:14 GMT mjiang [9417] * data/trunk/audio/sounds/LASEREND.ogg (added) added Laser Sound Thu, 25 Oct 2012 19:33:56 GMT jo [9416] * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) Adjusting the Escort ship's collisionshapes. Thu, 25 Oct 2012 18:56:42 GMT jo [9415] * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (added) * code/trunk/data/levels/templates/spaceshipEscort.oxt (added) Integrating Felix' EscortShip in the game (new weaponsetting and ... Tue, 23 Oct 2012 16:32:13 GMT jo [9414] * data/trunk/materials/Scene.material (modified) Correcting an error. Tue, 23 Oct 2012 11:03:31 GMT jo [9413] * data/trunk/images/textures/gunsTX.jpg (added) * data/trunk/images/textures/hullTX.jpg (added) * data/trunk/materials/Scene.material (modified) * data/trunk/materials/escortShipMaterial.material (added) * data/trunk/materials/escortWeaponMaterial.material (added) * data/trunk/models/escortShip.mesh (added) * data/trunk/models/escortWeapon.mesh (added) Adding the light escort ship from Felix Schulthess. Mon, 22 Oct 2012 15:05:14 GMT purgham [9412] * code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/Racingbot/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h (modified) Made SpaceRace-Mode usable for more then 1 Spaceship Mon, 22 Oct 2012 14:19:20 GMT mjiang [9411] * data/trunk/audio/sounds/Weapon_HsW01.ogg (modified) * data/trunk/audio/sounds/Weapon_HsW01_OLD.ogg (added) * data/trunk/audio/sounds/laserend.ogg (added) * data/trunk/audio/sounds/laserend_mod.ogg (added) * data/trunk/audio/sounds/laserend_orig.ogg (added) Changed Default Laser Sound. New Sounds added. Mon, 22 Oct 2012 14:14:26 GMT moralelastix [9410] * data/contentcreation/pps/dawalser/Head/Head.blend (modified) * data/contentcreation/pps/dawalser/Head/Head.blend1 (modified) * data/contentcreation/pps/dawalser/Head/Head.png (added) * data/contentcreation/pps/dawalser/Socket/Socket.blend (modified) * data/contentcreation/pps/dawalser/Socket/Socket.blend1 (modified) * data/contentcreation/pps/dawalser/Socket/Socket.png (added) UV Sun, 21 Oct 2012 15:51:47 GMT davidsa [9409] * code/branches/shaders/data/levels/shadertest.oxw (modified) Modified Shader Test Level to use the newly added shader, so stencil ... Sun, 21 Oct 2012 15:49:55 GMT davidsa [9408] * data/trunk/materials/glow.material (added) * data/trunk/programs/ps_glow.cg (added) * data/trunk/programs/vs_glow.cg (added) Added: rudimentary stencil outline glow shader, very basic and looks ... Sun, 21 Oct 2012 15:32:00 GMT davidsa [9407] * code/branches/shaders/src/orxonox/CMakeLists.txt (modified) * code/branches/shaders/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/shaders/src/orxonox/RenderQueueListener.cc (added) * code/branches/shaders/src/orxonox/RenderQueueListener.h (added) * code/branches/shaders/src/orxonox/Scene.cc (modified) * code/branches/shaders/src/orxonox/graphics/Model.cc (modified) * code/branches/shaders/src/orxonox/graphics/Model.h (modified) orxonox::RenderQueueListener: Implemented a rudimentary ... Sun, 21 Oct 2012 13:46:43 GMT keuschr [9406] * data/contentcreation/pps/keuschr/171012_2206_keuschrs_starship.blend (modified) * data/contentcreation/pps/keuschr/171012_2206_keuschrs_starship.blend1 (modified) starship 'collateral damage' v1 Thu, 18 Oct 2012 16:39:09 GMT keuschr [9405] * data/contentcreation/pps/keuschr/161012_1806_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/161012_1806_keuschrs_starship.blend1 (added) * data/contentcreation/pps/keuschr/161012_1806_keuschrs_starship.blend2 (added) * data/contentcreation/pps/keuschr/161012_2127_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/161012_2127_keuschrs_starship.blend1 (added) * data/contentcreation/pps/keuschr/161012_2127_keuschrs_starship.blend2 (added) * data/contentcreation/pps/keuschr/161012_2210_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/161012_2210_keuschrs_starship.blend1 (added) * data/contentcreation/pps/keuschr/161012_2210_keuschrs_starship.blend2 (added) * data/contentcreation/pps/keuschr/161012_2255_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/161012_2255_keuschrs_starship.blend1 (added) * data/contentcreation/pps/keuschr/161012_2255_keuschrs_starship.blend2 (added) * data/contentcreation/pps/keuschr/171012_2206_keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/171012_2206_keuschrs_starship.blend1 (added) * data/contentcreation/pps/keuschr/background_drawing.jpg (added) * data/contentcreation/pps/keuschr/keuschrs_starship.blend (added) * data/contentcreation/pps/keuschr/keuschrs_starship.blend1 (added) * data/contentcreation/pps/keuschr/keuschrs_starship.blend2 (added) * data/contentcreation/pps/keuschr/keuschrs_starship121015_2320.blend (added) * data/contentcreation/pps/keuschr/step_by_step (added) * data/contentcreation/pps/keuschr/step_by_step/1.png (added) * data/contentcreation/pps/keuschr/step_by_step/2.png (added) * data/contentcreation/pps/keuschr/step_by_step/3.png (added) * data/contentcreation/pps/keuschr/step_by_step/4.png (added) * data/contentcreation/pps/keuschr/step_by_step/5.png (added) * data/contentcreation/pps/keuschr/test.txt (deleted) * data/contentcreation/pps/keuschr/testship.blend (added) * data/contentcreation/pps/keuschr/testship.blend1 (added) * data/contentcreation/pps/keuschr/texture_design.blend (added) first version of starship Thu, 18 Oct 2012 16:12:56 GMT juchlil [9404] * data/contentcreation/pps/juchlil/Erste Blender Animation/Erste Gesichtsanimation.avi (added) Tue, 16 Oct 2012 14:48:57 GMT davidsa [9403] * code/branches/shaders/data/levels/shadertest.oxw (added) Showcase: Added Level 'Shader Test' to test the XML-Port ... Tue, 16 Oct 2012 13:32:20 GMT davidsa [9402] * code/branches/shaders/src/orxonox/graphics/Model.cc (modified) * code/branches/shaders/src/orxonox/graphics/Model.h (modified) Orxonox::Model: added XMLPort 'material' to easily attach a ... Tue, 16 Oct 2012 13:30:20 GMT davidsa [9401] * code/branches/shaders/src/libraries/tools/Mesh.cc (modified) * code/branches/shaders/src/libraries/tools/Mesh.h (modified) Orxonox::Mesh: Added functions setMaterial() and getMaterial() to ... Mon, 15 Oct 2012 14:33:52 GMT mottetb [9400] * code/branches/spaceNavigation/data/overlays/HUD.oxo (modified) * code/branches/spaceNavigation/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDAimAssistant.cc (added) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDAimAssistant.h (added) * code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc (modified) first checkin Mon, 15 Oct 2012 14:21:44 GMT purgham [9399] * code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (added) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h (added) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h (modified) Created new SpaceRaceController and added a function to SpaceRaceManager Mon, 15 Oct 2012 14:19:51 GMT smerkli [9398] * code/trunk/README (modified) Mon, 15 Oct 2012 13:52:33 GMT moralelastix [9397] * data/contentcreation/pps/dawalser/Head/Head.blend (modified) * data/contentcreation/pps/dawalser/Head/Head.blend1 (modified) * data/contentcreation/pps/dawalser/Socket/Socket.blend (modified) * data/contentcreation/pps/dawalser/Socket/Socket.blend1 (modified) * data/contentcreation/pps/dawalser/Tower/Tower.blend (modified) * data/contentcreation/pps/dawalser/Tower/Tower.blend1 (modified) * data/contentcreation/pps/dawalser/Tower/Tower.blend2 (added) Major work Mon, 15 Oct 2012 13:43:47 GMT soroa [9396] * code/branches/SpaceshipNavigation2/data/overlays/HUD.oxo (modified) * code/branches/SpaceshipNavigation2/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/SpaceshipNavigation2/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/SpaceshipNavigation2/src/modules/overlays/hud/HUDFindClosestEnemy.cc (added) * code/branches/SpaceshipNavigation2/src/modules/overlays/hud/HUDFindClosestEnemy.h (added) * code/branches/SpaceshipNavigation2/src/orxonox/worldentities/ControllableEntity.cc (modified) Created a new class called FindClosestEnemy Mon, 15 Oct 2012 13:12:13 GMT davidsa [9395] * code/branches/shaders/src/libraries/core/Resource.cc (modified) FIX: dynamic_cast from const to non-const is prohibited in newer ... Fri, 12 Oct 2012 11:07:59 GMT moralelastix [9394] * data/contentcreation/pps/dawalser/Head (added) * data/contentcreation/pps/dawalser/Head/Head.blend (added) * data/contentcreation/pps/dawalser/Head/Head.blend1 (added) * data/contentcreation/pps/dawalser/Socket/Socket.blend (modified) * data/contentcreation/pps/dawalser/Socket/Socket.blend1 (added) added head Wed, 10 Oct 2012 19:59:54 GMT juchlil [9393] * data/contentcreation/pps/juchlil/Erste Blender Animation (added) * data/contentcreation/pps/juchlil/Erste Blender Animation/DefaultMindManBonesAnimationVideo0001-0171.avi (added) * data/contentcreation/pps/juchlil/Erste Blender Animation/DefaultMindManIKBonesAnimation.blend (added) * data/contentcreation/pps/juchlil/Erste Blender Animation/DefaultMindManIKBonesAnimation.blend1 (added) Mon, 08 Oct 2012 14:02:02 GMT moralelastix [9392] * data/contentcreation/pps/dawalser/Socket (added) * data/contentcreation/pps/dawalser/Socket/Socket.blend (added) * data/contentcreation/pps/dawalser/Tower (added) * data/contentcreation/pps/dawalser/Tower/Tower.blend (added) * data/contentcreation/pps/dawalser/Tower/Tower.blend1 (added) first Files Mon, 08 Oct 2012 13:05:24 GMT keuschr [9391] * data/contentcreation/pps/keuschr/test.txt (modified) test commit 2 Mon, 08 Oct 2012 13:03:05 GMT keuschr [9390] * data/contentcreation/pps/keuschr/test.txt (added) test commit Mon, 08 Oct 2012 12:41:45 GMT jo [9389] * data/contentcreation/pps/juchlil (added) New folder added Mon, 08 Oct 2012 12:31:39 GMT jo [9388] * code/branches/Racingbot (copied) Racebot branch. Mon, 08 Oct 2012 12:27:24 GMT jo [9387] * data/contentcreation/pps/dawalser (added) * data/contentcreation/pps/soroa (added) Further folders added. Mon, 08 Oct 2012 12:26:03 GMT jo [9386] * data/contentcreation/pps/jokicp (added) * data/contentcreation/pps/keuschr (added) New project folders added. Mon, 08 Oct 2012 12:12:55 GMT jo [9385] * code/branches/SpaceshipNavigation2 (copied) Space Ship Navigation Branch 2 - for SoroA Mon, 08 Oct 2012 12:06:14 GMT jo [9384] * code/branches/largeShip1 (copied) LargeShips branch Mon, 08 Oct 2012 11:51:28 GMT jo [9383] * code/branches/LevelLoader (copied) Creating new branch. Mon, 08 Oct 2012 11:50:35 GMT jo [9382] * code/branches/soundEffects (copied) Creating new branch. Mon, 08 Oct 2012 11:50:07 GMT jo [9381] * code/branches/spaceNavigation (copied) Creating new branch. Mon, 08 Oct 2012 11:47:04 GMT jo [9380] * code/branches/turret (copied) Creating new branch. Mon, 08 Oct 2012 11:46:35 GMT jo [9379] * code/branches/shaders (copied) Creating new branch. Mon, 01 Oct 2012 11:08:19 GMT smerkli [9378] * code/branches/tutorial2/data/levels/tutorial.oxw (modified) Fixed skybox to be something that works in tutorial.oxw Wed, 12 Sep 2012 06:18:56 GMT jo [9377] * code/branches/release2012/data/levels/missionOne.oxw (modified) * code/branches/release2012/data/levels/spaceRace.oxw (modified) Renaming some level descriptions. Fri, 07 Sep 2012 22:09:38 GMT jo [9376] * code/branches/release2012/data/gui/scripts/MiscConfigMenu.lua (modified) I added the new configValue from TeamDeathmatch to the Miscellaneous ... Fri, 07 Sep 2012 15:06:14 GMT jo [9375] * code/branches/release2012/data/gui/layouts/CreditsMenu.layout (modified) Updated Credits: We should mention AMIV as promised in the GV. Thu, 06 Sep 2012 14:47:26 GMT jo [9374] * code/branches/release2012/data/gui/scripts/HostMenu.lua (modified) Fixing logic error and removing preselection of the showall button. Thu, 06 Sep 2012 14:40:00 GMT jo [9373] * code/branches/release2012/data/gui/scripts/HostMenu.lua (modified) * code/branches/release2012/data/levels/asteroids.oxw (modified) * code/branches/release2012/data/levels/missionOne.oxw (modified) * code/branches/release2012/data/levels/spaceRace.oxw (modified) * code/branches/release2012/data/levels/surfaceRace.oxw (modified) * code/branches/release2012/data/levels/tetris.oxw (modified) * code/branches/release2012/data/levels/theTimeMachine.oxw (modified) * code/branches/release2012/src/orxonox/LevelInfo.cc (modified) On the way to adjust multiplayermenue. Levels tagged with ... Thu, 06 Sep 2012 13:00:38 GMT jo [9372] * code/branches/release2012/data/levels/underAttack.oxw (modified) * code/branches/release2012/src/orxonox/gametypes/UnderAttack.cc (modified) Small improvements; adjusting values for better playfeeling. An ... Thu, 06 Sep 2012 12:16:41 GMT jo [9371] * code/branches/release2012/data/levels/underAttack.oxw (modified) * code/branches/release2012/src/modules/objects/SpaceBoundaries.cc (modified) The UnderAttack level was improved. The defender's spawnpoints have ... Tue, 04 Sep 2012 16:13:03 GMT jo [9370] * code/branches/release2012/data/levels/underAttack.oxw (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.h (modified) * code/branches/release2012/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/release2012/src/orxonox/gametypes/UnderAttack.h (modified) The transporter's life is now set depending on the number of players. Tue, 04 Sep 2012 09:07:26 GMT jo [9369] * code/branches/release2012/data/defaultConfig/keybindings.ini (modified) Gotcha. I edited the wrong keybindings.ini file before. Tue, 04 Sep 2012 08:47:49 GMT jo [9368] * code/branches/release2012/src/orxonox/controllers/HumanController.cc (modified) * code/branches/release2012/src/orxonox/controllers/HumanController.h (modified) * code/branches/release2012/src/orxonox/controllers/NewHumanController.cc (modified) Trying to change the mouselook keybinding according to the suggestion ... Tue, 04 Sep 2012 07:39:04 GMT jo [9367] * code/branches/release2012/src/orxonox/controllers/NewHumanController.cc (modified) Disabling free aiming. Sun, 02 Sep 2012 20:54:30 GMT landauf [9366] * code/archive/animated_space_boundaries (moved) moved presentation branch from spring 2011 to archive because of the ... Sun, 02 Sep 2012 20:52:17 GMT landauf [9365] * code/archive/environment2 (moved) moved environment2 branch to archive Sun, 02 Sep 2012 20:51:21 GMT landauf [9364] * code/branches/dockingsystem2 (deleted) removed dockingsystem2 branch Sun, 02 Sep 2012 16:45:40 GMT jo [9363] * code/branches/release2012/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/release2012/src/orxonox/gametypes/TeamGametype.h (modified) Teamdeathmatch ends if a certain number of opponents have been ... Sun, 02 Sep 2012 11:58:43 GMT jo [9362] * data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg (added) * data/branches/dataRelease2012/audio/ambient/metal (deleted) * data/branches/dataRelease2012/materials/planet.material (added) I removed metal music theme, updated the mainmenu music and re-added ... Sun, 02 Sep 2012 11:55:27 GMT jo [9361] * code/branches/release2012/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/release2012/data/gui/scripts/AudioMenu.lua (modified) Modified music menusheet and credits menusheet. Sat, 01 Sep 2012 15:07:19 GMT jo [9360] * data/branches/dataRelease2012/images/levelpreviews/asteroidFieldTest.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/codingtutorial.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/earthdemonstration.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/emptylevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/eventsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/fpstestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/mytestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/notificationsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/pickupsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/planetdemonstration.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/portals.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentation.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationdm.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationfs11.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx1st.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx2.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx2nd.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationx3rd.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationxi.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationxifps1st.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/presentationxifps2nd.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/questsshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/screenshot.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/shieldtestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/soundshowcase.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/starstestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/swallowtestlevel.png (deleted) * data/branches/dataRelease2012/images/levelpreviews/waypointstestlevel.png (deleted) * data/branches/dataRelease2012/images/overlay/DroneBanner.png (deleted) * data/branches/dataRelease2012/images/overlay/Formation.png (deleted) * data/branches/dataRelease2012/images/overlay/Pickups.png (deleted) * data/branches/dataRelease2012/images/textures/can.png (deleted) * data/branches/dataRelease2012/images/textures/cokelabel.jpg (deleted) * data/branches/dataRelease2012/images/textures/playfield_top.png (deleted) * data/branches/dataRelease2012/images/textures/stunweapon.png (deleted) * data/branches/dataRelease2012/images/textures/tiled_floor.jpg (deleted) * data/branches/dataRelease2012/materials/Playfield.material (deleted) * data/branches/dataRelease2012/materials/Spacebomb.material (deleted) * data/branches/dataRelease2012/materials/Tower.material (deleted) * data/branches/dataRelease2012/materials/axes.material (deleted) * data/branches/dataRelease2012/materials/can.material (deleted) * data/branches/dataRelease2012/materials/cokebottle.material (deleted) * data/branches/dataRelease2012/materials/plane.material (deleted) * data/branches/dataRelease2012/materials/planet.material (deleted) * data/branches/dataRelease2012/materials/stunweapon.material (deleted) * data/branches/dataRelease2012/models/Playfield_ME.mesh (deleted) * data/branches/dataRelease2012/models/Spacebomb.mesh (deleted) * data/branches/dataRelease2012/models/Spacegate.mesh (added) * data/branches/dataRelease2012/models/Tower.mesh (deleted) * data/branches/dataRelease2012/models/Tower_ME.mesh (deleted) * data/branches/dataRelease2012/models/axes.mesh (deleted) * data/branches/dataRelease2012/models/can.mesh (deleted) * data/branches/dataRelease2012/models/cokebottle.mesh (deleted) * data/branches/dataRelease2012/models/plane.mesh (deleted) * data/branches/dataRelease2012/models/planet.mesh (deleted) * data/branches/dataRelease2012/models/stunweapon.mesh (deleted) I removed all models+materials+textures that seem unneccesary to me. ... Sat, 01 Sep 2012 15:04:18 GMT jo [9359] * code/branches/release2012/data/levels/FPSTest.oxw (deleted) * code/branches/release2012/data/levels/Spacerace2.oxw (deleted) * code/branches/release2012/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/release2012/data/levels/asteroidField.oxw (deleted) * code/branches/release2012/data/levels/docking.oxw (deleted) * code/branches/release2012/data/levels/earth.oxw (deleted) * code/branches/release2012/data/levels/emptyLevel.oxw (deleted) * code/branches/release2012/data/levels/events.oxw (deleted) * code/branches/release2012/data/levels/fightInOurBack.oxw (deleted) * code/branches/release2012/data/levels/gallery.oxw (deleted) * code/branches/release2012/data/levels/includes/weaponSettingsAssff2.oxi (deleted) * code/branches/release2012/data/levels/myTestLevel.oxw (deleted) * code/branches/release2012/data/levels/notifications.oxw (deleted) * code/branches/release2012/data/levels/old (deleted) * code/branches/release2012/data/levels/pickups.oxw (deleted) * code/branches/release2012/data/levels/pirateAttack.oxw (deleted) * code/branches/release2012/data/levels/planets.oxw (deleted) * code/branches/release2012/data/levels/portals.oxw (deleted) * code/branches/release2012/data/levels/presentation.oxw (deleted) * code/branches/release2012/data/levels/presentation09.oxw (deleted) * code/branches/release2012/data/levels/presentation09b.oxw (deleted) * code/branches/release2012/data/levels/presentationDM.oxw (deleted) * code/branches/release2012/data/levels/presentationFS10.oxw (deleted) * code/branches/release2012/data/levels/presentationFS102.oxw (deleted) * code/branches/release2012/data/levels/presentationFS10Ed.oxw (deleted) * code/branches/release2012/data/levels/presentationFS11.oxw (deleted) * code/branches/release2012/data/levels/presentationHS09.oxw (deleted) * code/branches/release2012/data/levels/presentationHS09b.oxw (deleted) * code/branches/release2012/data/levels/presentationHS11.oxw (deleted) * code/branches/release2012/data/levels/princessAeryn.oxw (deleted) * code/branches/release2012/data/levels/quests.oxw (deleted) * code/branches/release2012/data/levels/screenshot.oxw (deleted) * code/branches/release2012/data/levels/shieldTest.oxw (deleted) * code/branches/release2012/data/levels/sound.oxw (deleted) * code/branches/release2012/data/levels/templates/spaceshipAssff2.oxt (deleted) * code/branches/release2012/data/levels/templates/tower.oxt (deleted) * code/branches/release2012/data/levels/testStars.oxw (deleted) * code/branches/release2012/data/levels/testSwallow.oxw (deleted) * code/branches/release2012/data/levels/towerDefense.oxw (deleted) * code/branches/release2012/data/levels/tutorial.oxw (deleted) * code/branches/release2012/data/levels/waypoints.oxw (deleted) * code/branches/release2012/src/modules/CMakeLists.txt (modified) * code/branches/release2012/src/modules/towerdefense (deleted) * code/branches/release2012/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/release2012/src/orxonox/controllers/ScriptController.cc (deleted) * code/branches/release2012/src/orxonox/controllers/ScriptController.h (deleted) I removed most levels, towerdefence and the script controller since ... Sat, 01 Sep 2012 09:35:44 GMT landauf [9358] * code/archive/sound5 (moved) moved sound5 branch to archive Sat, 01 Sep 2012 09:34:56 GMT landauf [9357] * code/branches/enviroment (deleted) * code/branches/sound6 (deleted) removed unused branches Sat, 01 Sep 2012 09:32:20 GMT landauf [9356] * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/test/util/ConvertTest.cc (modified) details Sat, 01 Sep 2012 08:38:27 GMT landauf [9355] * code/archive/waypoints (moved) moved waypoints branch to archive Sat, 01 Sep 2012 08:37:19 GMT landauf [9354] * code/branches/presentation2011 (deleted) removed presentation branch from pps fall 2011 Sat, 01 Sep 2012 08:28:07 GMT landauf [9353] * code/branches/captureTheFlag (deleted) * code/branches/newlevel2012 (deleted) * code/branches/pCuts (deleted) * code/branches/pickup2012 (deleted) * code/branches/presentation2012 (deleted) * code/branches/presentation2012merge (deleted) * code/branches/shipSelection (deleted) * code/branches/sound2012 (deleted) * code/branches/spacebomb (deleted) * code/branches/surfaceRace (deleted) removed branches from pps spring 2012 Sat, 01 Sep 2012 07:02:12 GMT jo [9352] * data/branches/dataRelease2012 (copied) Creating a data release branch. Uneccesary files will be removed. Sat, 01 Sep 2012 06:57:23 GMT jo [9351] * code/branches/release2012 (copied) Creating a new branch in order to remove all unnecessary files. Fri, 31 Aug 2012 15:44:30 GMT jo [9350] * code/trunk/data/levels/gallery.oxw (modified) Added some billboards and a particle emitter. Fri, 31 Aug 2012 15:05:21 GMT jo [9349] * code/trunk/data/levels/gallery.oxw (added) Adding a gallery level. A place to present all important models. Thu, 30 Aug 2012 21:08:17 GMT landauf [9348] * code/trunk (modified) * code/trunk/cmake/tools/BuildUnits.cmake (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (modified) * code/trunk/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/asteroidField.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (modified) * code/trunk/data/levels/old/princessAeryn.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/tower.oxt (copied) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicMatchHUD.oxo (modified) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/data/overlays/tetrisHUD.oxo (copied) * code/trunk/data/overlays/towerdefenseHUD.oxo (copied) * code/trunk/data/overlays/underAttackHUD.oxo (deleted) * code/trunk/data/particle/smoke1.particle (deleted) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/doc/api/groups/Weapons.dox (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (modified) * code/trunk/src/BuildUnitsConfigMSVC.cmake (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/tolua/README_ORXONOX (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (deleted) * code/trunk/src/modules/pickup/DroppedPickup.h (deleted) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (copied) * code/trunk/src/modules/tetris/TetrisBrick.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisPrereqs.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (copied) * code/trunk/src/modules/tetris/TetrisScore.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/pickup (deleted) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) merged branch presentation2012merge back to trunk Thu, 30 Aug 2012 20:32:58 GMT landauf [9347] * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012merge/src/orxonox/infos/GametypeInfo.h (modified) removed unused function adjusted refactored code also in commented ... Thu, 30 Aug 2012 15:11:07 GMT jo [9346] * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo (modified) Bugfix: Previously the LastManStandingHUD wasn't displayed properly ... Thu, 30 Aug 2012 14:03:12 GMT jo [9345] * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) Small improvements on presentationHS11. Thu, 30 Aug 2012 12:39:35 GMT jo [9344] * code/branches/presentation2012merge/data/levels/pong.oxw (modified) Fixing pong's error message. Firstly the WorldSound's path wasn't ... Thu, 30 Aug 2012 09:53:01 GMT jo [9343] * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/pong.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) XML fixes: LastManStanding: wrong OverlayGroup name \n
... Thu, 30 Aug 2012 09:15:33 GMT jo [9342] * code/branches/presentation2012merge/data/levels/asteroids.oxw (modified) Adjusting timers of the Asteroid-Race level to the spaceships current ... Tue, 21 Aug 2012 17:28:51 GMT jo [9341] * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h (modified) Corrected getNumberOfPlayers(). Mon, 20 Aug 2012 14:46:52 GMT jo [9340] * code/branches/presentation2012merge/data/overlays/dynamicMatchHUD.oxo (modified) * code/branches/presentation2012merge/src/modules/pong/Pong.cc (modified) * code/branches/presentation2012merge/src/modules/pong/Pong.h (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Deathmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Deathmatch.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.h (modified) On the way of repairing a bug that was caused by manual refactoring ... Mon, 30 Jul 2012 20:41:03 GMT jo [9339] * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Gametype.h (modified) Found reason why players are not always detected correctly: ... Mon, 30 Jul 2012 19:25:47 GMT jo [9338] * code/branches/presentation2012merge/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.h (modified) Trying to find quick fixes for dynamic match. Somehow gametypes ... Sun, 29 Jul 2012 21:02:13 GMT landauf [9337] * code/branches/presentation2012merge/src/modules/docking/DockingController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) fixed "quivering" movement also for DockingController and in the 2nd ... Sun, 29 Jul 2012 20:44:11 GMT landauf [9336] * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) fixed weird AI movement introduced in waypoints branch Sun, 22 Jul 2012 20:44:22 GMT landauf [9335] * data/pool/materials/AUTHORS (modified) * data/pool/materials/Tower.material (copied) * data/pool/models/AUTHORS (modified) * data/pool/models/towerdefense (added) * data/pool/models/towerdefense/field (moved) * code/branches/presentation2012merge/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (deleted) * data/pool/models/towerdefense/tower (moved) * code/branches/presentation2012merge/src/modules/towerdefense/tower/Tower.material (deleted) moved tower defense blender files to pool