# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 25, 2024, 7:12:18 PM Fri, 24 Nov 2017 12:15:12 GMT boltn [11588] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified) nur einmal auszfuehrenden code aus tick in initialize fkt verschoben Tue, 21 Nov 2017 15:51:31 GMT remartin [11587] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) Kleinere Probleme gelöst (HP, Position richtig setzen). Noch die ... Tue, 21 Nov 2017 12:07:17 GMT remartin [11586] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) Major breakthrough: Variable Collision shape works, error in ... Mon, 20 Nov 2017 16:32:43 GMT lrigoni [11585] * code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified) Changes 20.11.2017 Mon, 20 Nov 2017 16:01:46 GMT boltn [11584] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified) Planeten koennen nun mittels objectlist beschrieben werden. todo: ... Mon, 20 Nov 2017 15:48:03 GMT kohlia [11583] * code/branches/ScriptableController_HS17/src/libraries/core/BaseObject.h (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/gamestates/GSLevel.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.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/MobileEntity.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h (modified) Near object, near point and at area work! Mon, 20 Nov 2017 15:30:24 GMT jostoffe [11582] * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) Koordinatentransformation und Drehung des Pfeils funktioniert noch nicht Mon, 20 Nov 2017 15:21:26 GMT remartin [11581] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) Doesn-t freeze any more. Asteroids and the pickup seem to collide ... Mon, 20 Nov 2017 15:19:40 GMT merholzl [11580] * 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/FlappyOrx.h (modified) colisson boxes and asteroidshapoeremoval Mon, 20 Nov 2017 15:15:17 GMT kuchlert [11579] * code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout (added) * code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua (added) * code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw (added) * code/branches/Dialog_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Dialog_HS17/src/modules/dialog (added) * code/branches/Dialog_HS17/src/modules/dialog/Answer.cc (added) * code/branches/Dialog_HS17/src/modules/dialog/Answer.h (added) * code/branches/Dialog_HS17/src/modules/dialog/AnswerId.cc (added) * code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h (added) * code/branches/Dialog_HS17/src/modules/dialog/CMakeLists.txt (added) * code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (added) * code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (added) * code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc (added) * code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (added) * code/branches/Dialog_HS17/src/modules/dialog/Question.cc (added) * code/branches/Dialog_HS17/src/modules/dialog/Question.h (added) * code/branches/Dialog_HS17/src/modules/dialogue_2 (deleted) some bug fixed most not Mon, 20 Nov 2017 15:06:43 GMT varxth [11578] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified) abgleich Mon, 20 Nov 2017 15:05:27 GMT zarron [11577] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified) first atempt to set dir of fireballs correctly Mon, 20 Nov 2017 14:26:31 GMT pascscha [11576] * code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (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/FlappyOrxHUDinfo.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) deathmessages again Mon, 20 Nov 2017 14:21:35 GMT varxth [11575] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified) merged Fireball and player Mon, 20 Nov 2017 14:15:13 GMT merholzl [11574] * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified) more death textes Mon, 20 Nov 2017 14:11:07 GMT zarron [11573] * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified) fireing Fireballs enabled Mon, 20 Nov 2017 13:46:48 GMT merholzl [11572] * 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.h (modified) hitboxes Mon, 20 Nov 2017 13:29:05 GMT varxth [11570] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified) better Fireball Mon, 20 Nov 2017 13:28:36 GMT varxth [11569] * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) better Fireball Mon, 20 Nov 2017 13:16:00 GMT merholzl [11568] * 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.h (modified) some messages Mon, 20 Nov 2017 13:15:02 GMT varxth [11567] * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc (modified) komplet Mon, 20 Nov 2017 13:00:56 GMT pascscha [11566] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (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/FlappyOrxShip.cc (modified) skybox Mon, 20 Nov 2017 12:35:53 GMT pascscha [11565] * 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/FlappyOrxHUDinfo.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified) death message initiated2 Mon, 20 Nov 2017 12:27:33 GMT fanconic [11564] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified) small changes Mon, 20 Nov 2017 12:06:08 GMT pascscha [11563] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) * code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (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/FlappyOrxHUDinfo.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) death message initiated Mon, 13 Nov 2017 16:25:09 GMT kohlia [11562] * code/branches/ScriptableController_HS17/src/libraries/tools/Timer.cc (modified) * code/branches/ScriptableController_HS17/src/libraries/tools/Timer.h (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/infos/HumanPlayer.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h (modified) Figuring out when the different things are ready in orxonox Mon, 13 Nov 2017 15:34:53 GMT remartin [11561] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/pickup/Pickup.h (modified) * code/branches/AsteroidMining_HS17/src/modules/pickup/PickupSpawner.h (modified) Pickup generating works now after changing privacy settings of set ... Mon, 13 Nov 2017 15:20:31 GMT fanconic [11560] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt (modified) * code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) Das StoryModeHUD.cc wurde kompiliert und ist momentan bugfrei. Es ... Mon, 13 Nov 2017 15:16:35 GMT jostoffe [11559] * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc (modified) * code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc (modified) * code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h (modified) Pfeil wird angezeigt und fliegt mit dem Raumschiff mit, aber er ist ... Mon, 13 Nov 2017 15:14:47 GMT patricwi [11558] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) no more segfaults but still not exiting properly - maybe never ending ... Mon, 13 Nov 2017 15:13:43 GMT lrigoni [11557] * code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified) Commit of 13.11.17 Mon, 13 Nov 2017 15:07:13 GMT zarron [11556] * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (added) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (added) Fireball implemented, Physics are crazy at the moment Mon, 13 Nov 2017 15:05:34 GMT vyang [11555] * code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (modified) * code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids.oxt (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/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) Level file: korrekte Kameraposition, Raumschiff bewegt sich nicht, ... Mon, 13 Nov 2017 14:44:45 GMT pascscha [11554] * 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/FlappyOrxShip.cc (modified) Increasing difficulty Thu, 09 Nov 2017 17:13:50 GMT remartin [11553] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) That pickup stuff is a bloody mess. Protected methods and weird ... Tue, 07 Nov 2017 18:26:12 GMT kohlia [11552] * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.ipp (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) Lua bindings should work now Tue, 07 Nov 2017 16:47:14 GMT remartin [11551] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) added method 'putStuff' for initialisation. Mesh has correct size ... Tue, 07 Nov 2017 12:04:27 GMT remartin [11550] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) Unsymmetrische Kommentarklammern in Ordnung gebracht. Sollte jetzt ... Mon, 06 Nov 2017 16:23:08 GMT kohlia [11549] * code/branches/ScriptableController_HS17/src/orxonox/Level.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/Level.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.ipp (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified) Not working yet Mon, 06 Nov 2017 16:11:38 GMT remartin [11548] * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (deleted) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (deleted) Mon, 06 Nov 2017 16:06:16 GMT remartin [11547] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/CMakeLists.txt (added) Mon, 06 Nov 2017 16:04:28 GMT remartin [11546] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) Dateien von /orxonox nach /src migriert. Generierung inkl. Mesh und ... Mon, 06 Nov 2017 15:40:56 GMT boltn [11545] * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.cc (added) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.h (added) Beschriftbaren planet erstellt und in passenderen ordner verschoben. Mon, 06 Nov 2017 15:35:06 GMT fanconic [11544] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel (added) * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (added) * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified) Story Mode Hud was edited, and a level file was added Mon, 06 Nov 2017 15:18:11 GMT pascscha [11543] * code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) camera changes Mon, 06 Nov 2017 15:10:49 GMT lrigoni [11542] * code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified) Changes of 6.11.2017 Mon, 06 Nov 2017 15:06:54 GMT vyang [11541] * code/branches/Asteroid_HS17/data/levels/Asteroid.oxw (modified) * code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (modified) * code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids.oxt (added) * code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.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) TestLevel Design -> immer noch mit Fehlermeldungen, Asteroiden in der ... Mon, 06 Nov 2017 15:05:15 GMT patricwi [11540] * 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/overlays/hud/HUDPickupSystem.h (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) sync function added without success, order of pickups in HUD is mixed up Mon, 06 Nov 2017 15:01:33 GMT jostoffe [11539] * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc (modified) * code/branches/Waypoints_HS17/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc (added) * code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h (added) * code/branches/Waypoints_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) Arrow- und ArrowControllerfiles hinzugefuegt. Position vom Schiff ... Mon, 06 Nov 2017 14:43:57 GMT varxth [11538] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified) function to change clothes Mon, 06 Nov 2017 14:32:04 GMT pascscha [11537] * 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/FlappyOrxAsteroid.cc (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.h (modified) * code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) Death Mon, 06 Nov 2017 14:04:36 GMT varxth [11536] * code/branches/SOBv2_HS17/SOB.oxw (added) sob.oxw Mon, 06 Nov 2017 14:00:59 GMT varxth [11535] * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) THEOt Mon, 06 Nov 2017 13:51:31 GMT varxth [11534] * code/branches/SOBv2_HS17/src/libraries/tools/Mesh.cc (modified) * code/branches/SOBv2_HS17/src/libraries/tools/Mesh.h (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/orxonox/graphics/Model.cc (modified) * code/branches/SOBv2_HS17/src/orxonox/graphics/Model.h (modified) added setSubMaterial(...) to Model.cc and Mesh.cc Mon, 06 Nov 2017 13:12:57 GMT merholzl [11533] * code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (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/FlappyOrxHUDinfo.cc (modified) point system in place Mon, 06 Nov 2017 12:41:07 GMT varxth [11532] * code/branches/SOBv2_HS17/BlenderFilesSOB/orxo_texture_gross.png (added) added orxo_material_gross.png to BlenderFilesSOB Mon, 06 Nov 2017 12:38:44 GMT varxth [11531] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) added orxo_material_gross.png to BlenderFilesSOB 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 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: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