# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 25, 2024, 10:04:20 PM 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: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: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 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: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:10:49 GMT dave [6929] * code/trunk/data/levels/includes/weaponsettings_swallow.oxi (added) * code/trunk/data/levels/templates/spaceship_swallow.oxt (added) * code/trunk/data/levels/test_swallow.oxw (added) new ship Thu, 20 May 2010 09:33:07 GMT scheusso [6928] * code/branches/presentation3 (modified) * code/branches/presentation3/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (copied) * code/branches/presentation3/data/gui/layouts/ChatBox.layout (copied) * code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (copied) * code/branches/presentation3/data/gui/scripts/ChatBox.lua (copied) * code/branches/presentation3/src/libraries/network/ChatListener.cc (modified) * code/branches/presentation3/src/libraries/network/ChatListener.h (modified) * code/branches/presentation3/src/libraries/network/Host.h (modified) * code/branches/presentation3/src/libraries/network/packet/Chat.cc (modified) * code/branches/presentation3/src/libraries/network/packet/Chat.h (modified) * code/branches/presentation3/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/ChatHistory.cc (copied) * code/branches/presentation3/src/orxonox/ChatHistory.h (copied) * code/branches/presentation3/src/orxonox/ChatInputHandler.cc (copied) * code/branches/presentation3/src/orxonox/ChatInputHandler.h (copied) * code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (copied) * code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (copied) mergine chat2 into presentation merger branch Thu, 20 May 2010 08:28:10 GMT scheusso [6927] * code/branches/presentation3/src/orxonox/LevelManager.cc (modified) fix in levelmanager: if a template was assigned to the Level the ... Thu, 20 May 2010 08:23:22 GMT scheusso [6926] * code/branches/presentation3 (modified) * 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/presentationLOD.oxw (copied) * code/branches/presentation3/data/levels/presentationLODdif.oxw (copied) * code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified) * code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified) * code/branches/presentation3/data/levels/templates/lodinformation.oxt (copied) * code/branches/presentation3/src/libraries/core/BaseObject.cc (modified) * code/branches/presentation3/src/libraries/core/BaseObject.h (modified) * code/branches/presentation3/src/orxonox/Level.cc (modified) * code/branches/presentation3/src/orxonox/Level.h (modified) * code/branches/presentation3/src/orxonox/LevelManager.cc (modified) * code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (copied) * code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (copied) * code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) * code/branches/presentation3/src/orxonox/graphics/Model.h (modified) merging lod branch into presentation3 merger branch Tue, 18 May 2010 15:34:48 GMT rgrieder [6924] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) Clean up in HUDNavigation, no actual code changes. Tue, 18 May 2010 12:22:51 GMT rgrieder [6923] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) HUDNavigation: setFontName() when adding an object should resolve the ... Tue, 18 May 2010 07:34:53 GMT rgrieder [6922] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) Fixed bug in HUDNavigation destructor again. Mon, 17 May 2010 15:01:54 GMT jo [6921] * code/branches/dynamicmatch/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/dynamicmatch/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/dynamicmatch/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/dynamicmatch/src/orxonox/interfaces/GametypeMessageListener.h (modified) With additional tutorial messages in order to explain how the ... Mon, 17 May 2010 14:57:26 GMT stmathia [6920] * code/branches/presentation3/data/levels/Level(Deathmatch).oxw (added) * code/branches/presentation3/data/levels/Level(UnderAttack).oxw (added) * code/branches/presentation3/data/levels/mylevel.oxw (added) * code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified) Changes in level files. Addition to TemaDeathmatch, should now be ... Mon, 17 May 2010 14:45:50 GMT solex [6919] * 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) * code/branches/ai/src/orxonox/worldentities/ControllableEntity.cc (modified) finally some decent formation flying! Mon, 17 May 2010 14:36:18 GMT gasserlu [6918] * code/branches/ai/data/levels/pickup.oxw (modified) * 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/CMakeLists.txt (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) drone follows in realistic matter Mon, 17 May 2010 13:51:43 GMT scurcio [6917] * code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) final changes in struct for the objectMap Mon, 17 May 2010 13:50:30 GMT smerkli [6916] * code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified) added some comments, made reasonable-length lines ^-^ ready to merge. Mon, 17 May 2010 13:50:13 GMT scheusso [6915] * code/branches/lod/src/orxonox/graphics/Model.h (modified) fixed gcc error Mon, 17 May 2010 13:41:40 GMT sfluecki [6914] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) changed pair in HUDNavigation activeObjectListMap to Struct Mon, 17 May 2010 13:33:21 GMT scheusso [6913] * code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified) bugfix in HUDRadar which caused a segfault on exit (overlay element ... Mon, 17 May 2010 13:31:49 GMT scheusso [6912] * code/branches/presentation3 (copied) creating new presentation merger branch Mon, 17 May 2010 13:28:36 GMT kolibri7 [6911] * code/branches/lod/src/orxonox/graphics/Model.cc (modified) *deleted a default values function call Mon, 17 May 2010 13:22:10 GMT smerkli [6910] * code/branches/chat2/data/gui/layouts/ChatBox.layout (modified) * code/branches/chat2/src/orxonox/ChatHistory.cc (modified) * code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat2/src/orxonox/ChatInputHandler.h (modified) * code/branches/chat2/src/orxonox/graphics/ChatBox.cc (deleted) * code/branches/chat2/src/orxonox/graphics/ChatBox.h (deleted) Added final comments, getting ready for merge Mon, 17 May 2010 13:21:51 GMT kolibri7 [6909] * code/branches/lod/data/levels/empty_level.oxw (modified) * code/branches/lod/data/levels/gametype_asteroids.oxw (modified) * code/branches/lod/data/levels/teambasematchlevel.oxw (modified) * code/branches/lod/data/levels/teamdeathmatch.oxw (modified) * code/branches/lod/data/levels/templates/lodinformation.oxt (modified) * code/branches/lod/src/orxonox/Level.cc (modified) * code/branches/lod/src/orxonox/graphics/Model.cc (modified) * code/branches/lod/src/orxonox/graphics/Model.h (modified) *fully functional lod implementation *added file ... Mon, 17 May 2010 12:41:01 GMT freicy [6908] * code/branches/fps/data/levels/includes/weaponsettings_fps.oxi (modified) * code/branches/fps/data/levels/presentation_FS10.oxw (modified) * code/branches/fps/data/levels/templates/fps.oxt (modified) * code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) by Cyrill Frei Mon, 17 May 2010 12:36:42 GMT rgrieder [6907] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified) Fixed two bugs in HUDNavigation.cc and RadarViewable. Mon, 17 May 2010 11:22:26 GMT dafrick [6906] * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/triggers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (added) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (added) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) Added DistanceTriggerBeacon, which is a device which can be attached ... Sat, 15 May 2010 16:12:13 GMT gnadler [6905] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/RocketController.h (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/rocket/src/orxonox/controllers/DroneController.cc (modified) * code/branches/rocket/src/orxonox/controllers/DroneController.h (modified) * code/branches/rocket/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/rocket/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/rocket/src/orxonox/worldentities/Drone.cc (modified) rockets get target but moveToPosition function does not work correctly. Sat, 15 May 2010 13:24:06 GMT scheusso [6904] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) fixed missing include Sat, 15 May 2010 12:57:51 GMT gnadler [6903] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/RocketController.h (modified) * code/branches/rocket/src/orxonox/controllers/DroneController.cc (modified) * code/branches/rocket/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/rocket/src/orxonox/controllers/NewHumanController.h (modified) Cant assign Pawn* to WeakPtr. Sat, 15 May 2010 09:36:04 GMT gnadler [6902] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) no rocket is controlled by controller. accidentally deleted tick ... Sat, 15 May 2010 06:47:07 GMT dafrick [6901] * code/trunk/data/levels/pickup.oxw (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) Fixed PickupCollection. It works now the way it was intended and no ... Fri, 14 May 2010 10:41:04 GMT gnadler [6900] * code/branches/rocket/src/modules/weapons/RocketController.cc (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) rockentcontroller doesn't control the rocket it spawns itself. ... Thu, 13 May 2010 11:19:04 GMT scheusso [6899] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) some cleaning up still segfault when terminating Thu, 13 May 2010 10:02:14 GMT sfluecki [6898] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) changes in 'src/modules/overlays/hud/HUDNavigation'. ... Tue, 11 May 2010 12:56:32 GMT sfluecki [6897] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified) Updates in der reinitialisierung von HUDNavigation -> changes in ... Mon, 10 May 2010 15:02:26 GMT benedict [6896] * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) spamming the server Mon, 10 May 2010 14:57:42 GMT benedict [6895] * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) high on cpout Mon, 10 May 2010 14:52:34 GMT ebeier [6894] * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) cout again -.- Mon, 10 May 2010 14:49:45 GMT ebeier [6893] * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) more cout yeahhhhhh Mon, 10 May 2010 14:41:26 GMT ebeier [6892] * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) inserted cout for troubleshooting Mon, 10 May 2010 14:40:44 GMT gasserlu [6891] * code/branches/ai/data/levels/pickup.oxw (modified) * code/branches/ai/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/ai/src/orxonox/controllers/AIController.cc (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) DroneController modified, sameTeam() mod.// hack Mon, 10 May 2010 14:34:39 GMT smerkli [6890] * code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified) Mon, 10 May 2010 14:32:26 GMT solex [6888] * code/branches/ai/data/levels/teamdeathmatch.oxw (modified) * 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) formation flight: new formations Mon, 10 May 2010 14:30:01 GMT ebeier [6887] * code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (modified) small correction Mon, 10 May 2010 14:26:04 GMT sfluecki [6886] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) HUDNavigation constructor corrected Mon, 10 May 2010 14:24:18 GMT smerkli [6885] * code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat2/src/orxonox/ChatInputHandler.h (modified) Strage delete-button bug persists. Mon, 10 May 2010 14:23:29 GMT benedict [6884] * code/branches/ppspickups3/data/levels/includes/pickups.oxi (modified) * code/branches/ppspickups3/data/levels/pickup.oxw (modified) * code/branches/ppspickups3/data/levels/templates/pickup_representation_templates.oxt (modified) * code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.h (modified) * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.h (modified) did the shield pickup. upload for testing Mon, 10 May 2010 14:17:20 GMT freicy [6883] * code/branches/fps/data/levels/presentation_FS10.oxw (added) * code/branches/fps/data/levels/templates/fps.oxt (modified) * code/branches/fps/data/overlays/hudtamplates_fps.oxo (modified) * code/branches/fps/src/orxonox/controllers/NewHumanController.cc (modified) by cyrill Mon, 10 May 2010 14:14:28 GMT edwind [6882] * code/branches/fps/data/levels/fps_test.oxw (modified) * code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) commit by ed Mon, 10 May 2010 14:00:52 GMT kolibri7 [6881] * code/branches/lod/data/levels/gametype_underattack.oxw (modified) * code/branches/lod/data/levels/templates/lodinformation.oxt (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (modified) *lodLevel is a float now *gametype_underattack.oxw includes the ... Mon, 10 May 2010 13:58:08 GMT rgrieder [6880] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) HUDNavigation: Fixed a few bugs, add to background and fixed size issues. Mon, 10 May 2010 13:50:27 GMT smerkli [6879] * code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat2/src/orxonox/ChatInputHandler.h (modified) bugfixes, performance improvements. Mon, 10 May 2010 13:38:16 GMT scheusso [6878] * code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified) fixed sigabrt that happened when the rocket collided against anything Mon, 10 May 2010 13:35:48 GMT kolibri7 [6877] * code/branches/lod/data/levels/gametype_underattack.oxw (modified) * code/branches/lod/src/orxonox/Level.cc (modified) * code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/branches/lod/src/orxonox/graphics/Model.cc (modified) *everything works now; setting the lodlevels and also the XML-Port. ... Mon, 10 May 2010 13:18:14 GMT smerkli [6876] * code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout (modified) * code/branches/chat2/data/gui/layouts/ChatBox.layout (modified) * code/branches/chat2/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified) * code/branches/chat2/src/orxonox/ChatInputHandler.h (modified) Scrolling chat now works, discovered delete-button bug, fixing it now. Mon, 10 May 2010 13:02:52 GMT sfluecki [6875] * code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) ping & showGUI check done