# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 23, 2024, 1:49:17 AM Wed, 18 Dec 2013 12:17:26 GMT jo [9924] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/EscapeTheBastards.oxw (copied) * code/branches/presentationHS13/data/levels/gallery.oxw (modified) * code/branches/presentationHS13/data/levels/missionOne.oxw (modified) * code/branches/presentationHS13/data/levels/pickups.oxw (modified) * code/branches/presentationHS13/data/levels/portals.oxw (modified) * code/branches/presentationHS13/data/levels/presentation.oxw (modified) * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) * code/branches/presentationHS13/data/levels/turretTest.oxw (modified) merged levelElias Wed, 18 Dec 2013 10:56:37 GMT jo [9923] * code/branches/presentationHS13/data/levels/templates/spaceshipHXYSL.oxt (modified) removed distanceTrigger beacon Wed, 18 Dec 2013 10:43:30 GMT jo [9922] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/Spacefight.oxw (copied) * code/branches/presentationHS13/data/levels/missionOne.oxw (modified) * code/branches/presentationHS13/data/levels/quests.oxw (modified) * code/branches/presentationHS13/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentationHS13/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentationHS13/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentationHS13/src/modules/overlays/hud/CountDown.cc (copied) * code/branches/presentationHS13/src/modules/overlays/hud/CountDown.h (copied) merged levelMichael Tue, 17 Dec 2013 22:34:01 GMT jo [9920] * code/branches/presentationHS13/src/modules/invader/InvaderShip.cc (modified) hopefully fixed a crash Mon, 16 Dec 2013 15:05:33 GMT georgr [9919] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) boost mapped to B; roll, steering and acceleration(c/Z) all working. Mon, 16 Dec 2013 14:43:45 GMT smerkli [9918] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/defaultConfig/keybindings.ini (modified) * code/branches/presentationHS13/data/levels/Spacerace2.oxw (modified) * code/branches/presentationHS13/data/levels/asteroidField.oxw (modified) * code/branches/presentationHS13/data/levels/asteroids.oxw (modified) * code/branches/presentationHS13/data/levels/dynamicMatch.oxw (modified) * code/branches/presentationHS13/data/levels/lastManStanding.oxw (modified) * code/branches/presentationHS13/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentationHS13/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentationHS13/data/levels/maxim.oxw (modified) * code/branches/presentationHS13/data/levels/pirateAttack.oxw (modified) * code/branches/presentationHS13/data/levels/pong.oxw (modified) * code/branches/presentationHS13/data/levels/spaceRace.oxw (modified) * code/branches/presentationHS13/data/levels/surfaceRace.oxw (modified) * code/branches/presentationHS13/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentationHS13/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentationHS13/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS13/data/levels/underAttack.oxw (modified) * code/branches/presentationHS13/src/modules/pong/Pong.cc (modified) * code/branches/presentationHS13/src/modules/pong/PongBall.cc (modified) * code/branches/presentationHS13/src/modules/pong/PongBall.h (modified) * code/branches/presentationHS13/src/modules/pong/PongScore.cc (modified) * code/branches/presentationHS13/src/modules/pong/PongScore.h (modified) * code/branches/presentationHS13/src/orxonox/MoodManager.h (modified) * code/branches/presentationHS13/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentationHS13/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/AmbientSound.h (modified) * code/branches/presentationHS13/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/WorldAmbientSound.h (modified) * code/branches/presentationHS13/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentationHS13/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentationHS13/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS13/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged sfxThilo branch, things seem to be working fine Mon, 16 Dec 2013 14:35:48 GMT georgr [9917] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) HumanController rotateRoll needs a vector as argument... the moar you ... Mon, 16 Dec 2013 14:11:59 GMT skaan [9915] * code/branches/levelKaan/data/levels/Level_Kaan.oxw (modified) Level finished --> TODO: Meteoriten starten, wenn durch Portal Mon, 16 Dec 2013 14:11:01 GMT thiweber [9913] * code/branches/sfxThilo/data/levels/Spacerace2.oxw (modified) * code/branches/sfxThilo/data/levels/presentationHS12.oxw (modified) * code/branches/sfxThilo/data/levels/spaceRace.oxw (modified) * code/branches/sfxThilo/data/levels/surfaceRace.oxw (modified) iserted start sound Mon, 16 Dec 2013 14:06:08 GMT georgr [9911] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/Mouse.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) watch out for sensitivity! IR input now working, still trying to fix roll Mon, 16 Dec 2013 14:03:17 GMT agermann [9910] * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) Added additional LOD information for space station Mon, 16 Dec 2013 13:37:00 GMT skaan [9909] * code/branches/levelKaan/data/levels/Level_01.oxw (deleted) * code/branches/levelKaan/data/levels/Level_Kaan.oxw (modified) Bug test Mon, 16 Dec 2013 13:22:45 GMT smerkli [9907] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/gui/layouts/UndockingDialog.layout (copied) * code/branches/presentationHS13/data/gui/scripts/UndockingDialog.lua (copied) * code/branches/presentationHS13/data/levels/EntryTest.oxw (copied) * code/branches/presentationHS13/data/levels/FPSTest.oxw (modified) * code/branches/presentationHS13/data/levels/docking.oxw (modified) * code/branches/presentationHS13/data/levels/dockingToASpaceStation.oxw (copied) * code/branches/presentationHS13/src/modules/docking/Dock.cc (modified) * code/branches/presentationHS13/src/modules/docking/Dock.h (modified) * code/branches/presentationHS13/src/modules/docking/MoveToDockingTarget.cc (modified) * code/branches/presentationHS13/src/modules/objects/ForceField.cc (modified) * code/branches/presentationHS13/src/modules/objects/ForceField.h (modified) * code/branches/presentationHS13/src/orxonox/infos/PlayerInfo.cc (modified) Merged spacestationentry branch Mon, 16 Dec 2013 13:06:09 GMT smerkli [9905] * code/branches/presentationHS13/data/levels/Invaders.oxw (modified) Florian forgot to change something, now screenshot should work Mon, 16 Dec 2013 13:00:00 GMT smerkli [9904] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentationHS13/data/levels/radar3D_test.oxw (copied) * code/branches/presentationHS13/data/overlays/HUD.oxo (modified) * code/branches/presentationHS13/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS13/src/libraries/util/Math.cc (modified) * code/branches/presentationHS13/src/libraries/util/Math.h (modified) * code/branches/presentationHS13/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentationHS13/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentationHS13/src/modules/overlays/hud/HUDRadar.h (modified) Merged branch radarDreiD into presentationbranch Mon, 16 Dec 2013 12:58:35 GMT zifloria [9903] * code/branches/invaders/data/levels/Invaders.oxw (modified) level preview Mon, 16 Dec 2013 12:49:49 GMT noep [9902] * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) Disabled LoD for HeavyCruiser Mon, 16 Dec 2013 12:33:09 GMT smerkli [9900] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/Invaders.oxw (copied) * code/branches/presentationHS13/data/levels/_temp.oxw (copied) * code/branches/presentationHS13/data/levels/includes/invaderWeapon.oxi (copied) * code/branches/presentationHS13/data/levels/includes/invaderWeaponEnemy.oxi (copied) * code/branches/presentationHS13/data/levels/templates/.shipmodels (copied) * code/branches/presentationHS13/data/levels/templates/enemyInvader.oxt (copied) * code/branches/presentationHS13/data/levels/templates/enemyInvaderShooter.oxt (copied) * code/branches/presentationHS13/data/levels/templates/spaceshipInvader.oxt (copied) * code/branches/presentationHS13/data/overlays/InvaderHUD.oxo (copied) * code/branches/presentationHS13/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS13/src/modules/invader (copied) * code/branches/presentationHS13/src/modules/invader/CMakeLists.txt (copied) * code/branches/presentationHS13/src/modules/invader/Invader.cc (copied) * code/branches/presentationHS13/src/modules/invader/Invader.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderCenterPoint.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderCenterPoint.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemy.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemy.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemyShooter.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemyShooter.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderHUDinfo.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderHUDinfo.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderPrereqs.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderShip.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderShip.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeapon.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeapon.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeaponEnemy.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeaponEnemy.h (copied) * code/branches/presentationHS13/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/presentationHS13/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.h (modified) * code/branches/presentationHS13/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/presentationHS13/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/presentationHS13/src/orxonox/worldentities/pawns/Pawn.cc (modified) Merged the invaders branch of Florian Mon, 16 Dec 2013 12:26:30 GMT noep [9898] * code/branches/presentationHS13/data/levels/HeavyCruiser.oxw (added) * code/branches/presentationHS13/data/levels/includes/HeavyCruiserParts.lua (added) * code/branches/presentationHS13/data/levels/includes/weaponSettingsHeavyCruiser.oxi (added) * code/branches/presentationHS13/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (added) * code/branches/presentationHS13/data/levels/templates/HeavyCruiser.oxt (added) * code/branches/presentationHS13/data/levels/templates/HeavyCruiserBody.oxt (added) * code/branches/presentationHS13/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentationHS13/src/orxonox/interfaces/RadarViewable.h (modified) Added HeavyCruiser files Thu, 12 Dec 2013 15:13:05 GMT schlaem [9894] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) some more details... Thu, 12 Dec 2013 14:16:18 GMT wroennin [9893] * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) fixed bug where marker_ had not the right zOrder Thu, 12 Dec 2013 11:32:34 GMT schlaem [9892] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) some more details... Wed, 11 Dec 2013 11:31:15 GMT jo [9891] * code/branches/presentationHS13 (copied) Creating new branch for the presentation of the PPS HS 13 Mon, 09 Dec 2013 16:05:44 GMT georgr [9890] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) hardly any spazzing around from the accelerometer now - there is some ... Mon, 09 Dec 2013 15:06:38 GMT thiweber [9889] * code/branches/sfxThilo/data/defaultConfig/keybindings.ini (modified) * code/branches/sfxThilo/data/levels/Spacerace2.oxw (modified) * code/branches/sfxThilo/data/levels/asteroidField.oxw (modified) * code/branches/sfxThilo/data/levels/asteroids.oxw (modified) * code/branches/sfxThilo/data/levels/dynamicMatch.oxw (modified) * code/branches/sfxThilo/data/levels/lastManStanding.oxw (modified) * code/branches/sfxThilo/data/levels/lastTeamStanding.oxw (modified) * code/branches/sfxThilo/data/levels/lastTeamStandingII.oxw (modified) * code/branches/sfxThilo/data/levels/maxim.oxw (modified) * code/branches/sfxThilo/data/levels/pirateAttack.oxw (modified) * code/branches/sfxThilo/data/levels/pong.oxw (modified) * code/branches/sfxThilo/data/levels/presentationHS12.oxw (modified) * code/branches/sfxThilo/data/levels/spaceRace.oxw (modified) * code/branches/sfxThilo/data/levels/surfaceRace.oxw (modified) * code/branches/sfxThilo/data/levels/teamBaseMatch.oxw (modified) * code/branches/sfxThilo/data/levels/teamDeathMatch.oxw (modified) * code/branches/sfxThilo/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/sfxThilo/data/levels/underAttack.oxw (modified) * code/branches/sfxThilo/src/modules/pong/PongBall.cc (modified) * code/branches/sfxThilo/src/modules/pong/PongBall.h (modified) * code/branches/sfxThilo/src/orxonox/MoodManager.h (modified) * code/branches/sfxThilo/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/sfxThilo/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sfxThilo/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sfxThilo/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sfxThilo/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sfxThilo/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/sfxThilo/src/orxonox/sound/WorldAmbientSound.h (modified) * code/branches/sfxThilo/src/orxonox/sound/WorldSound.cc (modified) * code/branches/sfxThilo/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sfxThilo/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/sfxThilo/src/orxonox/worldentities/pawns/Pawn.h (modified) A few changes.. Mon, 09 Dec 2013 15:02:50 GMT schlaem [9888] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) Mon, 09 Dec 2013 15:01:28 GMT lumperte [9887] * code/branches/levelElias/data/levels/EscapeTheBastards.oxw (modified) * code/branches/levelElias/data/levels/presentation.oxw (modified) * code/branches/levelElias/data/levels/turretTest.oxw (modified) Escape the Bastards: Questions: Collision Damage at 'Staticentity', ... Mon, 09 Dec 2013 14:59:56 GMT agermann [9886] * code/branches/spacestationentry/data/gui/layouts/UndockingDialog.layout (added) * code/branches/spacestationentry/data/gui/scripts/UndockingDialog.lua (added) Mon, 09 Dec 2013 14:57:28 GMT agermann [9885] * code/branches/spacestationentry/data/levels/dockingToASpaceStation.oxw (modified) * code/branches/spacestationentry/src/modules/docking/Dock.cc (modified) * code/branches/spacestationentry/src/modules/docking/Dock.h (modified) * code/branches/spacestationentry/src/modules/docking/MoveToDockingTarget.cc (modified) The level EntryTest.oxw can be deleted. Finally a nice and working ... Mon, 09 Dec 2013 13:53:57 GMT zifloria [9884] * code/branches/invaders/data/levels/Invaders.oxw (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc (modified) * code/branches/invaders/src/modules/invader/InvaderShip.cc (modified) finito! (apart from explosions) Mon, 09 Dec 2013 13:28:00 GMT schlaem [9883] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) in progress... Mon, 09 Dec 2013 13:26:10 GMT wroennin [9882] * code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h (modified) added XMLProt for detectionLimit_ Mon, 09 Dec 2013 13:14:06 GMT wroennin [9881] * code/branches/radarDreiD/src/libraries/util/Math.cc (modified) corrected some documentation Mon, 09 Dec 2013 13:10:21 GMT skaan [9880] * code/branches/levelKaan/data/levels/Level_Kaan.oxw (added) TODO: Asteroiden an und ausschalten und bei Tod zuruecksetzen. Mon, 09 Dec 2013 13:08:26 GMT zifloria [9879] * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/invaders/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/invaders/src/orxonox/worldentities/pawns/Pawn.cc (modified) tweaking + still trying to figure out explosions Mon, 09 Dec 2013 13:07:55 GMT skaan [9878] * code/branches/levelKaan/data/levels/Level_01.oxw (modified) Asteroiden an und ausschalten und bei Tod zuruecksetzen. Mon, 09 Dec 2013 13:06:55 GMT wroennin [9877] * code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo (modified) * code/branches/radarDreiD/src/libraries/util/Math.cc (modified) * code/branches/radarDreiD/src/libraries/util/Math.h (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) Math: New function to determine the ZOrder of the radarobjects; ... Mon, 09 Dec 2013 12:04:09 GMT georgr [9876] * code/branches/wiimote/cmake/tools/FindBluetooth.cmake (modified) * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) lag sorta fixed - it disappears after ~40s, but will reappear for ... Fri, 06 Dec 2013 14:10:06 GMT zifloria [9875] * code/branches/invaders/src/modules/invader/InvaderEnemy (deleted) clean Fri, 06 Dec 2013 14:09:30 GMT zifloria [9874] * code/branches/invaders/data/levels/Invaders.oxw (modified) * code/branches/invaders/data/levels/includes/invaderWeaponEnemy.oxi (added) * code/branches/invaders/data/levels/templates/enemyInvaderShooter.oxt (added) * code/branches/invaders/src/modules/invader/CMakeLists.txt (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemyShooter.cc (added) * code/branches/invaders/src/modules/invader/InvaderEnemyShooter.h (added) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc (modified) * code/branches/invaders/src/modules/invader/InvaderPrereqs.h (modified) * code/branches/invaders/src/modules/invader/InvaderShip.cc (modified) * code/branches/invaders/src/modules/invader/InvaderShip.h (modified) * code/branches/invaders/src/modules/invader/InvaderWeapon.cc (modified) * code/branches/invaders/src/modules/invader/InvaderWeapon.h (modified) * code/branches/invaders/src/modules/invader/InvaderWeaponEnemy.cc (added) * code/branches/invaders/src/modules/invader/InvaderWeaponEnemy.h (added) best game eva ^^ Fri, 06 Dec 2013 10:42:18 GMT schlaem [9873] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) with Timer Thu, 05 Dec 2013 19:46:18 GMT jo [9872] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) * code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc (modified) * code/branches/levelMichael/src/modules/overlays/hud/CountDown.h (modified) Making the countdown speed configurable. Wed, 04 Dec 2013 23:17:04 GMT jo [9871] * code/branches/invaders/data/levels/templates/spaceshipInvader.oxt (modified) Getting rid of a warning, due to a duplicate enigne name. Tue, 03 Dec 2013 21:02:24 GMT jo [9870] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) * code/branches/levelMichael/data/levels/quests.oxw (modified) * code/branches/levelMichael/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/levelMichael/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc (added) * code/branches/levelMichael/src/modules/overlays/hud/CountDown.h (added) Adding a countdown to the SpaceFight Level. Tue, 03 Dec 2013 20:02:04 GMT zifloria [9869] * code/branches/invaders/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/invaders/src/orxonox/graphics/ParticleEmitter.h (modified) * code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc (modified) tried to make particle effects dynamic. Didn't work.... Tue, 03 Dec 2013 19:18:15 GMT zifloria [9868] * code/branches/invaders/data/levels/Invaders.oxw (modified) * code/branches/invaders/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/invaders/data/levels/templates/enemyInvader.oxt (modified) * code/branches/invaders/data/overlays/InvaderHUD.oxo (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderCenterPoint.cc (modified) * code/branches/invaders/src/modules/invader/InvaderCenterPoint.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.h (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.h (modified) * code/branches/invaders/src/modules/invader/InvaderPrereqs.h (modified) * code/branches/invaders/src/modules/invader/InvaderShip.cc (modified) * code/branches/invaders/src/modules/invader/InvaderShip.h (modified) * code/branches/invaders/src/modules/invader/InvaderWeapon.cc (modified) * code/branches/invaders/src/modules/invader/InvaderWeapon.h (modified) * code/branches/invaders/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc (modified) End game screen. Eye candy. Gameplay tweaks Mon, 02 Dec 2013 16:43:39 GMT zifloria [9866] * code/branches/invaders/data/levels/Invaders.oxw (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc (modified) no ending, no crash Mon, 02 Dec 2013 15:47:36 GMT georgr [9863] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) added debug output with deltatime Mon, 02 Dec 2013 15:42:46 GMT zifloria [9862] * code/branches/invaders/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) invader almost done Mon, 02 Dec 2013 15:37:11 GMT georgr [9861] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) 3s of lag are still here...next try Mon, 02 Dec 2013 15:33:40 GMT georgr [9860] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) 3s of lag are still here... Mon, 02 Dec 2013 15:28:22 GMT zifloria [9859] * code/branches/invaders/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) fail Mon, 02 Dec 2013 15:08:30 GMT zifloria [9858] * code/branches/invaders/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) hbskdjbs Mon, 02 Dec 2013 15:05:10 GMT agermann [9857] * code/branches/spacestationentry/data/levels/dockingToASpaceStation.oxw (modified) * code/branches/spacestationentry/src/modules/docking/Dock.cc (modified) * code/branches/spacestationentry/src/modules/docking/Dock.h (modified) * code/branches/spacestationentry/src/modules/objects/ForceField.cc (modified) * code/branches/spacestationentry/src/modules/objects/ForceField.h (modified) Docking funktioniert nun mit einem eingebauten Trigger ueber ... Mon, 02 Dec 2013 15:00:46 GMT georgr [9856] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) still trying to get quicker reaction to button presses Mon, 02 Dec 2013 14:54:37 GMT georgr [9855] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) A should fire main lazors more reliably now Mon, 02 Dec 2013 14:53:08 GMT zifloria [9854] * code/branches/invaders/data/levels/templates/enemyInvader.oxt (modified) * code/branches/invaders/data/overlays/InvaderHUD.oxo (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.h (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.h (modified) yeaHHH Mon, 02 Dec 2013 14:49:14 GMT georgr [9853] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) A should fire main lazors now, 3rd try Mon, 02 Dec 2013 14:42:24 GMT wroennin [9852] * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) fixed showing bug of the two overlay elements Mon, 02 Dec 2013 14:38:43 GMT georgr [9851] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) A should fire main lazors now, second try Mon, 02 Dec 2013 14:35:38 GMT georgr [9850] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) A should fire main lazors now Mon, 02 Dec 2013 14:30:55 GMT schlaem [9849] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) in progress... Mon, 02 Dec 2013 14:10:57 GMT lumperte [9848] * code/branches/levelElias/data/levels/EscapeTheBastards.oxw (modified) * code/branches/levelElias/data/levels/gallery.oxw (modified) * code/branches/levelElias/data/levels/pickups.oxw (modified) * code/branches/levelElias/data/levels/portals.oxw (modified) Escape the Bastards: Box with pickups fixed. spawnpoints changed. One ... Mon, 02 Dec 2013 13:58:25 GMT wroennin [9847] * code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h (modified) added variables, XMLProts for new Overlay elements for the 3D map Mon, 02 Dec 2013 13:57:38 GMT georgr [9846] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) trying to get a reaction out of the wiiMote, 5th try Mon, 02 Dec 2013 13:53:38 GMT georgr [9845] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) trying to get a reaction out of the wiiMote, 4th try Mon, 02 Dec 2013 13:50:52 GMT georgr [9844] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) trying to get a reaction out of the wiiMote, 3rd try Mon, 02 Dec 2013 13:48:29 GMT schlaem [9843] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) in progress... Mon, 02 Dec 2013 13:47:14 GMT georgr [9842] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) trying to get a reaction out of the wiiMote, 2nd try Mon, 02 Dec 2013 13:46:02 GMT georgr [9841] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) trying to get a reaction out of the wiiMote Mon, 02 Dec 2013 13:38:52 GMT georgr [9840] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) made two things static to fix everything Mon, 02 Dec 2013 13:16:36 GMT georgr [9839] * code/branches/wiimote/src/external/wiicpp/wiic/wiic.h (modified) next try... fixed includes Mon, 02 Dec 2013 13:09:41 GMT georgr [9838] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) developing on 2 PCs is a lot of fun, bluetooth is a rare commodity... ... Mon, 02 Dec 2013 13:08:46 GMT zifloria [9837] * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/invaders/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/invaders/src/orxonox/worldentities/pawns/Pawn.cc (modified) new Explosions!!! Mon, 02 Dec 2013 12:50:05 GMT skaan [9836] * code/branches/levelKaan/data/levels/Level_01.oxw (modified) error control Mon, 02 Dec 2013 12:12:06 GMT wroennin [9835] * code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h (modified) added XML port and variable mapAngle_ Tue, 26 Nov 2013 20:38:24 GMT smerkli [9830] * code/branches/wiimote/src/SourceConfig.cmake (modified) * code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c (modified) * code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h (modified) Fixed the ugly bluetooth hack into one that's a little less ugly: ... Mon, 25 Nov 2013 17:51:39 GMT zifloria [9829] * code/branches/invaders/data/overlays/InvaderHUD.oxo (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.h (modified) * code/branches/invaders/src/modules/invader/InvaderShip.cc (modified) * code/branches/invaders/src/modules/invader/InvaderShip.h (modified) points, level up, hud Mon, 25 Nov 2013 16:35:30 GMT zifloria [9828] * code/branches/invaders/data/levels/Invaders.oxw (modified) * code/branches/invaders/data/levels/templates/enemyInvader.oxt (modified) * code/branches/invaders/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/invaders/data/overlays/InvaderHUD.oxo (added) * code/branches/invaders/src/modules/invader/CMakeLists.txt (modified) * code/branches/invaders/src/modules/invader/Invader.cc (modified) * code/branches/invaders/src/modules/invader/Invader.h (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/invaders/src/modules/invader/InvaderEnemy.h (modified) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc (added) * code/branches/invaders/src/modules/invader/InvaderHUDinfo.h (added) * code/branches/invaders/src/modules/invader/InvaderPrereqs.h (modified) * code/branches/invaders/src/modules/invader/InvaderShip.cc (modified) * code/branches/invaders/src/modules/invader/InvaderShip.h (modified) HUD + take damage Mon, 25 Nov 2013 16:27:23 GMT smerkli [9827] * code/branches/wiimote/cmake/LibraryConfig.cmake (modified) * code/branches/wiimote/cmake/LibraryConfigTardis.cmake (modified) * code/branches/wiimote/cmake/tools/FindBluetooth.cmake (modified) * code/branches/wiimote/src/external/wiicpp/wiic/io.h (modified) * code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c (modified) * code/branches/wiimote/src/external/wiicpp/wiic/wiic.h (modified) * code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h (modified) Tried a few fixes to get Bluetooth to be included properly, but no ... Mon, 25 Nov 2013 15:43:47 GMT schlaem [9826] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) Quest-Problem already exists... Mon, 25 Nov 2013 15:31:29 GMT wroennin [9824] * code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) Updated Mon, 25 Nov 2013 15:10:21 GMT jo [9823] * code/branches/levelMichael (modified) * code/branches/levelMichael/cmake/LibraryConfig.cmake (modified) * code/branches/levelMichael/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/levelMichael/data/levels/gallery.oxw (modified) * code/branches/levelMichael/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/levelMichael/data/levels/templates/lodInformation.oxt (modified) * code/branches/levelMichael/src/libraries/core/GUIManager.cc (modified) * code/branches/levelMichael/src/libraries/util/CMakeLists.txt (modified) * code/branches/levelMichael/src/modules/tetris/TetrisBrick.cc (modified) merging latest trunk into branch 'levelMichael' Mon, 25 Nov 2013 15:08:20 GMT schlaem [9822] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) in progress.. Mon, 25 Nov 2013 15:05:51 GMT skaan [9821] * code/branches/levelKaan/data/levels/Level_01.oxw (modified) update asteroids and finished endofgame Mon, 25 Nov 2013 15:02:44 GMT agermann [9820] * code/branches/spacestationentry/data/levels/dockingToASpaceStation.oxw (modified) * code/branches/spacestationentry/src/modules/docking/Dock.cc (modified) * code/branches/spacestationentry/src/modules/docking/Dock.h (modified) Keine Grossen Fortschritte, die Loesung mit dem undock Konsolenbefehl ... Mon, 25 Nov 2013 15:01:39 GMT georgr [9819] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) ... another test, sorry for the many commits, will fix this issue ... Mon, 25 Nov 2013 15:01:10 GMT wroennin [9818] * code/branches/radarDreiD/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h (modified) HUDRadar: Added various XML ports, added changing between different ... Mon, 25 Nov 2013 14:57:49 GMT georgr [9817] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) Test Mon, 25 Nov 2013 14:50:41 GMT georgr [9816] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) next try Mon, 25 Nov 2013 14:50:32 GMT lumperte [9815] * code/branches/levelElias/data/levels/EscapeTheBastards.oxw (modified) End of Mission finished. Mon, 25 Nov 2013 14:43:01 GMT georgr [9814] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) bug fix Mon, 25 Nov 2013 14:38:51 GMT georgr [9813] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) Added some simple wobbling action. To be tested. Mon, 25 Nov 2013 14:33:02 GMT georgr [9812] * code/branches/wiimote/cmake/LibraryConfig.cmake (modified) * code/branches/wiimote/cmake/LibraryConfigTardis.cmake (modified) * code/branches/wiimote/cmake/tools/FindBluetooth.cmake (modified) * code/branches/wiimote/src/external/wiicpp/wiic/io.h (modified) * code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c (modified) * code/branches/wiimote/src/external/wiicpp/wiic/wiic.h (modified) * code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h (modified) Committing a few local changes, this won't work very well on non- ... Mon, 25 Nov 2013 14:25:56 GMT jo [9811] * code/branches/levelElias (modified) * code/branches/levelElias/cmake/LibraryConfig.cmake (modified) * code/branches/levelElias/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/levelElias/data/levels/gallery.oxw (modified) * code/branches/levelElias/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/levelElias/data/levels/templates/lodInformation.oxt (modified) * code/branches/levelElias/src/libraries/core/GUIManager.cc (modified) * code/branches/levelElias/src/libraries/util/CMakeLists.txt (modified) * code/branches/levelElias/src/modules/tetris/TetrisBrick.cc (modified) merged recent trunk features into 'levelElias' branch Mon, 25 Nov 2013 14:23:07 GMT lumperte [9810] * code/branches/levelElias/data/levels/EscapeTheBastards.oxw (modified) * code/branches/levelElias/data/levels/missionOne.oxw (modified) * code/branches/levelElias/data/levels/templates/lodInformation.oxt (modified) Box-Labyrinth und end of mission Mon, 25 Nov 2013 14:06:25 GMT schlaem [9809] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) Quest-Problems Mon, 25 Nov 2013 13:09:57 GMT jo [9808] * code/branches/levelKaan (modified) * code/branches/levelKaan/cmake/LibraryConfig.cmake (modified) * code/branches/levelKaan/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/levelKaan/data/levels/gallery.oxw (modified) * code/branches/levelKaan/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/levelKaan/data/levels/templates/lodInformation.oxt (modified) * code/branches/levelKaan/src/libraries/core/GUIManager.cc (modified) * code/branches/levelKaan/src/libraries/util/CMakeLists.txt (modified) * code/branches/levelKaan/src/modules/tetris/TetrisBrick.cc (modified) Merged recent changes into branch 'levelKaan'. Mon, 25 Nov 2013 13:07:54 GMT skaan [9807] * code/branches/levelKaan/data/levels/Level_01.oxw (modified) * code/branches/levelKaan/data/levels/maxim.oxw (modified) * code/branches/levelKaan/data/levels/missionOne.oxw (modified) * code/branches/levelKaan/data/levels/portals.oxw (modified) * code/branches/levelKaan/data/levels/presentation.oxw (modified) * code/branches/levelKaan/data/levels/presentationFS11.oxw (modified) * code/branches/levelKaan/data/levels/underAttack.oxw (modified) Update meteorids, endofgame Mon, 25 Nov 2013 12:42:53 GMT schlaem [9806] * code/branches/levelMichael/data/levels/Spacefight.oxw (modified) in progress..