# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 5:43:44 PM Mon, 06 Nov 2017 11:58:54 GMT pascscha [11530] * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.h (added) Asteroid Clusters Mon, 06 Nov 2017 11:52:38 GMT pascscha [11529] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/CMakeLists.txt (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) Asteroid Clusters Sat, 04 Nov 2017 16:04:59 GMT vyang [11528] * code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/CMakeLists.txt (modified) Spawn Funktion fuer die Asteroiden veraendert Mon, 30 Oct 2017 15:36:26 GMT boltn [11527] * code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (added) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (added) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (added) Files fuer den story mode hud ge-added (noch nicht fertig) Mon, 30 Oct 2017 15:35:03 GMT boltn [11526] * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/svn-commit.tmp (added) Files fuer den story mode hud ge-added (noch nicht fertig) Mon, 30 Oct 2017 15:30:58 GMT fanconic [11525] * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc (modified) * code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc (modified) verschiedene kleine Aenderungen Mon, 30 Oct 2017 15:22:22 GMT remartin [11524] * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (modified) Mon, 30 Oct 2017 15:18:57 GMT jostoffe [11523] * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/Waypoints_HS17/data/levels/tutorial.oxw (modified) * code/branches/Waypoints_HS17/data/overlays/HUDPickupTemplate.oxo (modified) * code/branches/Waypoints_HS17/data/overlays/HUDTemplate_test.oxo (added) * code/branches/Waypoints_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Waypoints_HS17/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.cc (added) * code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.h (added) * code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/Waypoints_HS17/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.cc (added) * code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.h (added) * code/branches/Waypoints_HS17/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/Waypoints_HS17/src/orxonox/worldentities/AutonomousDrone.h (added) * code/branches/Waypoints_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) EmptyLevel funktioniert nicht wegen AutonomousDroneController, HUD ... Mon, 30 Oct 2017 15:18:35 GMT lrigoni [11522] * code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified) Saving 30-10-2017 Mon, 30 Oct 2017 15:17:14 GMT merholzl [11521] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) changes here and there Mon, 30 Oct 2017 15:12:04 GMT remartin [11520] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (modified) Added spawning of pickup and smaller asteroids, doesn't work yet. Mon, 30 Oct 2017 15:06:11 GMT kohlia [11519] * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/CMakeLists.txt (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/is_callable.h (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.h (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.ipp (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.cc (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.h (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (added) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (added) See previous Mon, 30 Oct 2017 15:05:01 GMT kohlia [11518] * code/branches/ScriptableController_HS17/src/libraries/core/BaseObject.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/CMakeLists.txt (modified) * code/branches/ScriptableController_HS17/src/orxonox/Level.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/Level.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h (modified) Nothing to see yet, really. Mon, 30 Oct 2017 15:05:01 GMT varxth [11517] * code/branches/SOBv2_HS17/BlenderFilesSOB (added) * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo.png (added) * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo7.blend (added) * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo7.blend1 (added) * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo7.blend2 (added) * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo8.blend (added) * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo_texturegross.xcf (added) * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/orxonox/graphics/Model.cc (modified) Started to implement change of clothes of figure after a power up. Mon, 30 Oct 2017 15:04:29 GMT vyang [11516] * code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (added) * code/branches/Asteroid_HS17/data/overlays/asteroidsHUD.oxo (added) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.cc (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.h (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsPrereqs.h (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids/CMakeLists.txt (modified) Files hinzugefuegt, versucht Aehnlichkeiten mit anderen minigames ... Mon, 30 Oct 2017 15:01:47 GMT kuchlert [11515] * code/branches/Dialog_HS17/src/modules/dialogue_2 (added) * code/branches/Dialog_HS17/src/modules/dialogue_2/Awnser.cc (added) * code/branches/Dialog_HS17/src/modules/dialogue_2/Awnser.h (added) * code/branches/Dialog_HS17/src/modules/dialogue_2/Dialog.cc (added) * code/branches/Dialog_HS17/src/modules/dialogue_2/Dialog.h (added) * code/branches/Dialog_HS17/src/modules/dialogue_2/Question.cc (added) * code/branches/Dialog_HS17/src/modules/dialogue_2/Question.h (added) Grundgeruest erstellt Mon, 30 Oct 2017 13:33:33 GMT merholzl [11514] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified) final XMLPort things. Changes in spaceshipFlappyOrx Mon, 30 Oct 2017 12:50:50 GMT boltn [11513] * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) nice Mon, 30 Oct 2017 12:48:55 GMT fanconic [11512] * code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc (added) * code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.h (added) created files for StoryModePlanet Mon, 30 Oct 2017 12:27:43 GMT merholzl [11511] * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified) second part XMLport Mon, 23 Oct 2017 14:41:56 GMT patricwi [11510] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) * code/branches/HUD_HS16/src/orxonox/interfaces/Pickupable.cc (modified) looking for SEGFault Mon, 23 Oct 2017 14:19:11 GMT merholzl [11509] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) small changes and prep for XML Mon, 23 Oct 2017 14:13:00 GMT remartin [11508] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (added) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (added) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) Started cobbling together the class 'AsteroidMining'. Adapted the ... Mon, 23 Oct 2017 14:12:10 GMT fanconic [11507] * code/branches/CampaignMap_HS17/data/levels/StoryModeMap.oxw (modified) * code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc (modified) Es wurde eine neue Unterklasse von Planets erstellt, Names ... Mon, 23 Oct 2017 14:06:09 GMT vyang [11506] * code/branches/Asteroid_HS17/src/modules/asteroids (added) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (added) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.h (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.cc (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.h (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.h (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsWeapon.cc (added) * code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsWeapon.h (added) * code/branches/Asteroid_HS17/src/modules/asteroids/CMakeLists.txt (added) Asteroids, Ship, Stones, Weapon files created Mon, 23 Oct 2017 13:49:31 GMT pascscha [11505] * code/branches/FlappyOrx_HS17/data/levels/includes/FlappyOrxWeapon.oxi (added) * code/branches/FlappyOrx_HS17/data/levels/includes/FlappyOrxWeaponEnemy.oxi (added) * code/branches/FlappyOrx_HS17/data/levels/templates/enemyFlappyOrx.oxt (added) * code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (added) * code/branches/FlappyOrx_HS17/data/overlays/FlappyHUD.oxo (deleted) * code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) UpDown3 Mon, 23 Oct 2017 13:22:13 GMT merholzl [11504] * code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw (modified) asteroid spawn placement Mon, 23 Oct 2017 13:19:08 GMT pascscha [11503] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw (modified) * code/branches/FlappyOrx_HS17/src/modules/CMakeLists.txt (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/CMakeLists.txt (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxCenterPoint.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxCenterPoint.h (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxPrereqs.h (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxWeapon.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxWeapon.h (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxWeaponEnemy.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxWeaponEnemy.h (added) MoveUpDown Mon, 23 Oct 2017 13:14:56 GMT patricwi [11502] * code/branches/HUD_HS16 (modified) * code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/HUD_HS16/data/gui/layouts/Dialogue.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/HighscoreMenu.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/Dialogue.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/HighscoreMenu.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/TestDialogButttons.lua (copied) * code/branches/HUD_HS16/data/levels/DialogueShowcase.oxw (copied) * code/branches/HUD_HS16/data/levels/Endurancefinal.oxw (copied) * code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/HUD_HS16/data/levels/MilleniumFalconTest.oxw (copied) * code/branches/HUD_HS16/data/levels/SOB.oxw (copied) * code/branches/HUD_HS16/data/levels/Spacerace2.oxw (deleted) * code/branches/HUD_HS16/data/levels/StoryModeMap.oxw (copied) * code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/HUD_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/data/levels/includes/MFalconWeapon.oxi (copied) * code/branches/HUD_HS16/data/levels/newnewnewspacerace.oxw (copied) * code/branches/HUD_HS16/data/levels/spaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/surfaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/templates/MFalcon.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/StoryMode.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/endurancetest_template.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/fastship.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/test11.oxt (copied) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/SOBHUD.oxo (copied) * code/branches/HUD_HS16/data/overlays/StoryModeHUD.oxo (copied) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dialogue (copied) * code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/HUD_HS16/src/modules/invader/Invader.cc (modified) * code/branches/HUD_HS16/src/modules/jump/Jump.cc (modified) * code/branches/HUD_HS16/src/modules/superorxobros (copied) * code/branches/HUD_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/Highscore.cc (copied) * code/branches/HUD_HS16/src/orxonox/Highscore.h (copied) * code/branches/HUD_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/HUD_HS16/src/orxonox/LevelInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.cc (copied) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.h (copied) * code/branches/HUD_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/HUD_HS16/src/test.txt (copied) updated HUD by merging trunk into it Mon, 23 Oct 2017 13:02:27 GMT patricwi [11501] * code/branches/HUD_HS16/src/modules/dialogue (deleted) removed dialogue folder Mon, 23 Oct 2017 12:57:17 GMT lrigoni [11500] * code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (added) Saving 23_10_17 Mon, 23 Oct 2017 12:56:00 GMT patricwi [11499] * code/branches/HUD_HS16 (modified) * code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/HUD_HS16/data/gui/layouts/Dialogue.layout (deleted) * code/branches/HUD_HS16/data/gui/layouts/HighscoreMenu.layout (deleted) * code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/Dialogue.lua (deleted) * code/branches/HUD_HS16/data/gui/scripts/HighscoreMenu.lua (deleted) * code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/TestDialogButttons.lua (deleted) * code/branches/HUD_HS16/data/levels/DialogueShowcase.oxw (deleted) * code/branches/HUD_HS16/data/levels/Endurancefinal.oxw (deleted) * code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/HUD_HS16/data/levels/MilleniumFalconTest.oxw (deleted) * code/branches/HUD_HS16/data/levels/SOB.oxw (deleted) * code/branches/HUD_HS16/data/levels/Spacerace2.oxw (copied) * code/branches/HUD_HS16/data/levels/StoryModeMap.oxw (deleted) * code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw (copied) * code/branches/HUD_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/data/levels/includes/MFalconWeapon.oxi (deleted) * code/branches/HUD_HS16/data/levels/newnewnewspacerace.oxw (deleted) * code/branches/HUD_HS16/data/levels/spaceRace.oxw (copied) * code/branches/HUD_HS16/data/levels/surfaceRace.oxw (copied) * code/branches/HUD_HS16/data/levels/templates/MFalcon.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/StoryMode.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/endurancetest_template.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/fastship.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/test11.oxt (deleted) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/SOBHUD.oxo (deleted) * code/branches/HUD_HS16/data/overlays/StoryModeHUD.oxo (deleted) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dialogue/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.cc (copied) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.h (copied) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/HUD_HS16/src/modules/invader/Invader.cc (modified) * code/branches/HUD_HS16/src/modules/jump/Jump.cc (modified) * code/branches/HUD_HS16/src/modules/pickup/DDDialogue.cc (modified) * code/branches/HUD_HS16/src/modules/superorxobros (deleted) * code/branches/HUD_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/Highscore.cc (deleted) * code/branches/HUD_HS16/src/orxonox/Highscore.h (deleted) * code/branches/HUD_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/HUD_HS16/src/orxonox/LevelInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.cc (deleted) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.h (deleted) * code/branches/HUD_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/HUD_HS16/src/test.txt (deleted) reset back in time Mon, 23 Oct 2017 12:25:36 GMT patricwi [11498] * code/branches/HUD_HS16 (modified) merge trunk into hud Mon, 23 Oct 2017 12:22:13 GMT patricwi [11497] * code/branches/HUD_HS16 (modified) * code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/HUD_HS16/data/gui/layouts/Dialogue.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/HighscoreMenu.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/Dialogue.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/HighscoreMenu.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/TestDialogButttons.lua (copied) * code/branches/HUD_HS16/data/levels/DialogueShowcase.oxw (copied) * code/branches/HUD_HS16/data/levels/Endurancefinal.oxw (copied) * code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/HUD_HS16/data/levels/MilleniumFalconTest.oxw (copied) * code/branches/HUD_HS16/data/levels/SOB.oxw (copied) * code/branches/HUD_HS16/data/levels/Spacerace2.oxw (deleted) * code/branches/HUD_HS16/data/levels/StoryModeMap.oxw (copied) * code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/HUD_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/data/levels/includes/MFalconWeapon.oxi (copied) * code/branches/HUD_HS16/data/levels/newnewnewspacerace.oxw (copied) * code/branches/HUD_HS16/data/levels/spaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/surfaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/templates/MFalcon.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/StoryMode.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/endurancetest_template.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/fastship.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/test11.oxt (copied) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/SOBHUD.oxo (copied) * code/branches/HUD_HS16/data/overlays/StoryModeHUD.oxo (copied) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/HUD_HS16/src/modules/invader/Invader.cc (modified) * code/branches/HUD_HS16/src/modules/jump/Jump.cc (modified) * code/branches/HUD_HS16/src/modules/superorxobros (copied) * code/branches/HUD_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/Highscore.cc (copied) * code/branches/HUD_HS16/src/orxonox/Highscore.h (copied) * code/branches/HUD_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/HUD_HS16/src/orxonox/LevelInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.cc (copied) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.h (copied) * code/branches/HUD_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/HUD_HS16/src/test.txt (copied) trunk merged into hud Mon, 23 Oct 2017 11:30:35 GMT patricwi [11496] * code/branches/Waypoints_HS17 (copied) Added Waypoints branch Sun, 22 Oct 2017 22:23:21 GMT patricwi [11495] * code/trunk (modified) * code/trunk/data/levels/Hover.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (modified) * code/trunk/data/overlays/HoverHUD.oxo (modified) * code/trunk/src/modules/hover/CMakeLists.txt (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.cc (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (deleted) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (deleted) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) reverted commit from merge with tgidronFS16 because failed to compile Mon, 16 Oct 2017 14:15:01 GMT lrigoni [11494] * code/branches/ProtectBoss_HS17/data/levels/emptyLevel.oxw (modified) Putting models to emptyLevel Mon, 16 Oct 2017 14:07:37 GMT patricwi [11493] * code/trunk (modified) * code/trunk/data/levels/Hover.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (modified) * code/trunk/data/overlays/HoverHUD.oxo (modified) * code/trunk/src/modules/hover/CMakeLists.txt (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.cc (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (copied) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (copied) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) Merged tgidronFS16 Mon, 16 Oct 2017 14:05:59 GMT remartin [11492] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (added) initialised pps project Mon, 16 Oct 2017 14:03:17 GMT varxth [11491] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) improved power up of player Mon, 16 Oct 2017 14:01:29 GMT vyang [11490] * code/branches/Asteroid_HS17/data/levels/Asteroid.oxw (added) Level Asteroid erstellt Mon, 16 Oct 2017 13:55:50 GMT lrigoni [11489] * code/branches/ProtectBoss_HS17/data/levels/emptyLevel.oxw (modified) SVN Test Mon, 16 Oct 2017 13:42:15 GMT patricwi [11488] * code/archive/tutorial6 (moved) Moved tutorial6 to archive Mon, 16 Oct 2017 13:41:58 GMT patricwi [11487] * code/archive/tutorial5 (moved) Moved tutorial5 to archive Mon, 16 Oct 2017 13:41:43 GMT patricwi [11486] * code/archive/tutorial4 (moved) Moved tutorial4 to archive Mon, 16 Oct 2017 13:41:28 GMT patricwi [11485] * code/archive/tutorial3 (moved) Moved tutorial3 to archive Mon, 16 Oct 2017 13:41:13 GMT patricwi [11484] * code/archive/tutorial2 (moved) Moved tutorial2 to archive Mon, 16 Oct 2017 13:40:56 GMT patricwi [11483] * code/archive/tutorial (moved) Moved tutorial to archive Mon, 16 Oct 2017 13:28:38 GMT patricwi [11482] * code/archive/Binderm_FS16 (moved) Moved bindermFS16 Mon, 16 Oct 2017 13:28:14 GMT pascscha [11481] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (added) * code/branches/FlappyOrx_HS17/data/overlays/FlappyHUD.oxo (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (added) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (added) Empty Game Mon, 16 Oct 2017 13:28:06 GMT patricwi [11480] * code/archive/PLehmann_FS16 (moved) Moved plehmannFS16 Mon, 16 Oct 2017 13:23:38 GMT patricwi [11479] * code/archive/Presentation_FS16 (moved) Moved Presentation_FS16 Mon, 16 Oct 2017 13:22:10 GMT patricwi [11478] * code/archive/mac_HS16 (moved) Moved mac_HS16 Mon, 16 Oct 2017 13:21:46 GMT patricwi [11477] * code/archive/Dialog_HS16 (moved) Moved Dialog_HS16 Mon, 16 Oct 2017 13:21:17 GMT patricwi [11476] * code/archive/QuestGuide_HS16 (moved) Moved QuestGuide_HS16 Mon, 16 Oct 2017 13:20:45 GMT patricwi [11475] * code/archive/Presentation_HS16 (moved) Moved Presentation_HS16 Mon, 16 Oct 2017 13:19:37 GMT patricwi [11474] * code/archive/Boss_FS17 (moved) Moved Boss_FS17 Mon, 16 Oct 2017 13:18:35 GMT patricwi [11473] * code/archive/Presentation_FS17 (moved) Moved Presentation_FS17 Mon, 16 Oct 2017 13:12:13 GMT patricwi [11472] * code/branches/SpaceRaceAI_HS16 (deleted) Removed SpaceRaceAI_HS16 branch Mon, 16 Oct 2017 13:11:19 GMT patricwi [11471] * code/branches/Fvultier_HS16 (deleted) Removed Fvultier_HS16 branch Mon, 16 Oct 2017 13:10:42 GMT patricwi [11470] * code/branches/ExplosionParts_FS17 (deleted) Removed ExplosionParts_FS17 branch Mon, 16 Oct 2017 13:09:13 GMT patricwi [11469] * code/branches/BigShip_HS16 (deleted) Removed BigShip_HS16 branch Mon, 16 Oct 2017 13:08:55 GMT patricwi [11468] * code/branches/StoryModeMap_HS16 (deleted) Removed StoryModeMap_HS16 branch Mon, 16 Oct 2017 13:08:31 GMT patricwi [11467] * code/branches/Highscore_HS16 (deleted) Removed Highscore_HS16 branch Mon, 16 Oct 2017 13:08:03 GMT patricwi [11466] * code/branches/SpaceRace_HS16 (deleted) Removed SpaceRace_HS16 branch Mon, 16 Oct 2017 13:07:32 GMT patricwi [11465] * code/branches/Alejandro_FS17 (deleted) Removed Alejandro_FS17 branch Mon, 16 Oct 2017 13:07:13 GMT patricwi [11464] * code/branches/SuperOrxoBros_FS17 (deleted) Removed SuperOrxoBros_FS17 branch Mon, 16 Oct 2017 13:06:43 GMT patricwi [11463] * code/branches/Dialogue_FS17 (deleted) Removed DialogueFS17 branch Mon, 16 Oct 2017 12:42:45 GMT patricwi [11462] * code/branches/ScriptableController_HS17 (copied) Creating new ScriptableController branch Mon, 16 Oct 2017 12:40:59 GMT patricwi [11461] * code/branches/AsteroidMining_HS17 (copied) Creating new AsteroidMining branch Mon, 16 Oct 2017 12:40:35 GMT patricwi [11460] * code/branches/FlappyOrx_HS17 (copied) Creating new FlappyOrx branch Mon, 16 Oct 2017 12:39:57 GMT patricwi [11459] * code/branches/SOBv2_HS17 (copied) Creating new SOBv2 branch Mon, 16 Oct 2017 12:39:21 GMT patricwi [11458] * code/branches/CampaignMap_HS17 (copied) Creating new CampaignMap branch Mon, 16 Oct 2017 12:38:36 GMT patricwi [11457] * code/branches/ProtectBoss_HS17 (copied) Creating new ProtectBoss branch Mon, 16 Oct 2017 12:38:07 GMT patricwi [11456] * code/branches/Asteroid_HS17 (copied) Creating new Asteroid branch Mon, 16 Oct 2017 12:08:36 GMT patricwi [11455] * code/branches/Dialog_HS17 (copied) Creating new Dialog branch Sun, 15 Oct 2017 14:29:18 GMT landauf [11454] * code/branches/ogre1.9/cmake/tools/FindCEGUI.cmake (modified) * code/branches/ogre1.9/src/libraries/core/GUIManager.cc (modified) reverted some changes in cmake script; also inject time pulse to ... Sun, 15 Oct 2017 11:12:20 GMT landauf [11453] * code/branches/ogre1.9/src/libraries/core/GUIManager.cc (modified) fixed crash with cegui 0.8 Wed, 11 Oct 2017 14:24:16 GMT patricwi [11452] * data/trunk/images/textures/MilleniumFalconPerf.png (deleted) Removed MilleniumFalcon texture Wed, 11 Oct 2017 14:11:29 GMT patricwi [11451] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged without core modifications Wed, 11 Oct 2017 14:07:20 GMT patricwi [11450] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (deleted) * code/trunk/data/gui/scripts/Dialogue.lua (deleted) * code/trunk/data/gui/scripts/TestDialogButttons.lua (deleted) * code/trunk/data/levels/DialogueShowcase.oxw (deleted) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/tcl/core (deleted) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (deleted) reverted merge Dialogue Mon, 02 Oct 2017 13:04:31 GMT patricwi [11449] * code/trunk (modified) * code/trunk/data/levels/SOB.oxw (added) * code/trunk/data/overlays/SOBHUD.oxo (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/superorxobros (copied) SuperOrxoBros added Mon, 02 Oct 2017 12:49:47 GMT patricwi [11448] * code/trunk (modified) * code/trunk/data/levels/MilleniumFalconTest.oxw (copied) * code/trunk/data/levels/includes/MFalconWeapon.oxi (copied) * code/trunk/data/levels/templates/MFalcon.oxt (copied) Millenium Falcon merged Mon, 02 Oct 2017 12:32:11 GMT patricwi [11447] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/tcl/core (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged Thu, 01 Jun 2017 14:10:22 GMT patricwi [11446] * data/trunk/images/levelpreviews/frozen1.jpeg (added) frozen image added Thu, 01 Jun 2017 13:46:20 GMT patricwi [11445] * data/trunk/testfile.oxr (deleted) testfile removed Tue, 30 May 2017 12:58:20 GMT patricwi [11444] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/levels/Endurancefinal.oxw (modified) * code/branches/Presentation_FS17/data/levels/FinalBossFS17.oxw (copied) * code/branches/Presentation_FS17/data/levels/includes/BossSpawnWeaponSetting.oxi (copied) * code/branches/Presentation_FS17/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/Presentation_FS17/data/levels/shieldTest.oxw (modified) * code/branches/Presentation_FS17/data/levels/templates/Bossship.oxt (copied) * code/branches/Presentation_FS17/data/levels/templates/Bossspawnship.oxt (copied) * code/branches/Presentation_FS17/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/Presentation_FS17/src/orxonox/items/PartDestructionEvent.cc (modified) merged Boss Level Tue, 30 May 2017 12:11:11 GMT nyogaraj [11443] * code/branches/Boss_FS17/src/orxonox/items/PartDestructionEvent.cc (modified) fixed error Tue, 30 May 2017 11:42:50 GMT maxima [11442] * data/trunk/images/levelpreviews/SOB.png (added) * data/trunk/images/textures/Alien_feet_texture.png (added) * data/trunk/images/textures/Alien_texture.png (added) * data/trunk/images/textures/Coin_texture.png (added) * data/trunk/images/textures/Dreieck_links+1_texture.png (added) * data/trunk/images/textures/Dreieck_links_texture.png (added) * data/trunk/images/textures/Fahne_texture.png (added) * data/trunk/images/textures/Fahnenstaender_texture.png (added) * data/trunk/images/textures/Fahnenstange_texture.png (added) * data/trunk/images/textures/MilleniumFalconPerf.png (added) * data/trunk/images/textures/Pliz2_feet_texture.png (added) * data/trunk/images/textures/Pliz2_texture.png (added) * data/trunk/images/textures/Pliz_texture.png (added) * data/trunk/images/textures/Rohr_texture.png (added) * data/trunk/images/textures/Schlosshohlrund_texture.png (added) * data/trunk/images/textures/Seamless_cobbleStone_texture.png (added) * data/trunk/images/textures/Seamless_marsStone_texture.png (added) * data/trunk/images/textures/antenna_bot.png (added) * data/trunk/images/textures/antenna_top.png (added) * data/trunk/images/textures/helmet_texture_pixelized.png (added) * data/trunk/images/textures/mars_ground4_bestOne.png (added) * data/trunk/images/textures/orxo_rucksack_texture.png (added) * data/trunk/images/textures/orxo_texture.png (added) * data/trunk/images/textures/questionmark_mars.png (added) * data/trunk/images/textures/questionmark_mars_used.png (added) * data/trunk/materials/Alien_body_material.material (added) * data/trunk/materials/Alien_leftFoot_material.material (added) * data/trunk/materials/Alien_rightFoot_material.material (added) * data/trunk/materials/Antenne_1_material.material (added) * data/trunk/materials/Antenne_2_material.material (added) * data/trunk/materials/Coin_material.material (added) * data/trunk/materials/Cubestyl1.1.material (added) * data/trunk/materials/Cubestyl1.1mars.material (added) * data/trunk/materials/Cubestyl1.3.material (added) * data/trunk/materials/Cubestyl1.3mars.material (added) * data/trunk/materials/Cubestyl1.6.material (added) * data/trunk/materials/Cubestyl1.6mars.material (added) * data/trunk/materials/Cubestyl2.12.material (added) * data/trunk/materials/Cubestyl2.12mars.material (added) * data/trunk/materials/Cubestyl2.2.material (added) * data/trunk/materials/Cubestyl2.2cobble.material (added) * data/trunk/materials/Cubestyl2.2mars.material (added) * data/trunk/materials/Cubestyl2.3.material (added) * data/trunk/materials/Cubestyl2.3mars.material (added) * data/trunk/materials/Cubestyl2.6.material (added) * data/trunk/materials/Cubestyl2.6mars.material (added) * data/trunk/materials/Deck.material (added) * data/trunk/materials/Dreieck1marsMaterial.material (added) * data/trunk/materials/DreieckMaterial.material (added) * data/trunk/materials/Dreieck_links+1_material.material (added) * data/trunk/materials/DreieckgrossMaterial.material (added) * data/trunk/materials/Fahnenstange_material.material (added) * data/trunk/materials/Fahnetex.material (added) * data/trunk/materials/Fundamenttex.material (added) * data/trunk/materials/Goomba_body_material.material (added) * data/trunk/materials/Goomba_leftFoot_material.material (added) * data/trunk/materials/Goomba_rightFoot_material.material (added) * data/trunk/materials/Mariostyl.material (added) * data/trunk/materials/QCube-grey-Material.material (added) * data/trunk/materials/QMaterial.material (added) * data/trunk/materials/Rohr_material.material (added) * data/trunk/materials/Rucksack_material.material (added) * data/trunk/materials/Schloss_material.material (added) * data/trunk/materials/helmet_material.material (added) * data/trunk/materials/magic_mushroom_material.material (added) * data/trunk/materials/orxo_material.material (added) * data/trunk/models/Alien.mesh (added) * data/trunk/models/Coin.mesh (added) * data/trunk/models/Cube1.1.mesh (added) * data/trunk/models/Cube1.1mars.mesh (added) * data/trunk/models/Cube1.3.mesh (added) * data/trunk/models/Cube1.3mars.mesh (added) * data/trunk/models/Cube1.6.mesh (added) * data/trunk/models/Cube1.6mars.mesh (added) * data/trunk/models/Cube2.12.mesh (added) * data/trunk/models/Cube2.12mars.mesh (added) * data/trunk/models/Cube2.2.mesh (added) * data/trunk/models/Cube2.2cobble.mesh (added) * data/trunk/models/Cube2.2mars.mesh (added) * data/trunk/models/Cube2.3.mesh (added) * data/trunk/models/Cube2.3mars.mesh (added) * data/trunk/models/Cube2.6.mesh (added) * data/trunk/models/Cube2.6mars.mesh (added) * data/trunk/models/Dreieck+1.mesh (added) * data/trunk/models/Dreieck+1mars.mesh (added) * data/trunk/models/Dreieck.mesh (added) * data/trunk/models/Dreieck_links+1.mesh (added) * data/trunk/models/Dreieckgross.mesh (added) * data/trunk/models/Fahne.mesh (added) * data/trunk/models/Fahnenstange.mesh (added) * data/trunk/models/Fundament.mesh (added) * data/trunk/models/Goomba.mesh (added) * data/trunk/models/MilleniumFalcon.mesh (added) * data/trunk/models/Orxo.mesh (added) * data/trunk/models/Pilz.mesh (added) * data/trunk/models/QCube-grey.mesh (added) * data/trunk/models/QCube.mesh (added) * data/trunk/models/Rohr.mesh (added) * data/trunk/models/Schloss.mesh (added) * data/trunk/models/orxo.mesh (added) all files of PPS Tue, 30 May 2017 10:10:37 GMT maxima [11441] * code/branches/Presentation_FS17/data/tcl/core (deleted) deleted unnecessary file Tue, 30 May 2017 08:48:26 GMT maxima [11440] * data/trunk/testfile.oxr (added) test Mon, 29 May 2017 15:39:55 GMT patricwi [11439] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/levels/MilleniumFalconTest.oxw (copied) * code/branches/Presentation_FS17/data/levels/includes/MFalconWeapon.oxi (copied) * code/branches/Presentation_FS17/data/levels/templates/MFalcon.oxt (copied) Millenium Falcon added Mon, 29 May 2017 15:26:24 GMT patricwi [11438] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/levels/SOB.oxw (copied) * code/branches/Presentation_FS17/data/levels/SOB_Level2.oxw (copied) * code/branches/Presentation_FS17/data/levels/SuperOrxoBros.oxw (copied) * code/branches/Presentation_FS17/data/levels/SuperOrxoBrosLevel.oxw (copied) * code/branches/Presentation_FS17/data/levels/templates/superorxobrow.oxw (copied) * code/branches/Presentation_FS17/data/overlays/SOBHUD.oxo (copied) * code/branches/Presentation_FS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_FS17/src/modules/superorxobros (copied) SuperOrxoBros works Mon, 29 May 2017 14:18:43 GMT patricwi [11437] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/gui/layouts/Dialogue.layout (copied) * code/branches/Presentation_FS17/data/gui/scripts/Dialogue.lua (copied) * code/branches/Presentation_FS17/data/gui/scripts/TestDialogButttons.lua (copied) * code/branches/Presentation_FS17/data/levels/DialogueShowcase.oxw (copied) * code/branches/Presentation_FS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_FS17/data/tcl/core (copied) * code/branches/Presentation_FS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_FS17/src/modules/dialogue (copied) * code/branches/Presentation_FS17/src/modules/dialogue/DialogueManager.cc (modified) Dialogue project merged Mon, 29 May 2017 13:37:40 GMT patricwi [11436] * code/branches/Presentation_FS17 (copied) Creating Presentation branch Fri, 26 May 2017 13:40:04 GMT rrogge [11435] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/DialogueShowcase.oxw (added) * code/branches/Dialogue_FS17/data/levels/emptyLevel.oxw (modified) * code/branches/Dialogue_FS17/data/tcl/core (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) Code aufgeraeumt Fri, 26 May 2017 13:26:34 GMT landauf [11434] * build/dockerfiles/orxonox_jenkins-slave/Dockerfile (modified) install java 8 to run jetty slave in docker container Thu, 18 May 2017 15:27:15 GMT rrogge [11433] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/events.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc (modified) Everything works Thu, 18 May 2017 15:05:53 GMT rrogge [11432] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/events.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) Reload works now Thu, 18 May 2017 14:32:13 GMT davidf [11431] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified)