# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # May 15, 2024, 11:34:57 AM Wed, 03 Dec 2014 16:06:11 GMT erbj [10151] * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) waves added Wed, 03 Dec 2014 15:19:09 GMT flsueess [10150] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified) weitere collishionsahpes Wed, 03 Dec 2014 15:16:49 GMT aejonas [10149] * code/branches/hudHS14/data/overlays/HUDTemplates3.oxo (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) the healthbar is now changing its size every thime the spaceship ... Wed, 03 Dec 2014 14:54:27 GMT sujataj [10148] * code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified) pickups and more enemies Wed, 03 Dec 2014 12:38:14 GMT maxima [10147] * code/branches/towerdefenseHS14/src/modules/objects/controllers (added) * code/branches/towerdefenseHS14/src/modules/objects/controllers/CMakeLists.txt (added) * code/branches/towerdefenseHS14/src/modules/objects/controllers/TeamTargetProxy.cc (added) * code/branches/towerdefenseHS14/src/modules/objects/controllers/TeamTargetProxy.h (added) * code/branches/towerdefenseHS14/src/modules/objects/controllers/TurretController.cc (added) * code/branches/towerdefenseHS14/src/modules/objects/controllers/TurretController.h (added) Wed, 03 Dec 2014 12:28:02 GMT maxima [10146] * code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified) Wed, 03 Dec 2014 12:03:15 GMT maxima [10145] * code/branches/turretFS14/src/modules/objects/controllers (added) * code/branches/turretFS14/src/modules/objects/controllers/CMakeLists.txt (added) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (added) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (added) Wed, 03 Dec 2014 11:49:15 GMT maxima [10144] * code/branches/towerdefenseHS14/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/towerdefenseHS14/data/levels/templates/enemytowerdefense.oxt (modified) * code/branches/towerdefenseHS14/data/levels/templates/standardTurret.oxt (added) * code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified) * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/data/levels/turretTest.oxw (modified) * code/branches/towerdefenseHS14/src/libraries/core/input/InputManager.cc (modified) * code/branches/towerdefenseHS14/src/modules/objects/CMakeLists.txt (modified) * code/branches/towerdefenseHS14/src/modules/objects/Turret.cc (modified) * code/branches/towerdefenseHS14/src/modules/objects/Turret.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/towerdefenseHS14/src/orxonox/worldentities/WorldEntity.cc (modified) Geaenderte Turret Klassen hinzugefuegt. Neues Template towerturret. ... Wed, 26 Nov 2014 16:18:44 GMT aejonas [10143] * code/branches/hudHS14/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) acces to GetHealth in HUDNavigation for scaling the healthbar Wed, 26 Nov 2014 16:14:33 GMT maxima [10142] * code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.h (added) hzilly. Alle files zusammengefuegt. Wed, 26 Nov 2014 15:41:02 GMT maxima [10141] * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) falsche aenderungen rueckgaening gemacht Wed, 26 Nov 2014 15:30:10 GMT maxima [10140] * code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified) * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.h (modified) nhaenni. HUD angepasst. Wed, 26 Nov 2014 15:19:03 GMT sriedel [10139] * code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt (modified) Update added trial pattern. Wed, 26 Nov 2014 15:07:45 GMT kecks [10138] * code/branches/keckslevelHS14/data/levels/kecks.oxw (modified) Level file changed. Wed, 26 Nov 2014 15:03:46 GMT flsueess [10137] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (modified) * code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified) noch mehr collishion shapes Wed, 26 Nov 2014 15:01:07 GMT sujataj [10136] * code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified) * code/branches/leveljoemeHS14/src/modules/notifications/NotificationQueueCEGUI.cc (modified) pickups and enemies Wed, 26 Nov 2014 14:59:37 GMT sriedel [10135] * code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (modified) * code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt (added) * code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) Working version, Blockpattern are strange. Wed, 26 Nov 2014 14:58:47 GMT erbj [10134] * code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (deleted) * code/branches/towerdefenseHS14/data/levels/templates/enemytowerdefense.oxt (added) * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) different models with style Wed, 19 Nov 2014 15:27:48 GMT flsueess [10133] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified) CollisionShapes hinzugefuegt Wed, 19 Nov 2014 15:20:18 GMT maxima [10132] * code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (modified) * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/Tower.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified) Wed, 19 Nov 2014 15:08:42 GMT richtero [10131] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.cc (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified) new structure: Board in separate class Wed, 19 Nov 2014 15:07:53 GMT kecks [10130] * code/branches/keckslevelHS14/data/levels/kecks.oxw (modified) Level file changed. Wed, 19 Nov 2014 15:02:55 GMT sujataj [10129] * code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified) added allies Wed, 19 Nov 2014 15:00:53 GMT sriedel [10128] * code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (added) * code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified) Should work so far Wed, 19 Nov 2014 13:10:51 GMT sriedel [10127] * code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (deleted) * code/branches/surfaceraceHS14/data/levels/DodgeRacePlus.oxw (deleted) * code/branches/surfaceraceHS14/data/levels/DodgeRaceold.oxw (deleted) * code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) Level files added. Wed, 19 Nov 2014 12:14:02 GMT maxima [10126] * code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (modified) * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified) Waypointcontroller in Enemy template Wed, 12 Nov 2014 22:53:34 GMT maxima [10125] * code/branches/towerdefenseHS14/data/levels/templates/TowerdefenseEnemy.oxt (deleted) * code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (added) * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) Enemies use the new template enemytowerdefense Wed, 12 Nov 2014 15:11:00 GMT sriedel [10124] * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified) still working atm. including function after function, currently HUD. Wed, 12 Nov 2014 15:09:35 GMT erbj [10123] * code/branches/towerdefenseHS14/data/levels/templates/TowerdefenseEnemy.oxt (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified) Template not working Wed, 12 Nov 2014 15:08:14 GMT aejonas [10122] * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified) health bar is now under the spaceship while moving Wed, 12 Nov 2014 15:07:10 GMT richtero [10121] * code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.cc (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.h (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified) finished getWinner function which checks if somebody has won and ... Wed, 12 Nov 2014 15:04:45 GMT flsueess [10120] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified) verschiedene Anpassungen Wed, 12 Nov 2014 15:04:44 GMT kecks [10119] * code/branches/keckslevelHS14/data/levels/kecks.oxw (modified) Level file changed. Wed, 12 Nov 2014 14:58:59 GMT sriedel [10118] * code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified) Working atm. including function after function. Wed, 12 Nov 2014 13:27:50 GMT sriedel [10117] * code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (added) Bullshit Wed, 05 Nov 2014 15:45:29 GMT sriedel [10116] * code/branches/surfaceraceHS14/data/overlays/DodgeRaceHUD.oxo (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) DodgeRaceHUD added Wed, 05 Nov 2014 15:39:31 GMT richtero [10115] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified) started programming game logic Wed, 05 Nov 2014 15:33:51 GMT sriedel [10114] * code/branches/surfaceraceHS14/src/modules/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace (deleted) * code/branches/surfaceraceHS14/src/modules/dodgerace2 (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (added) * code/branches/surfaceraceHS14/src/modules/invader/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/invader/DodgePlayer.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/DodgePlayer.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/DodgeRace.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/DodgeRace.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/Invader.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/Invader.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderPrereqs.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.h (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.h (added) * code/branches/surfaceraceHS14/svn-commit.tmp (added) Started copying all over again, HUD doesnt work Wed, 05 Nov 2014 15:13:41 GMT flsueess [10113] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (modified) * code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (added) * code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt (modified) neues template mit allen bis jetzt vorhandenen Spacestation Elementen Wed, 05 Nov 2014 15:11:07 GMT fvultier [10112] * code/branches/pickupsFS14/data/levels/jump.oxw (modified) this is the correct version Wed, 05 Nov 2014 15:06:09 GMT fvultier [10111] * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpBoots.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpBoots.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpEnemy.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpEnemy.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpItem.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpItem.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpProjectile.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpProjectile.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPropeller.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPropeller.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpRocket.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpRocket.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpScore.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpScore.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShield.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShield.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpSpring.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpSpring.h (modified) Wed, 05 Nov 2014 15:04:51 GMT aejonas [10110] * code/branches/hudHS14/data/overlays/HUDTemplates3.oxo (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified) new way to display the healthbar on the screen (in a similar way like ... Wed, 05 Nov 2014 14:59:18 GMT erbj [10109] * code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc (deleted) * code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.h (deleted) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified) EnemyAdd implementierung Wed, 05 Nov 2014 14:55:40 GMT sujataj [10108] * code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified) modified level. works now Wed, 05 Nov 2014 12:15:55 GMT sriedel [10107] * code/branches/surfaceraceHS14/data/levels/DodgeRace (deleted) * code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (modified) * code/branches/surfaceraceHS14/data/levels/DodgeRacePlus.oxw (added) * code/branches/surfaceraceHS14/data/levels/DodgeRaceold.oxw (added) * code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/surfaceraceHS14/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/CMakeLists.txt (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderCenterPoint.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderCenterPoint.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemy.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemy.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemyShooter.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemyShooter.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderHUDinfo.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderHUDinfo.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderPrereqs.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderShip.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderShip.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeapon.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeapon.h (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeaponEnemy.cc (added) * code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeaponEnemy.h (added) New commitment trial Tue, 04 Nov 2014 07:04:19 GMT smerkli [10106] * code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified) Fixed the list problem, it was a circular include. Mon, 03 Nov 2014 15:33:54 GMT erbj [10105] * code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.h (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) Added TDCoordinate and more updates Wed, 29 Oct 2014 15:11:05 GMT richtero [10104] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (added) final commit 29-10-14 Wed, 29 Oct 2014 15:01:03 GMT sujataj [10103] * code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified) level changed, nothing works Wed, 29 Oct 2014 15:00:09 GMT flsueess [10102] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt (added) oxt file für spacestation erstellt, bestehende level files angepasst Wed, 29 Oct 2014 14:31:05 GMT richtero [10101] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) * code/branches/minigame4DHS14/src/modules/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified) first working compile Wed, 29 Oct 2014 12:21:53 GMT richtero [10100] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) CMakeList added Wed, 22 Oct 2014 14:15:31 GMT sriedel [10099] * code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (added) Versuech 2 Wed, 22 Oct 2014 14:13:29 GMT flsueess [10098] * code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (added) * code/branches/weaponupdateHS14/data/levels/includes/weaponSettingsFPS_HS14.oxi (added) * code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw (modified) * code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (added) * code/branches/weaponupdateHS14/src/modules/weapons/RocketController.cc (modified) * code/branches/weaponupdateHS14/src/modules/weapons/RocketController.h (modified) new files Wed, 22 Oct 2014 14:11:42 GMT richtero [10097] * code/branches/minigame4DHS14/src/modules/mini4Dgame (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (added) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (added) added mini4Dgame folder Wed, 22 Oct 2014 14:05:50 GMT richtero [10096] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) final commit 22-10-14 Wed, 15 Oct 2014 14:12:16 GMT sriedel [10095] * code/branches/surfaceraceHS14/src/modules/invader/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/invader/DodgePlayer.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/DodgePlayer.h (added) * code/branches/surfaceraceHS14/src/modules/invader/DodgeRace.cc (added) * code/branches/surfaceraceHS14/src/modules/invader/DodgeRace.h (added) * code/branches/surfaceraceHS14/src/modules/invader/Invader.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/Invader.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderPrereqs.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.h (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.cc (deleted) * code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.h (deleted) Wed, 15 Oct 2014 14:10:50 GMT sujataj [10094] * code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (added) added a new level file Wed, 15 Oct 2014 14:03:29 GMT sriedel [10093] * code/branches/surfaceraceHS14/data/levels/DodgeRace (added) * code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (added) First upload 15.10.14 started DodgeRace Wed, 15 Oct 2014 14:01:32 GMT sriedel [10092] * code/branches/surfaceraceHS14/src/modules/CMakeLists.txt (modified) First upload 15.10.14 started DodgeRace Wed, 15 Oct 2014 13:40:32 GMT erbj [10091] * code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/Tower.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.cc (added) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.h (added) Testing: first commit Wed, 15 Oct 2014 12:13:41 GMT richtero [10090] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified) initial 15.10. Wed, 15 Oct 2014 12:09:49 GMT kecks [10089] * code/branches/keckslevelHS14/data/levels/kecks.oxw (added) Initial version of the level Wed, 08 Oct 2014 13:37:21 GMT richtero [10088] * code/branches/minigame4DHS14/data/levels/4Dtest.oxw (added) new test level Wed, 08 Oct 2014 13:27:21 GMT maxima [10087] * code/branches/leveljoemeHS14 (copied) Wed, 08 Oct 2014 12:57:59 GMT maxima [10086] * code/branches/towerdefenseHS14 (copied) Wed, 08 Oct 2014 12:41:40 GMT maxima [10085] * code/branches/storymodeHS14 (copied) Wed, 08 Oct 2014 12:22:32 GMT smerkli [10084] * code/branches/weaponupdateHS14 (copied) Adding a branch for the weaponsystem update Wed, 08 Oct 2014 12:06:41 GMT smerkli [10083] * code/branches/hudHS14 (copied) Creating a new branch for the HUD improvements in HS14. Wed, 08 Oct 2014 12:01:55 GMT smerkli [10082] * code/branches/keckslevelHS14 (copied) Added a branch for a new level creation. Not necessarily a level ... Wed, 08 Oct 2014 11:56:42 GMT smerkli [10081] * code/branches/minigame4DHS14 (copied) Created branch for new minigame Wed, 08 Oct 2014 11:52:35 GMT smerkli [10080] * code/branches/surfaceraceHS14 (copied) Created branch for new surfacerace Tue, 27 May 2014 08:35:27 GMT smerkli [10078] * code/branches/presentationFS14/data/levels/jump.oxw (added) * code/branches/presentationFS14/data/overlays/jumpHUD.oxo (added) * code/branches/presentationFS14/src/modules/CMakeLists.txt (modified) * code/branches/presentationFS14/src/modules/invader/InvaderWeapon.cc (modified) * code/branches/presentationFS14/src/modules/jump (added) * code/branches/presentationFS14/src/modules/jump/CMakeLists.txt (added) * code/branches/presentationFS14/src/modules/jump/Jump.cc (added) * code/branches/presentationFS14/src/modules/jump/Jump.h (added) * code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpBoots.h (added) * code/branches/presentationFS14/src/modules/jump/JumpCenterpoint.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpCenterpoint.h (added) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.h (added) * code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpFigure.h (added) * code/branches/presentationFS14/src/modules/jump/JumpItem.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpItem.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPrereqs.h (added) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.h (added) * code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpRocket.h (added) * code/branches/presentationFS14/src/modules/jump/JumpScore.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpScore.h (added) * code/branches/presentationFS14/src/modules/jump/JumpShield.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpShield.h (added) * code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpSpring.h (added) Merged Jump minigame, tested, works. Tue, 27 May 2014 07:54:25 GMT smerkli [10077] * code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (added) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc (modified) Removed some verbose output from default output and re-added a file ... Thu, 22 May 2014 13:59:14 GMT smerkli [10076] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/gui/scripts/testscript.lua (copied) * code/branches/presentationFS14/data/levels/levelTry.oxw (copied) * code/branches/presentationFS14/data/levels/michaelstestfile.lua (copied) * code/branches/presentationFS14/data/levels/scriptController.oxw (copied) * code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (copied) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (copied) * code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc (copied) * code/branches/presentationFS14/src/orxonox/controllers/ScriptController.h (copied) * code/branches/presentationFS14/src/orxonox/controllers/testscript.lua (copied) Merged scriptcontroller branch Thu, 22 May 2014 13:39:37 GMT mkronig [10075] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) commit for merging files Thu, 22 May 2014 13:05:46 GMT fvultier [10074] * code/branches/pickupsFS14/data/levels/jump.oxw (modified) * code/branches/pickupsFS14/data/overlays/jumpHUD.oxo (modified) * code/branches/pickupsFS14/src/modules/invader/InvaderWeapon.cc (modified) * code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpBoots.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpBoots.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpEnemy.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpEnemy.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpItem.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpItem.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpProjectile.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpProjectile.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPropeller.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPropeller.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpRocket.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpRocket.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpScore.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpScore.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShield.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpShield.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpSpring.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpSpring.h (added) new items added. improved level generator. Thu, 22 May 2014 12:49:16 GMT smerkli [10073] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/levels/ModularShipsTest0.oxw (copied) * code/branches/presentationFS14/data/levels/ModularShipsTest1.oxw (copied) * code/branches/presentationFS14/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationFS14/data/levels/templates/ModularSpaceShipTest.oxt (copied) * code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationFS14/src/orxonox/Scene.cc (modified) * code/branches/presentationFS14/src/orxonox/Scene.h (modified) * code/branches/presentationFS14/src/orxonox/ShipPartManager.cc (copied) * code/branches/presentationFS14/src/orxonox/ShipPartManager.h (copied) * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentationFS14/src/orxonox/items/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (copied) * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.h (copied) * code/branches/presentationFS14/src/orxonox/items/ShipPart.cc (copied) * code/branches/presentationFS14/src/orxonox/items/ShipPart.h (copied) * code/branches/presentationFS14/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged modularships branch Thu, 22 May 2014 12:35:02 GMT smerkli [10072] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (deleted) * code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (copied) * code/branches/presentationFS14/data/levels/turretTest.oxw (modified) * code/branches/presentationFS14/src/modules/objects/CMakeLists.txt (modified) * code/branches/presentationFS14/src/modules/objects/Turret.cc (modified) * code/branches/presentationFS14/src/modules/objects/Turret.h (modified) * code/branches/presentationFS14/src/modules/objects/controllers (copied) * code/branches/presentationFS14/src/modules/objects/controllers/CMakeLists.txt (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (copied) * code/branches/presentationFS14/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) Merged turretFS14 branch Thu, 22 May 2014 12:18:47 GMT noep [10071] * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Removed all segfaults (or at least those we found...) Thu, 22 May 2014 11:41:32 GMT muemart [10070] * code/branches/turretFS14/data/levels/includes/weaponSettingsTurret.oxi (modified) Add damage to the turret Thu, 22 May 2014 11:36:06 GMT smerkli [10069] * code/branches/presentationFS14 (copied) Created a presentation branch Thu, 22 May 2014 11:12:35 GMT smerkli [10068] * code/branches/modularships/src/orxonox/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/ShipPartManager.cc (added) * code/branches/modularships/src/orxonox/ShipPartManager.h (added) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) Introduced a shippartmanager to hopefully fix the segfaults Wed, 21 May 2014 20:38:09 GMT noep [10067] * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) Added explosions. (Because who doesn't love explosions.) Added ... Wed, 21 May 2014 13:28:28 GMT smerkli [10066] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) Some cleanups, added a "change look" command Wed, 21 May 2014 12:32:41 GMT smerkli [10065] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) Improved controller, "move and look" is now scriptable. Wed, 21 May 2014 09:45:35 GMT smerkli [10064] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) Test commit to see if committing still works Tue, 20 May 2014 08:21:20 GMT muemart [10063] * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) Comment out all the raytest stuff. Needs more work and/or knowledge Tue, 20 May 2014 07:03:19 GMT muemart [10062] * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) Commit the right file this time Tue, 20 May 2014 07:02:05 GMT muemart [10061] * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) Lower means better means lower means better... Thu, 15 May 2014 15:10:55 GMT muemart [10060] * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/turretFS14/src/orxonox/worldentities/WorldEntity.cc (modified) Fix team acquisition, edit test level and start to try to make a raytest Thu, 15 May 2014 15:09:35 GMT samuezu [10059] * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) works more or less, but big trouble accessing the ... Thu, 15 May 2014 13:53:11 GMT noep [10058] * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Expanded functionality of PartDestructionEvents, fixed cursor not ... Thu, 15 May 2014 12:18:08 GMT mkronig [10057] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) Thu, 15 May 2014 09:12:30 GMT smerkli [10056] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) Added a check whether the eventlist is empty, this fixes the segfault. Wed, 14 May 2014 18:25:08 GMT noep [10055] * code/branches/modularships/data/levels/ModularShipsTest1.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Cleaned up code. Added console command "ModularSpaceShip killshippart ... Tue, 13 May 2014 10:38:37 GMT noep [10054] * code/branches/modularships/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Fixed CollisionShapes of ShipParts reappearing at their spawnposition ... Tue, 13 May 2014 09:45:47 GMT noep [10053] * code/branches/modularships/data/levels/ModularShipsTest0.oxw (added) * code/branches/modularships/data/levels/ModularShipsTest1.oxw (added) * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/data/levels/templates/ModularSpaceShipTest.oxt (added) * code/branches/modularships/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/modularships/src/orxonox/Scene.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) Fixed yet another segfault (which we hadn't seen yet). Cleared ... Thu, 08 May 2014 14:20:26 GMT noep [10052] * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/modularships/src/orxonox/items/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (added) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (added) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) Added PartDestructionEvent, possibly fixed one out of two runtimeerrors Thu, 08 May 2014 14:16:59 GMT fvultier [10051] * code/branches/pickupsFS14/data/levels/Jump.oxw (deleted) * code/branches/pickupsFS14/data/levels/jump.oxw (added) * code/branches/pickupsFS14/data/overlays/jumpHUD.oxo (added) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.cc (deleted) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.h (deleted) * code/branches/pickupsFS14/src/modules/jump/JumpShip.cc (deleted) * code/branches/pickupsFS14/src/modules/jump/JumpShip.h (deleted) Removed a few more files I don't need anymore