# # ChangeLog for code/branches/lastmanstanding3/src # # Generated by Trac 1.0.9 # Dec 26, 2024, 6:58:30 AM Sun, 03 Apr 2011 16:05:20 GMT jo [8175] * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (modified) test. Sun, 03 Apr 2011 11:01:28 GMT jo [8170] * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.h (modified) Removed lock that triggered a bug. (the game didn't end) Implemented ... Wed, 16 Feb 2011 10:17:30 GMT scheusso [7903] * code/branches/lastmanstanding3/data/levels/lastManStanding.oxw (modified) * code/branches/lastmanstanding3/data/levels/lastTeamStanding.oxw (copied) * code/branches/lastmanstanding3/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/lastmanstanding3/data/overlays/lastTeamStandingHUD.oxo (added) * code/branches/lastmanstanding3/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h (modified) * code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.cc (added) * code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h (copied) * code/branches/lastmanstanding3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/lastmanstanding3/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/lastmanstanding3/src/orxonox/gametypes/Gametype.h (modified) * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (added) * code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.h (added) Merge branch 'jo-test' into lms3 Wed, 16 Feb 2011 09:14:04 GMT scheusso [7902] * code/branches/lastmanstanding3 (copied) creating new lastmanstanding branch Mon, 14 Feb 2011 22:21:33 GMT landauf [7896] * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) actually I believe the condition should be the other way round ...