# # ChangeLog for code/branches/presentation2012merge/src/libraries # # Generated by Trac 1.0.9 # Nov 22, 2024, 4:06:17 PM Sun, 17 Jun 2012 16:38:14 GMT landauf [9303] * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/src/libraries/core/Template.cc (modified) added warning if a template is used on a different type than it was ... Mon, 04 Jun 2012 20:50:28 GMT landauf [9279] * code/branches/presentation2012merge/src/libraries/core/Super.h (modified) * code/branches/presentation2012merge/src/libraries/core/XMLPort.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc (modified) use orxonox_cast instead of dynamic_cast wherever possible Sun, 03 Jun 2012 15:17:18 GMT landauf [9271] * code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake (modified) * code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/presentation2012merge/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/branches/presentation2012merge/data/levels/Spacerace2.oxw (modified) * code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (modified) * code/branches/presentation2012merge/data/levels/asteroidField.oxw (modified) * code/branches/presentation2012merge/data/levels/includes/asteroidField.lua (modified) * code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/presentation2012merge/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentation2012merge/data/levels/missionOne.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/tower.oxt (modified) * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentation2012merge/doc/api/groups/Portals.dox (modified) * code/branches/presentation2012merge/doc/api/groups/Weapons.dox (modified) * code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake (modified) * code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake (modified) * code/branches/presentation2012merge/src/external/enet/VERSION (modified) * code/branches/presentation2012merge/src/external/tolua/README_ORXONOX (modified) * code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/towerdefensereadme.txt (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.h (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Mission.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.h (modified) svn:eol-style native (no changes in code) Sun, 03 Jun 2012 13:38:49 GMT landauf [9266] * code/branches/presentation2012merge (copied) created branch from trunk to merge the cleanup of presentation2011 ... Wed, 21 Mar 2012 20:31:38 GMT dafrick [9050] * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) More elegant resolution of discrepancies between cegui 0.6 and 0.7.