# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 12:30:56 PM Sun, 30 May 2010 21:54:45 GMT solex [7029] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) minor changes to ai controllers Sun, 30 May 2010 20:21:41 GMT rgrieder [7028] * code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified) * code/branches/presentation3/src/modules/designtools/CreateStars.h (modified) Fixed M_PI problem (not C++). Note: For the future, we should define ... Sun, 30 May 2010 18:22:19 GMT decapitb [7027] * code/branches/presentation3/data/levels/PresentationFS10.oxw (added) * code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (modified) got to work on that level... minor cosmetic changes to AnimatedModel.cc Sun, 30 May 2010 18:20:46 GMT decapitb [7026] * data/trunk/materials/scripts (modified) * data/trunk/materials/scripts/Banners.material (added) * data/trunk/materials/textures/Drone.png (added) * data/trunk/materials/textures/Pickups.png (added) added banners for pickup and drone presentation Sun, 30 May 2010 15:40:21 GMT dafrick [7025] * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) Some cleanup. Sun, 30 May 2010 14:46:17 GMT scheusso [7024] * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) accidentially disabled lod Sun, 30 May 2010 14:36:43 GMT dafrick [7023] * code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified) Made gametype_asteroids level easier to play and erased some debug ... Sun, 30 May 2010 14:09:45 GMT scheusso [7022] * code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified) fixed some includes Sun, 30 May 2010 13:57:05 GMT gnadler [7021] * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation3/src/modules/weapons/RocketController.h (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) documentation & formatting commit Sun, 30 May 2010 13:46:08 GMT scheusso [7020] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) some enhancements to lod (can be disabled now in the lodinformation ... Sun, 30 May 2010 13:44:22 GMT scheusso [7019] * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) some network related fixes Sun, 30 May 2010 13:19:49 GMT scheusso [7018] * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/particle/simplerocketfire.particle (copied) * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation3/src/modules/weapons/RocketController.h (modified) * code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) merged rocket2 branch back into presentation3 branch Sun, 30 May 2010 12:53:26 GMT scheusso [7017] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) low lod level for high-quality hsw01 (still used on some spaceships) Sun, 30 May 2010 12:52:34 GMT scheusso [7016] * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) change in LoD: use volume of the bounding box instead of scalefactor ... Sun, 30 May 2010 12:51:33 GMT scheusso [7015] * code/branches/presentation3/src/modules/designtools/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (added) * code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (added) adding ScreenshotManager in order to be able to make high-resolution ... Sun, 30 May 2010 12:50:19 GMT scheusso [7014] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) small fix in hudnavigation (making sure we don't remove the players ... Sun, 30 May 2010 12:10:13 GMT dafrick [7013] * code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) Added some config value to the menu and greyed-out the reset button, ... Sun, 30 May 2010 11:37:33 GMT dafrick [7012] * code/branches/presentation3/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation3/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation3/src/libraries/core/GUIManager.h (modified) Config values can now be changed in a menu. Sun, 30 May 2010 10:26:27 GMT scheusso [7011] * code/branches/rocket2 (modified) * code/branches/rocket2/src/libraries/network/packet/ClassID.cc (modified) merged a fix from presentation3 in order to be able to test with network Sat, 29 May 2010 19:58:53 GMT dafrick [7010] * code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) Loading PickupInventory when the PickupManager gets created to avoid ... Sat, 29 May 2010 19:56:07 GMT dafrick [7009] * code/branches/presentation3/data/gui/layouts/ChatBox.layout (modified) * code/branches/presentation3/data/gui/scripts/ChatBox.lua (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/ChatInputHandler.h (modified) Enabled the ChatBox to be closed by pressing the close button in the ... Sat, 29 May 2010 19:33:33 GMT dafrick [7008] * code/branches/presentation3/data/levels/pickups.oxw (modified) * code/branches/presentation3/src/libraries/core/OrxonoxClass.h (modified) * code/branches/presentation3/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation3/src/modules/pickup/Pickup.h (modified) * code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc (modified) Fixed a bug in pickups that caused the clone method of Pickup.h not ... Sat, 29 May 2010 18:41:19 GMT dafrick [7007] * code/branches/presentation3/data/levels/empty_level.oxw (modified) * code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation3/data/levels/gametype_underattack.oxw (modified) * code/branches/presentation3/data/levels/mylevel.oxw (modified) * code/branches/presentation3/data/levels/pickups.oxw (moved) * code/branches/presentation3/data/levels/presentation09.oxw (modified) * code/branches/presentation3/data/levels/presentation09b.oxw (modified) * code/branches/presentation3/data/levels/presentationHS09.oxw (modified) * code/branches/presentation3/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation3/data/levels/presentationLOD.oxw (modified) * code/branches/presentation3/data/levels/presentationLODdif.oxw (modified) * code/branches/presentation3/data/levels/presentation_dm.oxw (modified) * code/branches/presentation3/data/levels/presentation_pong.oxw (modified) * code/branches/presentation3/data/levels/princessaeryn.oxw (modified) * code/branches/presentation3/data/levels/questsystem2.oxw (deleted) * code/branches/presentation3/data/levels/sound.oxw (modified) * code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified) * code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified) * code/branches/presentation3/data/levels/test_ghost.oxw (modified) * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/levels/waypoints.oxw (modified) * code/branches/presentation3/src/modules/pickup/Pickup.cc (modified) Tested and cleaned all levels (except for the ones that someone is ... Sat, 29 May 2010 15:09:58 GMT dafrick [7006] * code/branches/presentation3/data/gui/layouts/MiscConfigMenu.layout (added) * code/branches/presentation3/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (added) * code/branches/presentation3/data/gui/scripts/SettingsMenu.lua (modified) Added Menu to display and edit config values. But the list of ... Fri, 28 May 2010 08:23:14 GMT scheusso [7005] * code/branches/presentation3/data/levels/includes/weaponsettings_HXY.oxi (modified) * code/branches/presentation3/data/levels/includes/weaponsettings_ghost.oxi (modified) same for ghost and HXY Fri, 28 May 2010 08:22:05 GMT scheusso [7004] * code/branches/presentation3/data/levels/includes/weaponsettings_pirate.oxi (modified) less damage for the pirate ships Fri, 28 May 2010 08:20:35 GMT scheusso [7003] * code/branches/presentation3/data/levels/includes/weaponsettings_H2.oxi (modified) less damage for the H2 ships Fri, 28 May 2010 07:45:55 GMT dafrick [7002] * code/branches/ppspickups4 (copied) Creating new ppspickups branch. Fri, 28 May 2010 07:39:08 GMT dafrick [7001] * code/branches/ppspickups3 (deleted) Removing ppspickups3 branch. Thu, 27 May 2010 21:55:18 GMT dafrick [7000] * code/branches/presentation3/data/levels/includes/pickups.oxi (modified) Renamed Triple Pickup to Tri Pickup. This was important. Believe me... Thu, 27 May 2010 21:54:05 GMT dafrick [6999] * code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) Commented some unused variables in RocketController that generated ... Thu, 27 May 2010 21:50:24 GMT dafrick [6998] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/includes/pickups.oxi (modified) * code/branches/presentation3/data/levels/pickup.oxw (modified) * code/branches/presentation3/data/levels/pickup_pps_invi.oxw (deleted) * code/branches/presentation3/data/levels/pickup_ppstest1.oxw (deleted) * code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/presentation3/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation3/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc (copied) * code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h (copied) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged pickup branch into presentation3 branch. Seems to be working ... Thu, 27 May 2010 20:47:23 GMT solex [6997] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) formationflight as good as finished for now Thu, 27 May 2010 20:44:10 GMT dafrick [6996] * code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation3/src/libraries/core/GUIManager.h (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation3/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/presentation3/src/orxonox/interfaces/Rewardable.h (modified) Loads of changes. 1) PickupInventory should now be working even for ... Thu, 27 May 2010 20:38:08 GMT scheusso [6995] * data/trunk/packs/skybox.zip (modified) added simpleskybox (created with test_stars.oxw and skybox generator) Thu, 27 May 2010 20:31:25 GMT scheusso [6994] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/test_stars.oxw (copied) * code/branches/presentation3/data/particle/fog.particle (copied) * code/branches/presentation3/src/libraries/core/Core.cc (modified) * code/branches/presentation3/src/modules/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/designtools (copied) * code/branches/presentation3/src/modules/designtools/CMakeLists.txt (copied) * code/branches/presentation3/src/modules/designtools/CreateStars.cc (copied) * code/branches/presentation3/src/modules/designtools/CreateStars.h (copied) * code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h (copied) * code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc (copied) * code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h (copied) * code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h (modified) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h (modified) merged skybox2 branch to presentation merger branch Thu, 27 May 2010 20:26:19 GMT hallerja [6993] * data/contentcreation/pps/JanHaller/IonTurret_Base.blend (added) * data/contentcreation/pps/JanHaller/IonTurret_Base.png (added) * data/contentcreation/pps/JanHaller/IonTurret_Cannon.blend (added) * data/contentcreation/pps/JanHaller/IonTurret_Cannon.png (added) * data/contentcreation/pps/JanHaller/Missile1.blend (added) * data/contentcreation/pps/JanHaller/Missile1.png (added) * data/contentcreation/pps/JanHaller/Missile1_Scene.blend (added) * data/contentcreation/pps/JanHaller/Missile1_Scene.blend1 (added) * data/contentcreation/pps/JanHaller/MissileLauncher1.blend (added) * data/contentcreation/pps/JanHaller/MissileLauncher1.png (added) * data/contentcreation/pps/JanHaller/MissileLauncher_Scene.jpg (added) * data/contentcreation/pps/JanHaller/Missile_Scene.png (added) * data/contentcreation/pps/JanHaller/PlasmaDrop.blend (added) * data/contentcreation/pps/JanHaller/PlasmaDrop.png (added) * data/contentcreation/pps/JanHaller/PlasmaDrop_Scene.blend (added) * data/contentcreation/pps/JanHaller/PlasmaDrop_Scene.blend1 (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Base.blend (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Base.png (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Cannon.blend (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Cannon.png (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Scene.blend (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Scene.blend1 (added) * data/contentcreation/pps/JanHaller/PlasmaTurret_Scene.png (added) * data/contentcreation/pps/JanHaller/TealPlasmaDrop.png (added) Added new weapon models and textures (new version of the previously ... Thu, 27 May 2010 20:23:41 GMT hallerja [6992] * data/contentcreation/pps/JanHaller/Missile.blend (deleted) * data/contentcreation/pps/JanHaller/Missile.png (deleted) * data/contentcreation/pps/JanHaller/MissileLauncher.blend (deleted) * data/contentcreation/pps/JanHaller/MissileLauncher.png (deleted) * data/contentcreation/pps/JanHaller/MissileTexture - Kopie.png (deleted) * data/contentcreation/pps/JanHaller/MissileTexture.png (deleted) * data/contentcreation/pps/JanHaller/PlasmaDrop.blend (deleted) * data/contentcreation/pps/JanHaller/PlasmaDrop.png (deleted) * data/contentcreation/pps/JanHaller/TealPlasmaDrop.png (deleted) * data/contentcreation/pps/JanHaller/Turret1.blend (deleted) * data/contentcreation/pps/JanHaller/Turret1.blend1 (deleted) * data/contentcreation/pps/JanHaller/Turret1.png (deleted) * data/contentcreation/pps/JanHaller/Turret1_Pilar.blend (deleted) * data/contentcreation/pps/JanHaller/Turret1_Pilar.png (deleted) * data/contentcreation/pps/JanHaller/Turret2.blend (deleted) * data/contentcreation/pps/JanHaller/Turret2.blend1 (deleted) * data/contentcreation/pps/JanHaller/Turret2.png (deleted) * data/contentcreation/pps/JanHaller/Turret2.xcf (deleted) * data/contentcreation/pps/JanHaller/Turret2_Pilar.blend (deleted) * data/contentcreation/pps/JanHaller/Turret2_Pilar.png (deleted) Removed old files (mostly renamed, discarding file history) Thu, 27 May 2010 20:16:08 GMT gasserlu [6991] * code/branches/ai/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/DroneController.cc (modified) * code/branches/ai/src/orxonox/controllers/DroneController.h (modified) * code/branches/ai/src/orxonox/worldentities/Drone.cc (modified) * code/branches/ai/src/orxonox/worldentities/Drone.h (modified) drone smooth flight mode & minmaxDistance, multiple drones possible Thu, 27 May 2010 19:23:07 GMT scheusso [6990] * code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified) changed weapon damage and added fire mode 3 (use with fire 3) the ... Thu, 27 May 2010 19:04:21 GMT gionc [6989] * code/branches/skybox2/data/particle/fog.particle (modified) updated particle Effects Thu, 27 May 2010 19:03:52 GMT gionc [6988] * code/branches/skybox2/data/levels/test_stars.oxw (modified) updated StarCreator level Thu, 27 May 2010 18:46:00 GMT jo [6987] * code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw (modified) * code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) additional infomassages, improved level Thu, 27 May 2010 17:52:28 GMT solex [6986] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai/src/orxonox/controllers/NewHumanController.cc (modified) nearly finished formationflight Thu, 27 May 2010 17:15:42 GMT ebeier [6985] * code/branches/ppspickups3/data/levels/includes/pickups.oxi (modified) added PickupInventory-definitions for existing pickups. Thu, 27 May 2010 17:11:36 GMT scheusso [6984] * code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc (modified) fix in hudradar which caused sigabrts when using a gametype Thu, 27 May 2010 17:09:48 GMT decapitb [6983] * data/trunk/materials/scripts/hs-w01_reduced.material (modified) * data/trunk/models (modified) corrected material script for hsw01_reduced Thu, 27 May 2010 17:08:12 GMT rgrieder [6982] * code/branches/presentation3/data/defaultConfig/keybindings.ini (modified) Removed 'openMap' keybinding (it was removed and therefore caused ... Thu, 27 May 2010 17:07:54 GMT decapitb [6981] * code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified) added hsw01_reduced to assff, should improve fps Thu, 27 May 2010 17:05:36 GMT ebeier [6980] * code/branches/ppspickups3/data/levels/includes/pickups.oxi (modified) * code/branches/ppspickups3/data/levels/pickup.oxw (modified) * code/branches/ppspickups3/data/levels/pickup_pps_invi.oxw (deleted) * code/branches/ppspickups3/data/levels/pickup_ppstest1.oxw (deleted) * code/branches/ppspickups3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) created more pickup representations, prepared pickup-level for ... Thu, 27 May 2010 16:44:21 GMT ebeier [6979] * data/trunk/gui/imagesets/PickupInventory.imageset (modified) updated imageset of pickups to include all currently available pickups Thu, 27 May 2010 16:39:59 GMT solex [6978] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) consle commands Thu, 27 May 2010 16:18:27 GMT cdaniel [6977] * code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (added) Quest level updated Thu, 27 May 2010 15:14:31 GMT gionc [6976] * data/trunk/materials/scripts/PE_materials.material (modified) added smoke material Thu, 27 May 2010 15:13:29 GMT gionc [6975] * data/trunk/materials/textures/smoke4.tga (added) Added smoke texture Thu, 27 May 2010 15:05:10 GMT gionc [6974] * code/branches/skybox2/data/levels/test_stars.oxw (added) added test level for starCreator Thu, 27 May 2010 15:04:03 GMT gionc [6973] * code/branches/skybox2/data/particle/fog.particle (added) added particle effect Thu, 27 May 2010 14:58:35 GMT gionc [6972] * code/branches/skybox2/src/modules/designtools/CreateStars.cc (modified) updated StarCreator Thu, 27 May 2010 13:58:24 GMT sfluecki [6971] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified) Final changes in HUDNavigation. marker are now working and are ... Thu, 27 May 2010 13:41:20 GMT gnadler [6970] * code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc (modified) updated collisionsize but needs more adjustments Thu, 27 May 2010 13:33:15 GMT gnadler [6969] * code/branches/rocket2/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.h (modified) Wed, 26 May 2010 20:09:54 GMT hallerja [6968] * data/contentcreation/pps/JanHaller/Missile.blend (modified) * data/contentcreation/pps/JanHaller/Missile.png (modified) * data/contentcreation/pps/JanHaller/MissileLauncher.blend (modified) * data/contentcreation/pps/JanHaller/MissileLauncher.png (modified) * data/contentcreation/pps/JanHaller/PlasmaDrop.blend (modified) * data/contentcreation/pps/JanHaller/PlasmaDrop.png (added) * data/contentcreation/pps/JanHaller/TealPlasmaDrop.png (added) * data/contentcreation/pps/JanHaller/Turret1.blend (modified) * data/contentcreation/pps/JanHaller/Turret1.png (modified) * data/contentcreation/pps/JanHaller/Turret1_Pilar.blend (modified) * data/contentcreation/pps/JanHaller/Turret1_Pilar.png (added) * data/contentcreation/pps/JanHaller/Turret2.blend (modified) * data/contentcreation/pps/JanHaller/Turret2.png (modified) * data/contentcreation/pps/JanHaller/Turret2_Pilar.blend (modified) * data/contentcreation/pps/JanHaller/Turret2_Pilar.png (modified) New weapon model/texture modifications Wed, 26 May 2010 18:43:18 GMT dafrick [6967] * code/branches/pickup5 (deleted) Removing branch, since it's outdated and was never used. Wed, 26 May 2010 14:28:14 GMT gnadler [6966] * code/branches/rocket2/data/levels/tutorial.oxw (modified) * code/branches/rocket2/data/particle/simplerocketfire.particle (added) * code/branches/rocket2/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket2/src/modules/weapons/RocketController.h (modified) * code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) * code/branches/rocket2/src/orxonox/controllers/DroneController.cc (modified) * code/branches/rocket2/src/orxonox/graphics/Model.cc (modified) now rocket slows and then finally stops after a given number of ticks ... Mon, 24 May 2010 14:59:23 GMT dafrick [6965] * code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified) * code/branches/presentation3/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified) Cleaned up in PickupInventory, to be able to improve it at a later stage. Sat, 22 May 2010 18:43:39 GMT scheusso [6964] * code/branches/presentation3/src/libraries/network/packet/ClassID.cc (modified) * code/branches/presentation3/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) fix in ClassID (thanks reto) fix in Rocket small improvements in ... Sat, 22 May 2010 17:26:52 GMT youngk [6963] * data/trunk/AUTHORS (modified) * data/trunk/audio/ambient/eightbit (added) * data/trunk/audio/ambient/eightbit/AlphaCentauri.ogg (added) * data/trunk/audio/ambient/eightbit/Asteroid_rocks.ogg (added) * data/trunk/audio/ambient/eightbit/Earth.ogg (added) * data/trunk/audio/ambient/eightbit/Fight1.ogg (added) * data/trunk/audio/ambient/eightbit/Ganymede.ogg (added) * data/trunk/audio/ambient/eightbit/Jupiter.ogg (added) * data/trunk/audio/ambient/eightbit/Mars.ogg (added) * data/trunk/audio/ambient/eightbit/Nebula_metal.ogg (added) * data/trunk/audio/ambient/eightbit/mainmenu.ogg (added) Finally! I cleared all licensing uncertainties concerning the sound I ... Sat, 22 May 2010 17:23:31 GMT youngk [6962] * code/branches/sound5/src/orxonox/MoodManager.cc (modified) Easter Egg. Yank "setmood eightbit" into the console. Let's hope it ... Fri, 21 May 2010 16:50:07 GMT scheusso [6961] * code/branches/presentation3/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation3/src/orxonox/Level.cc (modified) * code/branches/presentation3/src/orxonox/Scene.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified) fixed to make everything network-compliant again Fri, 21 May 2010 16:49:29 GMT scheusso [6960] * code/branches/presentation3/src/libraries/network/packet/ClassID.cc (modified) can't imagine how this worked so long Fri, 21 May 2010 14:06:04 GMT jo [6959] * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) bug removed - should be playable now Fri, 21 May 2010 13:19:42 GMT solex [6958] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) ai: introduced masteraction and console commands Fri, 21 May 2010 12:11:47 GMT scheusso [6957] * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.cc (deleted) * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.h (deleted) * code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (deleted) * code/branches/presentation3/src/orxonox/controllers/DroneController.h (deleted) * code/branches/presentation3/src/orxonox/gametypes/Testgame.cc (deleted) * code/branches/presentation3/src/orxonox/gametypes/Testgame.h (deleted) * code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.cc (deleted) * code/branches/presentation3/src/orxonox/worldentities/Drone.h (deleted) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.cc (deleted) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.h (deleted) deleting some unnesseccary files Fri, 21 May 2010 11:06:59 GMT scheusso [6956] * code/branches/rocket2/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) further improvements Fri, 21 May 2010 10:53:57 GMT jo [6955] * code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw (added) uploading the dynamicmatch-level Fri, 21 May 2010 10:41:31 GMT jo [6954] * code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo (added) * code/branches/dynamicmatch/src/modules/overlays/hud/GametypeFadingMessage.cc (added) * code/branches/dynamicmatch/src/modules/overlays/hud/GametypeFadingMessage.h (added) * code/branches/dynamicmatch/src/modules/overlays/hud/GametypeStaticMessage.cc (added) * code/branches/dynamicmatch/src/modules/overlays/hud/GametypeStaticMessage.h (added) uploading new created files Fri, 21 May 2010 08:30:42 GMT scheusso [6953] * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) now the bots can shoot again Fri, 21 May 2010 08:26:31 GMT scheusso [6952] * code/branches/rocket2 (copied) creating new rocket2 branch Fri, 21 May 2010 08:25:27 GMT scheusso [6951] * code/branches/presentation3 (modified) * code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/presentation3/data/levels/tutorial.oxw (modified) * code/branches/presentation3/data/particle/rocketfire2.particle (copied) * code/branches/presentation3/src/modules/weapons/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/weapons/RocketController.cc (copied) * code/branches/presentation3/src/modules/weapons/RocketController.h (copied) * code/branches/presentation3/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (copied) * code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.cc (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.h (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied) * code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied) * code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/controllers/DroneController.cc (copied) * code/branches/presentation3/src/orxonox/controllers/DroneController.h (copied) * code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation3/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/presentation3/src/orxonox/gametypes/Testgame.cc (copied) * code/branches/presentation3/src/orxonox/gametypes/Testgame.h (copied) * code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/worldentities/Drone.cc (copied) * code/branches/presentation3/src/orxonox/worldentities/Drone.h (copied) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.cc (copied) * code/branches/presentation3/src/orxonox/worldentities/RocketDrone.h (copied) merged rocket branch into presentation3 and cleaned up some things ... Fri, 21 May 2010 07:40:14 GMT scheusso [6950] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) steering of the rocket now working, but oscilating control ... Fri, 21 May 2010 07:36:01 GMT scheusso [6949] * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) this should fix the steering function of the SimpleRocket changed ... Fri, 21 May 2010 07:33:13 GMT scheusso [6948] * code/branches/rocket/src/orxonox/controllers/NewHumanController.cc (modified) somes fixes/changes in NewHumanController Fri, 21 May 2010 06:36:32 GMT scheusso [6947] * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed a bug which caused a segfault when shooting a rocket Thu, 20 May 2010 20:46:15 GMT dafrick [6946] * code/branches/presentation3/data/levels/princessaeryn.oxw (modified) * code/branches/presentation3/data/levels/questsystem2.oxw (modified) Small thing that I forgot (and probably should mention as well). ... Thu, 20 May 2010 20:36:48 GMT dafrick [6945] * code/branches/presentation3/src/modules/questsystem/AddQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/AddQuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/AddReward.cc (modified) * code/branches/presentation3/src/modules/questsystem/CompleteQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/FailQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/presentation3/src/modules/questsystem/Quest.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestDescription.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestNotification.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestNotification.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/Notification.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.h (modified) * code/branches/presentation3/src/orxonox/interfaces/NotificationListener.h (modified) A lot of cleanup, mostly increasing output levels, which means, that ... Thu, 20 May 2010 19:43:45 GMT dafrick [6944] * code/branches/presentation3/data/levels/quest_test.oxw (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.h (modified) No more seg-faults when restarting a game, quests still not working ... Thu, 20 May 2010 19:04:46 GMT gnadler [6943] * code/branches/rocket/data/levels/tutorial.oxw (modified) * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) Thu, 20 May 2010 18:30:38 GMT scheusso [6942] * code/branches/presentation3 (modified) * code/branches/presentation3/data/gui/layouts/InGamePickupHUD.layout (copied) * code/branches/presentation3/data/gui/scripts/InGamePickupHUD.lua (copied) * code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h (modified) * code/branches/presentation3/src/orxonox/Radar.cc (modified) * code/branches/presentation3/src/orxonox/Radar.h (modified) * code/branches/presentation3/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation3/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarListener.h (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation3/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/overlays/Map.cc (deleted) * code/branches/presentation3/src/orxonox/overlays/Map.h (deleted) * code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified) merging hudelements into presentation3 and reducing (or increasing) ... Thu, 20 May 2010 18:17:16 GMT scheusso [6941] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) don't exactly know why, but this resolves the problem of the wrong ... Thu, 20 May 2010 17:38:53 GMT dafrick [6940] * code/branches/presentation3/src/modules/questsystem/AddQuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/branches/presentation3/src/modules/questsystem/Quest.cc (modified) * code/branches/presentation3/src/modules/questsystem/Quest.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestHint.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestItem.h (modified) * code/branches/presentation3/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestManager.h (modified) Resolved issue with the Questsystem causing a segfault when a level ... Thu, 20 May 2010 14:39:03 GMT cdaniel [6939] * code/branches/presentation3/data/levels/quest_test.oxw (modified) Quest level updated Thu, 20 May 2010 14:35:48 GMT dafrick [6938] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) * code/branches/presentation3/src/libraries/core/Template.cc (modified) * code/branches/presentation3/src/libraries/core/Template.h (modified) Resolved issue with lod-template. Now, template inherit the ... Thu, 20 May 2010 14:34:49 GMT decapitb [6937] * code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (added) * code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h (added) * code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/graphics/Model.h (modified) Predefined Armature-Animated Models supported. Thu, 20 May 2010 14:10:54 GMT gionc [6936] * code/branches/skybox2/src/modules/designtools/CreateStars.cc (modified) * code/branches/skybox2/src/modules/designtools/CreateStars.h (modified) updated StarCreator Thu, 20 May 2010 12:50:59 GMT dafrick [6935] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (modified) * code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified) Some changed in a level also in Triggers... Thu, 20 May 2010 12:45:03 GMT cdaniel [6934] * code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified) Fixed Include file destination (For Visual Studio under Windows) Thu, 20 May 2010 12:40:53 GMT scheusso [6933] * code/branches/presentation3/src/orxonox/LevelManager.cc (modified) make sure this won't happen again Thu, 20 May 2010 12:38:40 GMT scheusso [6932] * code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified) this way the default values will not be set when applying this template Thu, 20 May 2010 11:51:27 GMT erwin [6931] * code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/sound5/src/orxonox/sound/SoundStreamer.h (modified) Merged changes from local sandbox to sound5 Thu, 20 May 2010 11:11:11 GMT dave [6930] * data/trunk/materials/scripts/swallow_material.material (added) * data/trunk/materials/textures/swallow_tex.tga (added) * data/trunk/models/swallow_mat.mesh (added) new ship