# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 22, 2024, 4:07:23 PM Thu, 26 May 2016 13:28:46 GMT fvultier [11202] * code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified) fixed some weird merge conflict Thu, 26 May 2016 13:19:53 GMT tgidron [11201] * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) Final Project Thu, 26 May 2016 13:13:51 GMT fvultier [11199] * code/branches/presentationFS16/data/levels/Hover.oxw (modified) * code/branches/presentationFS16/data/levels/emptyLevel.oxw (modified) * code/branches/presentationFS16/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/presentationFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/presentationFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/presentationFS16/src/modules/hover/CMakeLists.txt (modified) * code/branches/presentationFS16/src/modules/hover/Hover.cc (modified) * code/branches/presentationFS16/src/modules/hover/Hover.h (modified) * code/branches/presentationFS16/src/modules/hover/HoverFlag.cc (modified) * code/branches/presentationFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified) * code/branches/presentationFS16/src/modules/hover/HoverShip.cc (modified) * code/branches/presentationFS16/src/modules/hover/HoverShip.h (modified) * code/branches/presentationFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (copied) * code/branches/presentationFS16/src/modules/hover/TFlagsLivesLevelHUD.h (copied) * code/branches/presentationFS16/src/modules/invader/Invader.cc (modified) * code/branches/presentationFS16/src/modules/pickup/PickupSpawner.h (modified) * code/branches/presentationFS16/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentationFS16/src/modules/weapons/weaponmodes/HsW01.h (modified) merged branch hover Thu, 26 May 2016 13:12:04 GMT tgidron [11198] * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) Final Project Thu, 26 May 2016 12:49:44 GMT tgidron [11196] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) * code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (modified) * code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h (modified) Final Project Thu, 26 May 2016 12:40:16 GMT binderm [11194] * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.h (modified) * code/branches/bindermFS16/src/orxonox/LevelStatus.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelStatus.h (modified) final commit Thu, 26 May 2016 12:15:53 GMT fvultier [11193] * code/branches/presentationFS16 (copied) New branch for presentation of the PPS projects FS16. Will merge all ... Thu, 19 May 2016 15:50:36 GMT tgidron [11192] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) * code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (modified) * code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h (modified) * code/branches/tgidronFS16/src/modules/invader/Invader.cc (modified) * code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.h (modified) New Floor, Level HUD, Pickups work Thu, 19 May 2016 15:37:05 GMT binderm [11191] * code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.h (modified) * code/branches/bindermFS16/src/orxonox/LevelStatus.h (modified) * code/branches/bindermFS16/src/orxonox/gametypes/Mission.h (modified) The Campaign menu now works. The levels are structured in a tree. If ... Thu, 19 May 2016 15:34:38 GMT plehmann [11190] * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.h (modified) modified newScriptController to prevent memory leacks caused by tasks Thu, 19 May 2016 15:04:41 GMT sagerj [11189] * code/branches/sagerjFS16/data/levels/emptyLevel.oxw (modified) * code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (added) * code/branches/sagerjFS16/data/levels/templates/spaceshipEscortDischarger.oxt (added) * code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (modified) * code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) done/fixed everything, weaponmode/discharger fully commented only ... Thu, 19 May 2016 11:34:34 GMT binderm [11188] * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelStatus.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelStatus.h (modified) Thu, 12 May 2016 14:08:32 GMT plehmann [11187] * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h (added) added a MoveToTask TODO: implement the update function Thu, 12 May 2016 14:07:25 GMT binderm [11186] * code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.h (modified) * code/branches/bindermFS16/src/orxonox/LevelStatus.cc (added) * code/branches/bindermFS16/src/orxonox/LevelStatus.h (added) * code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc (modified) LevelStatus and levelmanager in two files, LevelStatus saves and ... Thu, 12 May 2016 14:03:47 GMT sagerj [11185] * code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/sagerjFS16/data/levels/missionOne.oxw (modified) * code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/sagerjFS16/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (added) * code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h (added) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) fix the charging during reloadtime, the hudchargebar working so far... Thu, 12 May 2016 14:02:21 GMT tgidron [11184] * code/branches/tgidronFS16 (modified) * code/branches/tgidronFS16/cmake/CompilerConfigClang.cmake (modified) * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/levels/emptyLevel.oxw (modified) * code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/tgidronFS16/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/orxonox/Scene.h (modified) * code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/tgidronFS16/test/util/StringUtilsTest.cc (modified) New Pickup + try to create ground from separate tiles Thu, 12 May 2016 13:28:30 GMT plehmann [11183] * code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified) * code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (deleted) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (deleted) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (deleted) * code/branches/plehmannFS16/src/orxonox/controllers/Task.h (deleted) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/CMakeLists.txt (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/DebugTask.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/DebugTask.h (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.h (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/stringOutTask.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/stringOutTask.h (added) * code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.cc (deleted) * code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.h (deleted) moved the task classes to the scriptTasks folder. modified the ... Thu, 12 May 2016 11:45:44 GMT tgidron [11182] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) New Pickup Tue, 10 May 2016 10:29:37 GMT binderm [11181] * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) some minor changes Tue, 10 May 2016 10:09:09 GMT binderm [11180] * code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.h (modified) * code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc (modified) logic to show only certain levels and not all together, also not all ... Thu, 28 Apr 2016 14:09:08 GMT plehmann [11179] * code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.h (added) added the stringOutTask for scriptcontroller Thu, 28 Apr 2016 14:08:07 GMT plehmann [11178] * code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified) * code/branches/plehmannFS16/data/levels/scriptController.oxw (modified) * code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/Task.h (modified) scriptcontroller task system doesnt work. it seems like queue is the ... Thu, 28 Apr 2016 14:04:42 GMT tgidron [11177] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt (modified) * code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.cc (deleted) * code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.h (deleted) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) * code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (added) * code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h (added) New Pickups (speed); Level Counter and Crate spawn (not working) Thu, 28 Apr 2016 13:45:32 GMT fvultier [11176] * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Added a debug console command that allows visualization of the ... Thu, 28 Apr 2016 13:09:26 GMT sagerj [11175] * code/branches/sagerjFS16/data/defaultConfig/keybindings.ini (modified) * code/branches/sagerjFS16/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/branches/sagerjFS16/src/modules/invader/InvaderShip.cc (modified) * code/branches/sagerjFS16/src/modules/jump/JumpFigure.cc (modified) * code/branches/sagerjFS16/src/modules/jump/JumpFigure.h (modified) * code/branches/sagerjFS16/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.h (modified) * code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.h (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/AIController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/DroneController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/FightingController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Spectator.h (modified) overwritten many fire functions now only need to implement timer/charges Thu, 21 Apr 2016 14:47:39 GMT sagerj [11174] * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h (modified) everything beneath weaponmode changed to push/release - wm modified ... Thu, 21 Apr 2016 14:05:15 GMT binderm [11173] * code/branches/bindermFS16/data/defaultConfig/orxonox.ini (modified) * code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified) * code/branches/bindermFS16/src/orxonox/LevelManager.h (modified) * code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (modified) Campaignmenu improved, it's now possible to only show single levels ... Thu, 21 Apr 2016 14:02:06 GMT plehmann [11172] * code/branches/plehmannFS16/src/orxonox/CMakeLists.txt (modified) * code/branches/plehmannFS16/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/Task.h (modified) updated some files so NewScriptController lua binds are created. ... Thu, 21 Apr 2016 13:37:28 GMT tgidron [11171] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt (modified) * code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.cc (added) * code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.h (added) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverShip.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverShip.h (modified) * code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.cc (deleted) * code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.h (deleted) Pickups work; Lives Counter and Total Flag Counter Thu, 21 Apr 2016 13:33:48 GMT sagerj [11170] * code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified) running backup Sun, 17 Apr 2016 18:40:05 GMT fvultier [11169] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) Fixed errors with pickups. Thu, 14 Apr 2016 14:05:48 GMT tgidron [11168] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified) * code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified) * code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.cc (added) * code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.h (added) * code/branches/tgidronFS16/src/modules/pickup/PickupSpawner.h (modified) Pickups + Flags HUD Thu, 14 Apr 2016 14:03:16 GMT plehmann [11167] * code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified) * code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.h (modified) * code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/Task.h (modified) changed the NewScriptController and Task classes Thu, 14 Apr 2016 14:02:00 GMT sagerj [11166] * code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/sagerjFS16/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h (modified) today I got pawn'ed Thu, 14 Apr 2016 11:24:08 GMT plehmann [11165] * code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (added) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (added) * code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (added) * code/branches/plehmannFS16/src/orxonox/controllers/Task.h (added) added new files for newScriptController --This lines, and those ... Thu, 14 Apr 2016 11:11:00 GMT sagerj [11164] * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h (modified) added orxout() for every release lvl for debug purpose Thu, 14 Apr 2016 11:00:08 GMT tgidron [11163] * code/branches/tgidronFS16/data/levels/Hover.oxw (modified) * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/FlagHUD.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) Pickup Development Fri, 01 Apr 2016 17:38:22 GMT fvultier [11162] * code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (modified) Managed to call a C++ test function from a Lua script that gets ... Sun, 27 Mar 2016 19:37:44 GMT landauf [11161] * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) removed another spurious backslash Sun, 27 Mar 2016 19:35:18 GMT landauf [11160] * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) removed unnecessary backslashes Sat, 26 Mar 2016 14:02:11 GMT landauf [11157] * code/trunk/test/util/StringUtilsTest.cc (modified) don't test exact values here, only <> 0 Sat, 26 Mar 2016 13:49:36 GMT landauf [11156] * code/trunk/cmake/CompilerConfigClang.cmake (modified) clang doesn't know this compiler flag Thu, 24 Mar 2016 14:56:35 GMT sagerj [11153] * code/branches/sagerjFS16/data/defaultConfig/keybindings.ini (modified) * code/branches/sagerjFS16/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified) added release functions in various classes: weaponmode, weaponsystem, ... Thu, 24 Mar 2016 14:54:06 GMT plehmann [11152] * code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified) * code/branches/plehmannFS16/data/levels/scriptController.oxw (modified) * code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.h (modified) took the event functions out of the tick function Thu, 24 Mar 2016 14:53:28 GMT tgidron [11151] * code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified) * code/branches/tgidronFS16/src/modules/hover/FlagHUD.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) * code/branches/tgidronFS16/src/modules/hover/Hover.h (modified) * code/branches/tgidronFS16/src/modules/hover/HoverShip.cc (modified) New Level Up Thu, 24 Mar 2016 14:52:07 GMT binderm [11150] * code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (modified) * code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc (modified) tried consoleCommand, doesn't work yet. Please have a look;) Thu, 24 Mar 2016 13:12:41 GMT binderm [11149] * code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/bindermFS16/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (added) * code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (added) new files for campaign menu Thu, 17 Mar 2016 14:53:19 GMT sagerj [11142] * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (added) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (added) * code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified) first commit, added discharger weaponclass Thu, 17 Mar 2016 14:40:22 GMT plehmann [11141] * code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.cc (modified) added a comment Thu, 17 Mar 2016 13:05:06 GMT fvultier [11140] * code/branches/tgidronFS16 (copied) New branch for PPS FS16 Thu, 17 Mar 2016 12:59:01 GMT fvultier [11139] * code/branches/bindermFS16 (copied) New branch for PPS FS16 Thu, 17 Mar 2016 12:57:56 GMT fvultier [11138] * code/branches/sagerjFS16 (copied) Thu, 17 Mar 2016 12:33:29 GMT plehmann [11137] * code/branches/plehmannFS16 (copied) new branch for pps Wed, 09 Mar 2016 16:26:32 GMT fvultier [11136] * code/branches/tutorial6/src/orxonox/controllers/AutonomousDroneController.cc (modified) Made tutorial compatible with the new core. Mon, 07 Mar 2016 15:13:18 GMT fvultier [11135] * code/branches/tutorial6/src/orxonox/worldentities/AutonomousDrone.cc (modified) Mon, 07 Mar 2016 14:42:44 GMT fvultier [11134] * code/branches/tutorial6/data/levels/tutorial.oxw (modified) * code/branches/tutorial6/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial6/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial6/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial6/src/orxonox/worldentities/AutonomousDrone.h (added) Files needed for the tutorial added. Mon, 07 Mar 2016 14:26:29 GMT fvultier [11133] * code/branches/tutorial6 (copied) branch for new tutorial Sun, 06 Mar 2016 20:18:13 GMT landauf [11132] * code/branches/ogre1.9/src/libraries/core/CMakeLists.txt (modified) * code/branches/ogre1.9/src/libraries/core/GraphicsManager.cc (modified) * code/branches/ogre1.9/src/libraries/core/GraphicsManager.h (modified) * code/branches/ogre1.9/src/orxonox/Scene.cc (modified) * code/branches/ogre1.9/src/orxonox/Scene.h (modified) fixed overlays with ogre 1.9. OverlaySystem must be initialized once ... Sun, 06 Mar 2016 15:43:02 GMT landauf [11131] * code/branches/ogre1.9/src/libraries/util/OgreForwardRefs.h (modified) * code/branches/ogre1.9/src/orxonox/Scene.cc (modified) * code/branches/ogre1.9/src/orxonox/Scene.h (modified) initialize overlay component Sun, 06 Mar 2016 15:13:15 GMT landauf [11130] * code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/ogre1.9/src/modules/hover/FlagHUD.cc (modified) forgot to commit 2 files in my previous commit: orxonox now compiles ... Sun, 06 Mar 2016 14:32:26 GMT landauf [11129] * code/branches/ogre1.9/src/libraries/util/DisplayStringConversions.h (modified) * code/branches/ogre1.9/src/libraries/util/OgreForwardRefs.h (modified) * code/branches/ogre1.9/src/modules/objects/Planet.cc (modified) * code/branches/ogre1.9/src/modules/objects/Planet.h (modified) * code/branches/ogre1.9/src/modules/overlays/FadeoutText.cc (modified) * code/branches/ogre1.9/src/modules/overlays/OverlayText.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/ogre1.9/src/modules/overlays/stats/Stats.cc (modified) * code/branches/ogre1.9/src/orxonox/RenderQueueListener.cc (modified) * code/branches/ogre1.9/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/ogre1.9/src/orxonox/graphics/Camera.cc (modified) * code/branches/ogre1.9/src/orxonox/graphics/Model.cc (modified) * code/branches/ogre1.9/src/orxonox/graphics/Model.h (modified) * code/branches/ogre1.9/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/ogre1.9/src/orxonox/worldentities/WorldEntity.cc (modified) orxonox now compiles with ogre 1.9 (but still needs some other changes) Sun, 06 Mar 2016 12:56:26 GMT landauf [11128] * code/branches/ogre1.9/data/levels/Spacerace2.oxw (modified) * code/branches/ogre1.9/data/levels/asteroidField.oxw (modified) * code/branches/ogre1.9/data/levels/dockingToASpaceStation.oxw (modified) * code/branches/ogre1.9/data/levels/dynamicMatch.oxw (modified) * code/branches/ogre1.9/data/levels/earth.oxw (modified) * code/branches/ogre1.9/data/levels/expeditionSector.oxw (modified) * code/branches/ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/branches/ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/branches/ogre1.9/data/levels/kecks.oxw (modified) * code/branches/ogre1.9/data/levels/levelTry.oxw (modified) * code/branches/ogre1.9/data/levels/missionOne.oxw (modified) * code/branches/ogre1.9/data/levels/planets.oxw (modified) * code/branches/ogre1.9/data/levels/presentation09.oxw (modified) * code/branches/ogre1.9/data/levels/presentationFS11.oxw (modified) * code/branches/ogre1.9/data/levels/presentationHS09.oxw (modified) * code/branches/ogre1.9/data/levels/presentationHS12.oxw (modified) * code/branches/ogre1.9/data/levels/shadertest.oxw (modified) * code/branches/ogre1.9/data/levels/shuttleAttack.oxw (modified) * code/branches/ogre1.9/data/levels/shuttleRetaliation.oxw (modified) * code/branches/ogre1.9/data/levels/spaceRace.oxw (modified) * code/branches/ogre1.9/data/levels/testSwallow.oxw (modified) * code/branches/ogre1.9/src/modules/objects/Planet.cc (modified) * code/branches/ogre1.9/src/modules/objects/Planet.h (modified) * code/branches/ogre1.9/src/orxonox/graphics/Model.h (modified) let Planet inherit from Model to avoid code duplication (especially ... Sun, 21 Feb 2016 22:15:03 GMT landauf [11127] * code/branches/ogre1.9/cmake/tools/FindOGRE.cmake (modified) * code/branches/ogre1.9/src/orxonox/CMakeLists.txt (modified) in ogre 1.9, overlays were moved into a separate component (i.e. a ... Sun, 21 Feb 2016 21:21:46 GMT landauf [11126] * code/branches/ogre1.9/src/orxonox/graphics/AnimatedModel.cc (modified) * code/branches/ogre1.9/src/orxonox/graphics/Model.h (modified) small refactoring: make variables in Model private Sun, 21 Feb 2016 21:09:24 GMT landauf [11125] * code/branches/ogre1.9 (copied) new branch to add support for ogre 1.9 to orxonox Sat, 20 Feb 2016 17:28:28 GMT landauf [11124] * code/branches/cegui0.8/data/gui/scripts/AudioMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/DockingDialog.lua (modified) * code/branches/cegui0.8/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/HostMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/PickupInventory.lua (modified) * code/branches/cegui0.8/data/gui/scripts/QuestGUI.lua (modified) * code/branches/cegui0.8/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/UndockingDialog.lua (modified) fixed some more errors: use 0.8-notation for images Thu, 18 Feb 2016 21:58:18 GMT landauf [11121] * code/branches/cegui0.8/data/gui/configs/CEGUIConfig.xsd (modified) * code/branches/cegui0.8/data/gui/layouts/GUILayout.xsd (modified) * code/branches/cegui0.8/data/gui/schemes/GUIScheme.xsd (modified) updated xsd files Tue, 16 Feb 2016 21:10:43 GMT bknecht [11118] * code/branches/cegui0.8/cmake/tools/FindCEGUI.cmake (modified) * code/branches/cegui0.8/data/gui/layouts/AudioMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/ChatBox-inputonly.layout (modified) * code/branches/cegui0.8/data/gui/layouts/ChatBox.layout (modified) * code/branches/cegui0.8/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/cegui0.8/data/gui/layouts/DockingDialog.layout (modified) * code/branches/cegui0.8/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/HostMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/InGameMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/cegui0.8/data/gui/layouts/InGameTest.layout (modified) * code/branches/cegui0.8/data/gui/layouts/InfoPopup.layout (modified) * code/branches/cegui0.8/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/MainMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/cegui0.8/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/NotificationLayer.layout (modified) * code/branches/cegui0.8/data/gui/layouts/PickupInventory.layout (modified) * code/branches/cegui0.8/data/gui/layouts/QuestGUI.layout (modified) * code/branches/cegui0.8/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/cegui0.8/data/gui/layouts/UndockingDialog.layout (modified) * code/branches/cegui0.8/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/SleekSpaceHUDWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/SleekSpaceLook.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/SleekSpaceMenuWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/TaharezHUDWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/TaharezMenuWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/VanillaHUDWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/VanillaLook.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/VanillaMenuWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/WindowsHUDWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/WindowsLook.scheme (modified) * code/branches/cegui0.8/data/gui/schemes/WindowsMenuWidgets.scheme (modified) * code/branches/cegui0.8/data/gui/scripts/GUISheet.lua (modified) * code/branches/cegui0.8/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/cegui0.8/data/gui/scripts/MainMenu.lua (modified) * code/branches/cegui0.8/data/gui/scripts/SheetManager.lua (modified) * code/branches/cegui0.8/src/libraries/core/GUIManager.cc (modified) * code/branches/cegui0.8/src/orxonox/chat/ChatInputHandler.cc (modified) initial commit to get orxonox to find and compile and start with ... Mon, 15 Feb 2016 21:54:29 GMT landauf [11117] * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) preparing for CEGUI 0.8 Sun, 14 Feb 2016 17:20:50 GMT landauf [11116] * code/trunk (modified) ignore all kinds of build directories Sun, 14 Feb 2016 17:08:13 GMT landauf [11115] * code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btSerializer.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) fixed code to compile in 64bit mode Sun, 14 Feb 2016 16:13:03 GMT landauf [11114] * code/trunk/src/libraries/util/StringUtils.cc (modified) unfortunately std::put_time and std::get_time are only available in ... Sun, 14 Feb 2016 14:42:37 GMT landauf [11113] * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/src/SourceConfig.cmake (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) updated build-script to work with mingw-w64 and the new dependency ... Sun, 14 Feb 2016 12:04:05 GMT landauf [11112] * code/trunk/src/orxonox/controllers/ActionpointController.h (modified) removed unnecessary boost include Fri, 12 Feb 2016 12:05:41 GMT muemart [11111] * code/trunk/src/libraries/util/StringUtils.cc (modified) Some simplifications in StringUtils.cc Sun, 07 Feb 2016 17:47:15 GMT bknecht [11110] * code/branches/cegui0.8 (copied) Create CEGUI v0.8 migration branch Sat, 06 Feb 2016 14:27:55 GMT zifloria [11109] * code/trunk/cmake/LibraryConfigTardis.cmake (modified) changed build settings for tardis to use the new paths on the new ... Thu, 04 Feb 2016 22:54:04 GMT fvultier [11108] * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.cc (added) * code/trunk/src/modules/weapons/munitions/FlameMunition.h (added) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (added) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (added) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.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/MineGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) A few modifications in the weapon system: WeaponModes may play a ... Wed, 03 Feb 2016 12:02:33 GMT muemart [11106] * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) Fix a memory leak. Also fix some potentially invalid references to ... Mon, 01 Feb 2016 16:27:49 GMT fvultier [11105] * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) Removed wrong comments in Jump minigame. These comments were ... Sun, 31 Jan 2016 22:42:11 GMT fvultier [11104] * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/InsideSpaceStation.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (modified) * code/trunk/data/levels/expeditionSector.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (deleted) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/shuttleAttack.oxw (modified) * code/trunk/data/levels/shuttleRetaliation.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (deleted) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) Some HUDs (Health, Shield, Weapons, EnemyHealth, EnemyShield) are ... Sun, 31 Jan 2016 19:43:10 GMT landauf [11103] * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) fixed warnings (release build). fixed error in GravityBombField Sun, 31 Jan 2016 13:52:12 GMT landauf [11102] * code/branches/AI_HS15 (deleted) * code/branches/campaignHS15 (deleted) * code/branches/cpp11_v2 (deleted) * code/branches/cpp11_v3 (deleted) * code/branches/explosionChunksHS15 (deleted) * code/branches/fabienHS15 (deleted) * code/branches/hoverHS15 (deleted) * code/branches/particleEffectsHS15 (deleted) * code/branches/planetLevelHS15 (deleted) * code/branches/presentationHS15 (deleted) * code/branches/shaders (deleted) * code/branches/shaders_merge (deleted) removed merged branches from HS15 Sun, 31 Jan 2016 09:57:21 GMT landauf [11101] * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) fixed build when combining new cegui with old ogre Thu, 28 Jan 2016 14:56:24 GMT muemart [11100] * code/trunk/cmake/tools/FindLua5.1.cmake (modified) Update FindLua5.1.cmake to work with newer versions. Also added ... Wed, 27 Jan 2016 17:50:51 GMT muemart [11099] * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/groups/Pickup.dox (modified) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/commandline/CommandLineIncludes.h (modified) * code/trunk/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/commandline/CommandLineParser.h (modified) * code/trunk/src/libraries/core/config/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (modified) * code/trunk/src/libraries/core/object/ObjectListBase.h (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/libraries/network/ServerList.h (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/libraries/util/Clock.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/modules/docking/DockingAnimation.h (modified) * code/trunk/src/modules/docking/DockingEffect.h (modified) * code/trunk/src/modules/docking/DockingTarget.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverWall.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.h (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/chat/ChatHistory.h (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.h (modified) * code/trunk/src/orxonox/controllers/ActionpointController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/MasterController.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/items/Engine.h (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/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/worldentities/Actionpoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) Fix loads of doxygen warnings and other documentation issues Tue, 26 Jan 2016 19:32:16 GMT muemart [11098] * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/ImplicitConversion.h (deleted) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/Sleep.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) Minor C++11 improvements: - Drop ImplicitConversion.h in favor of ... Mon, 25 Jan 2016 20:47:54 GMT landauf [11097] * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/test/core/command/FunctorTest.cc (modified) * code/trunk/test/core/object/ObjectListTest.cc (modified) * code/trunk/test/core/object/StrongPtrTest.cc (modified) * code/trunk/test/core/object/WeakPtrTest.cc (modified) fixed build on tardis. Mon, 25 Jan 2016 20:33:11 GMT muemart [11096] * code/trunk/src/libraries/util/OrxEnum.h (modified) * code/trunk/src/libraries/util/mbool.h (modified) * code/trunk/src/libraries/util/tribool.h (modified) Constexpr for some util things Sun, 24 Jan 2016 22:28:05 GMT landauf [11095] * code/trunk/src/libraries/core/GlowMaterialListener.h (modified) simplified transparency-check Sun, 24 Jan 2016 21:40:10 GMT landauf [11094] * code/trunk/data/levels/cityLevelHS15.oxw (modified) added night-mode in city level (with city-lights and darker skybox) Sun, 24 Jan 2016 20:21:18 GMT landauf [11091] * code/trunk/data/levels/cityLevelHS15.oxw (moved) renamed city-level, removed planet and portals, using real skybox ... Sun, 24 Jan 2016 13:25:45 GMT landauf [11089] * code/trunk/src/libraries/core/GlowMaterialListener.h (modified) glow effect is now visible through transparent elements (e.g. ... Sat, 23 Jan 2016 22:15:55 GMT landauf [11087] * code/trunk/src/libraries/tools/BillboardSet.cc (modified) removed duplicate code Sat, 23 Jan 2016 21:07:53 GMT landauf [11086] * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) detail Sat, 23 Jan 2016 20:34:29 GMT landauf [11085] * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/GlowMaterialListener.h (added) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) enable glow shader in all scenes Thu, 21 Jan 2016 12:59:04 GMT muemart [11083] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/class/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/hover/TimeHUD.cc (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/controllers/ActionpointController.cc (modified) * code/trunk/src/orxonox/controllers/DivisionController.cc (modified) * code/trunk/src/orxonox/controllers/FightingController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/SectionController.cc (modified) * code/trunk/src/orxonox/controllers/WingmanController.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/graphics/LensFlare.cc (modified) * code/trunk/src/orxonox/graphics/LensFlare.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Fix some clang-tidy warnings. Also, Serialise.h was doing some ... Wed, 20 Jan 2016 22:05:10 GMT landauf [11082] * code/trunk/src/libraries/core/class/OrxonoxClass.h (modified) trying to fix bogus (?) warning on gcc [see ... Wed, 20 Jan 2016 21:56:27 GMT landauf [11081] * code/trunk/cmake/CompilerConfig.cmake (modified) fixed cmake script (cmake version 3.3.2) Tue, 19 Jan 2016 22:27:40 GMT landauf [11080] * code/trunk (modified) * code/trunk/data/levels/shadertest.oxw (copied) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/Mesh.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/RenderQueueListener.cc (copied) * code/trunk/src/orxonox/RenderQueueListener.h (copied) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/graphics/LensFlare.cc (copied) * code/trunk/src/orxonox/graphics/LensFlare.h (copied) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) merged shaders back to trunk (pps project from HS 2012)