# # ChangeLog for code/branches/sagerjFS16 # # Generated by Trac 1.0.9 # Nov 22, 2024, 8:03:32 AM Thu, 26 May 2016 13:58:37 GMT sagerj [11205] * code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw (added) * code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (modified) * code/branches/sagerjFS16/data/levels/includes/weaponSettingsFx112.oxi (added) * code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt (added) * code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified) * code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified) zusammengemerged mit florin project 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, 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, 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 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 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: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, 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, 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 12:57:56 GMT fvultier [11138] * code/branches/sagerjFS16 (copied) 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