# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 29, 2024, 6:18:54 PM Thu, 12 Mar 2015 13:32:47 GMT maxima [10309] * code/branches/ParticleEffectsFS15 (copied) new branch for PPS Thu, 12 Mar 2015 13:19:18 GMT maxima [10308] * code/branches/SciptableControllerFS15 (copied) new branch for PPS Thu, 12 Mar 2015 12:59:34 GMT maxima [10302] * code/branches/weaponFS15 (copied) new branch for meggiman Mon, 02 Mar 2015 22:19:32 GMT landauf [10299] * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) fixed crash in SimpleRocket (during level-unloading). improved debug ... Mon, 02 Mar 2015 22:18:45 GMT landauf [10298] * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) fixed potential crash during level-unloading: Namespace is a context ... Sun, 01 Mar 2015 21:11:26 GMT landauf [10297] * code/trunk/data/levels/underAttack.oxw (modified) improved underAttack.oxw - now with lots of turrets attached to the ... Sun, 01 Mar 2015 21:06:17 GMT landauf [10296] * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) don't add the pawn's velocity to the projectile's velocity. this ... Sun, 01 Mar 2015 20:59:53 GMT muemart [10295] * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) Avoid using the system path variables on windows (also gets rid of ... Sun, 01 Mar 2015 20:59:28 GMT landauf [10294] * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) made projectiles slower (and all have the same speed now). makes it ... Sun, 01 Mar 2015 19:59:15 GMT landauf [10293] * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) avoid collisions between projectiles of a turret and the parent-pawn ... Sun, 01 Mar 2015 14:27:01 GMT landauf [10292] * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed text size in HUD (marker which shows the enemy's name). the ... Sun, 01 Mar 2015 14:08:45 GMT landauf [10291] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) simplified Math: temp is always positive, thus only solution1 is ... Sun, 01 Mar 2015 13:17:08 GMT landauf [10290] * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) details Sun, 01 Mar 2015 13:16:34 GMT landauf [10289] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) fixed target position calculation: a) the math was wrong (not sure ... Sat, 28 Feb 2015 22:55:18 GMT landauf [10288] * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) added bullet settings for CCD (continuous collision detection) to ... Sat, 28 Feb 2015 22:50:41 GMT landauf [10287] * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) use dynamic physics for projectiles. this seems to avoid 'tunneling' ... Sat, 28 Feb 2015 17:14:55 GMT landauf [10286] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) trying to fix msvc linker warnings related to /INCREMENTAL:YES Sat, 28 Feb 2015 10:08:41 GMT landauf [10285] * code/branches/core7 (copied) created branch to work on new core features Thu, 26 Feb 2015 21:29:13 GMT landauf [10284] * code/trunk/src/modules/dodgerace/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/mini4dgame/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) removed some unnecessary module dependencies Thu, 26 Feb 2015 12:12:53 GMT maxima [10283] * code/branches/towerdefenseFS15 (copied) New Branch for PPS FS15. Thu, 26 Feb 2015 11:37:54 GMT maxima [10282] * code/branches/tutorial5/data/levels/tutorial.oxw (modified) * code/branches/tutorial5/doc/api/doxy.config.in (modified) * code/branches/tutorial5/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial5/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial5/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial5/src/orxonox/worldentities/AutonomousDrone.h (added) AutonomousDrone files for Tutorial Tue, 24 Feb 2015 21:54:24 GMT landauf [10281] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSLevelMemento.h (added) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) added command 'reloadLevel' (by default on F5) which reloads the ... Thu, 19 Feb 2015 11:39:06 GMT maxima [10280] * code/branches/tutorial5 (modified) * code/branches/tutorial5/src/libraries/core/GUIManager.cc (modified) * code/branches/tutorial5/src/libraries/core/Loader.cc (modified) * code/branches/tutorial5/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/branches/tutorial5/src/libraries/tools/BulletDebugDrawer.h (modified) Trunk(-r10279) merged to tutorial branch. Works now on ITET-Tardis. Wed, 18 Feb 2015 20:57:42 GMT landauf [10279] * code/trunk/src/libraries/core/GUIManager.cc (modified) fixed msvc warnings Wed, 18 Feb 2015 20:56:38 GMT landauf [10278] * code/trunk/src/libraries/core/Loader.cc (modified) fixed issue with inline-lua-code. only add an extra space if there's ... Wed, 18 Feb 2015 20:32:48 GMT landauf [10277] * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) potential fix of compile problem on tardis Wed, 18 Feb 2015 09:48:08 GMT maxima [10276] * code/branches/tutorial5 (copied) Copy of the trunk for the PPS Tutorial Mon, 16 Feb 2015 21:23:52 GMT landauf [10275] * code/branches/hudHS14 (deleted) * code/branches/keckslevelHS14 (deleted) * code/branches/leveljoemeHS14 (deleted) * code/branches/minigame4DHS14 (deleted) * code/branches/pickupsFS14 (deleted) * code/branches/presentationHS14 (deleted) * code/branches/presentationHS14merge (deleted) * code/branches/storymodeHS14 (deleted) * code/branches/surfaceraceHS14 (deleted) * code/branches/towerdefenseHS14 (deleted) * code/branches/weaponupdateHS14 (deleted) removed old branches Sun, 15 Feb 2015 22:11:59 GMT landauf [10274] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) fixed #419 http://www.orxonox.net/ticket/419 physics is only ... Sun, 15 Feb 2015 20:46:31 GMT landauf [10273] * code/trunk/src/libraries/core/Loader.cc (modified) bugfix & simplification & comment by bknecht Sun, 15 Feb 2015 20:37:54 GMT landauf [10272] * code/trunk/src/libraries/core/Loader.cc (modified) reverted a part of the changes from r10264. only single lua-tags ... Sat, 14 Feb 2015 23:19:13 GMT landauf [10271] * code/trunk/src/libraries/core/GUIManager.cc (modified) bugfix: resize CEGUI if render window changes size Sat, 14 Feb 2015 21:49:23 GMT landauf [10270] * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) fixed crash: cs can be null (e.g. when using the 'suicide' command) Sat, 14 Feb 2015 11:51:14 GMT muemart [10269] * code/trunk/src/libraries/core/Loader.cc (modified) Tweak the xml error message a bit Thu, 12 Feb 2015 22:28:26 GMT landauf [10268] * code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) program icon now works also with MinGW. but I had to exclude the PCH- ... Thu, 12 Feb 2015 17:05:25 GMT muemart [10267] * code/trunk/cmake/tools/SourceFileUtilities.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/contrib/orxonox.ico (added) * code/trunk/contrib/winresource.rc (added) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) Add program icon for Windows builds (MSVC only for now) Thu, 12 Feb 2015 13:51:41 GMT muemart [10266] * code/trunk/doc/api/doxy.config.in (modified) Add support for paths with spaces for doxygen and exclude some enet pages Wed, 11 Feb 2015 22:17:57 GMT landauf [10265] * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) fixed build with older compilers (pre c++11) Wed, 11 Feb 2015 09:56:26 GMT muemart [10264] * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) Various fixes and improvements in the Loader (and LuaState) - When ... Tue, 10 Feb 2015 22:10:39 GMT landauf [10263] * code/trunk/cmake/tools/FlagUtilities.cmake (modified) fixed details Fri, 06 Feb 2015 22:30:26 GMT landauf [10262] * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/testscript.lua (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/AnihilationThreat.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/ModularShipsTest0.oxw (modified) * code/trunk/data/levels/ModularShipsTest1.oxw (modified) * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/michaelstestfile.lua (modified) * code/trunk/data/levels/scriptController.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spacestation_elements.oxt (modified) * code/trunk/data/levels/templates/ss_tube01.oxt (modified) * code/trunk/data/levels/templates/standardTurret.oxt (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/IcoSphere.h (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified) * code/trunk/src/modules/jump/JumpPlatformFake.cc (modified) * code/trunk/src/modules/jump/JumpPlatformFake.h (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.h (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.h (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.h (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.h (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) * code/trunk/src/modules/jump/JumpSpring.cc (modified) * code/trunk/src/modules/jump/JumpSpring.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (modified) * code/trunk/src/orxonox/ShipPartManager.h (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/testscript.lua (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) eol-style native. no changes in code. Fri, 06 Feb 2015 22:11:10 GMT landauf [10261] * code/trunk/src/modules/jump/Jump.cc (modified) fixed warning Fri, 06 Feb 2015 22:03:00 GMT landauf [10260] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) merged the latest changes from pickupsFS14 to trunk Fri, 06 Feb 2015 21:55:17 GMT landauf [10259] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/src/modules/jump/Jump.cc (modified) recorded merge of pickupsFS14 up to r10112 (which was already mostly ... Thu, 05 Feb 2015 22:47:13 GMT landauf [10258] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/data/defaultConfig/orxonox.ini (copied) * code/trunk/data/gui/layouts/CampaignMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/4Dtest.oxw (copied) * code/trunk/data/levels/AnihilationThreat.oxw (copied) * code/trunk/data/levels/DodgeRace.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/trunk/data/levels/kecks.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (copied) * code/trunk/data/levels/templates/enemytowerdefense.oxt (copied) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/trunk/data/levels/templates/spacestation_elements.oxt (copied) * code/trunk/data/levels/templates/ss_tube01.oxt (copied) * code/trunk/data/levels/templates/tower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/towerdefenseHUD.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace (copied) * code/trunk/src/modules/mini4dgame (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (copied) * code/trunk/src/modules/towerdefense/TDCoordinate.h (copied) * code/trunk/src/modules/towerdefense/TDEnemy.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/trunk/src/modules/towerdefense/TowerTurret.cc (copied) * code/trunk/src/modules/towerdefense/TowerTurret.h (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) merged presentationHS14merge back to trunk Thu, 05 Feb 2015 22:43:24 GMT landauf [10257] * code/branches/presentationHS14merge/data/levels/kecks.oxw (modified) fixed tag Thu, 05 Feb 2015 22:21:35 GMT landauf [10256] * code/branches/presentationHS14merge/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (modified) found some hidden changes in a merge commit in presentationHS14 and ... Wed, 04 Feb 2015 21:21:28 GMT landauf [10255] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/cmake/LibraryConfig.cmake (modified) * code/branches/presentationHS14merge/data/defaultConfig/orxonox.ini (copied) * code/branches/presentationHS14merge/data/gui/layouts/CampaignMenu.layout (copied) * code/branches/presentationHS14merge/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/presentationHS14merge/data/gui/scripts/CampaignMenu.lua (copied) * code/branches/presentationHS14merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentationHS14merge/src/orxonox/LevelManager.cc (modified) * code/branches/presentationHS14merge/src/orxonox/LevelManager.h (modified) * code/branches/presentationHS14merge/src/orxonox/gametypes/Mission.cc (modified) merged storymodeHS14 Tue, 03 Feb 2015 22:43:42 GMT landauf [10254] * code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) cleanup Tue, 03 Feb 2015 22:38:07 GMT landauf [10253] * code/branches/storymodeHS14/data/defaultConfig/orxonox.ini (added) * code/branches/storymodeHS14/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/storymodeHS14/data/tcl (modified) * code/branches/storymodeHS14/src/orxonox/LevelManager.cc (modified) * code/branches/storymodeHS14/src/orxonox/LevelManager.h (modified) * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) improved campaign mode. use config value instead of writing a new ... Mon, 02 Feb 2015 12:04:55 GMT muemart [10252] * code/trunk/cmake/tools/TargetUtilities.cmake (modified) Fix MSVC debugging environment for newer versions Sun, 01 Feb 2015 22:46:42 GMT landauf [10251] * code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/storymodeHS14/data/tcl (modified) * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) use relative path Sun, 01 Feb 2015 21:51:47 GMT landauf [10250] * code/branches/storymodeHS14/cmake/LibraryConfig.cmake (modified) * code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/storymodeHS14/data/gui/scripts/campaign.txt (deleted) tabs -> spaces. removed temp-file Sun, 01 Feb 2015 21:37:36 GMT landauf [10249] * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) autoformatted code and removed commented block Sun, 01 Feb 2015 21:21:51 GMT landauf [10248] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/branches/presentationHS14merge/data/levels/templates/enemytowerdefense.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/tower.oxt (modified) * code/branches/presentationHS14merge/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS14merge/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.h (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.h (copied) merged towerdefenseHS14 (except some debug code) Sun, 01 Feb 2015 20:32:19 GMT landauf [10247] * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) fixed warnings (MinGW) Sun, 01 Feb 2015 20:30:37 GMT landauf [10246] * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (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/TowerDefenseEnemy.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) replaced tabs with spaces + some formatting sometimes. no changes in ... Sun, 01 Feb 2015 20:23:00 GMT landauf [10245] * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) fixed some warnings (MSVC) Sun, 01 Feb 2015 20:20:47 GMT landauf [10244] * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.h (modified) eol-style native Sun, 01 Feb 2015 20:18:22 GMT landauf [10243] * code/branches/towerdefenseHS14/src/modules/objects/controllers (copied) merged the updated controller files from trunk (including SVN history) Sun, 01 Feb 2015 19:58:38 GMT landauf [10242] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h (modified) merged hudHS14 Sun, 01 Feb 2015 19:57:37 GMT landauf [10241] * 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) cleanup Sun, 01 Feb 2015 19:52:31 GMT landauf [10240] * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified) replaced tabs with spaces. no changes in code. Sun, 01 Feb 2015 19:50:08 GMT landauf [10239] * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed some warnings (MSVC) Sun, 01 Feb 2015 17:42:19 GMT landauf [10238] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw (copied) * code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/branches/presentationHS14merge/data/levels/presentationHS13.oxw (modified) * code/branches/presentationHS14merge/data/levels/templates/FPS.oxt (modified) * code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt (copied) * code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc (modified) merged weaponupdateHS14 (except some unnecessary changes) Sun, 01 Feb 2015 14:57:57 GMT landauf [10237] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/DodgeRace.oxw (copied) * code/branches/presentationHS14merge/data/levels/templates/DodgeRacePattern.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/branches/presentationHS14merge/data/overlays/DodgeRaceHUD.oxo (copied) * code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS14merge/src/modules/dodgerace (copied) merged surfaceraceHS14 (but without all the strange stuff that ... Sun, 01 Feb 2015 14:56:21 GMT landauf [10236] * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCube.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.h (modified) replaced tabs with spaces. no changes in code. Sun, 01 Feb 2015 14:43:14 GMT landauf [10235] * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified) fixed build and warnings (MSVC) Sun, 01 Feb 2015 14:22:58 GMT landauf [10234] * code/branches/surfaceraceHS14/src/modules/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCube.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.h (modified) changed paths Sun, 01 Feb 2015 14:20:57 GMT landauf [10233] * code/branches/surfaceraceHS14/src/modules/dodgerace (moved) renamed module dodgerace2 -> dodgerace Sun, 01 Feb 2015 14:19:54 GMT landauf [10232] * 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/DodgeRaceCube.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.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) eol-style native Sun, 01 Feb 2015 14:07:00 GMT landauf [10231] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/4Dtest.oxw (copied) * code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS14merge/src/modules/mini4dgame (copied) merged minigame4DHS14 Sun, 01 Feb 2015 13:55:44 GMT landauf [10230] * 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 (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified) replaced tabs with spaces. no changes in code. Sun, 01 Feb 2015 13:50:46 GMT landauf [10229] * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified) fixed warnings & details Sun, 01 Feb 2015 13:27:56 GMT landauf [10228] * code/branches/minigame4DHS14/src/modules/mini4dgame (modified) removed accidentally added merge-info (where did that come from?) Sun, 01 Feb 2015 13:25:02 GMT landauf [10227] * code/branches/minigame4DHS14/src/modules/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt (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.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified) changed paths & fixed macro in Mini4DgamePrereqs.h Sun, 01 Feb 2015 13:23:41 GMT landauf [10226] * code/branches/minigame4DHS14/src/modules/mini4dgame (moved) use only lowercase characters in module names Sun, 01 Feb 2015 13:20:04 GMT landauf [10225] * 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 (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified) eol-style native Sun, 01 Feb 2015 13:03:23 GMT landauf [10224] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/AnihilationThreat.oxw (copied) * code/branches/presentationHS14merge/src/modules/notifications/NotificationQueueCEGUI.cc (modified) merged leveljoemeHS14 Sun, 01 Feb 2015 13:02:26 GMT landauf [10223] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/kecks.oxw (copied) merged keckslevelHS14 Sun, 01 Feb 2015 12:51:57 GMT landauf [10222] * code/branches/presentationHS14merge (copied) created new branch to merge the changes from HS14 Sun, 01 Feb 2015 12:39:16 GMT landauf [10221] * code/branches/presentationHS14/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS14/src/modules/dodgerace (moved) * code/branches/presentationHS14/src/modules/dodgerace/CMakeLists.txt (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.cc (copied) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCube.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceShip.h (modified) renamed module: dodgerace2 -> dodgerace (this also fixes build on ... Sun, 01 Feb 2015 12:37:29 GMT landauf [10220] * code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified) * code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h (modified) fixed build of objects and mini4Dgame modules (MSVC) Sat, 31 Jan 2015 22:54:35 GMT landauf [10219] * code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) fixed build (DodgeRace) and warnings (TowerDefenseTower) for MinGW on ... Sat, 31 Jan 2015 22:29:45 GMT landauf [10218] * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) fixed build and warnings with MSVC Sat, 31 Jan 2015 17:05:40 GMT landauf [10217] * code/branches/ScriptableController (deleted) * code/branches/modularships (deleted) * code/branches/presentationFS14 (deleted) * code/branches/turretFS14 (deleted) removed old & merged branches from FS14 Sat, 31 Jan 2015 17:03:17 GMT landauf [10216] * code/trunk (modified) * code/trunk/data/gui/scripts/testscript.lua (copied) * code/trunk/data/levels/ModularShipsTest0.oxw (copied) * code/trunk/data/levels/ModularShipsTest1.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/trunk/data/levels/jump.oxw (copied) * code/trunk/data/levels/levelTry.oxw (copied) * code/trunk/data/levels/michaelstestfile.lua (copied) * code/trunk/data/levels/scriptController.oxw (copied) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (copied) * code/trunk/data/levels/templates/standardTurret.oxt (copied) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/jump (copied) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/ShipPartManager.cc (copied) * code/trunk/src/orxonox/ShipPartManager.h (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (copied) * code/trunk/src/orxonox/controllers/ControllerDirector.h (copied) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (copied) * code/trunk/src/orxonox/controllers/ScriptController.h (copied) * code/trunk/src/orxonox/controllers/testscript.lua (copied) * code/trunk/src/orxonox/items/CMakeLists.txt (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (copied) * code/trunk/src/orxonox/items/PartDestructionEvent.h (copied) * code/trunk/src/orxonox/items/ShipPart.cc (copied) * code/trunk/src/orxonox/items/ShipPart.h (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) merged branch presentationFS14 back to trunk Sat, 31 Jan 2015 16:31:23 GMT landauf [10215] * code/branches/presentationFS14/src/modules/jump/Jump.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpFigure.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpItem.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpScore.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpShield.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (modified) replaced tabs with spaces. no changes in code. Sat, 31 Jan 2015 15:54:16 GMT landauf [10214] * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) fixed segfault. after removing the engine from the ship, we need to ... Sat, 31 Jan 2015 15:21:49 GMT landauf [10213] * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) removed attach() from ModularSpaceShip because it shadows the non- ... Sat, 31 Jan 2015 15:14:57 GMT landauf [10212] * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) removed detach() from ModularSpaceShip which was just copy-pasted ... Sat, 31 Jan 2015 14:51:08 GMT landauf [10211] * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) made SpaceShip::engineList_ private again. moved function from ... Sat, 31 Jan 2015 14:35:49 GMT landauf [10210] * code/trunk/cmake/PackageConfigMSVC.cmake (modified) not sure how the MSVC dependency package v7 works, but v6 still needs ... Thu, 29 Jan 2015 16:44:37 GMT muemart [10209] * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/tools/FindVLD.cmake (modified) * code/trunk/src/SourceConfig.cmake (modified) More MSVC fixes - Update dependecy package version requirements - ... Thu, 29 Jan 2015 09:29:56 GMT muemart [10208] * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) Some small fixes for the MSVC build - Don't hardcode library names. ... Tue, 27 Jan 2015 22:35:50 GMT bknecht [10207] * code/trunk/src/libraries/tools/IcoSphere.cc (modified) Replacing MSVC code for long integer with cross plattform compatible one Tue, 27 Jan 2015 22:23:47 GMT landauf [10206] * code/trunk/src/libraries/tools/IcoSphere.h (modified) fixed build Sun, 25 Jan 2015 23:22:57 GMT landauf [10205] * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.cc (modified) the previous commit was not correct. re-added the call to ... Sun, 25 Jan 2015 22:32:17 GMT landauf [10204] * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) i think this can be removed as well. the user pointer was probably ... Sun, 25 Jan 2015 22:15:24 GMT landauf [10203] * code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/presentationFS14/src/orxonox/Scene.h (modified) * 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/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/Pawn.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified) removed unused code and debug output