# # ChangeLog for code/branches/lastmanstanding2/data # # Generated by Trac 1.0.9 # Nov 1, 2024, 7:34:21 AM Tue, 15 Feb 2011 14:38:54 GMT jo [7901] * code/branches/lastmanstanding2/data/levels/lastManStanding.oxw (modified) * code/branches/lastmanstanding2/data/levels/lastTeamStanding.oxw (modified) * code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/lastmanstanding2/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/branches/lastmanstanding2/src/modules/overlays/hud/GametypeStatus.h (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified) Finally working as intended. Tue, 15 Feb 2011 10:41:02 GMT jo [7899] * code/branches/lastmanstanding2/data/levels/lastManStanding.oxw (modified) * code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified) Level polishing. Fri, 03 Dec 2010 13:38:42 GMT dafrick [7716] * code/branches/lastmanstanding2/data/DefaultResources.oxr (modified) * code/branches/lastmanstanding2/src/libraries/core/GUIManager.cc (modified) * code/branches/lastmanstanding2/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Thu, 02 Dec 2010 22:26:05 GMT jo [7699] * code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified) Finally using the right branch - already compiling, but with memory- ... Thu, 02 Dec 2010 11:10:26 GMT dafrick [7697] * code/branches/lastmanstanding2/data/levels/lastTeamStanding.oxw (added) * code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (added) * code/branches/lastmanstanding2/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/lastmanstanding2/src/modules/overlays/hud/LastTeamStandingInfos.cc (added) * code/branches/lastmanstanding2/src/modules/overlays/hud/LastTeamStandingInfos.h (added) * code/branches/lastmanstanding2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (added) * code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (added) Manually merging changes in lastmanstanding branch to ... Thu, 02 Dec 2010 06:33:55 GMT dafrick [7696] * code/branches/lastmanstanding2 (copied) Creating new lastmanstanding branch. Wed, 01 Dec 2010 14:21:11 GMT dafrick [7690] * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) Adjusting some small thing that got forgotten while merging.