lp:~armagetronad-dev/armagetronad/trunk-armagetronad-warmup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work at revision 1124

Yann Kaiser: Approve on 2011-10-13

dlh: Pending requested 2011-09-03

Diff: 1426 lines (+488/-129)

18 files modified

NEWS (+15/-0)
language/english_base.txt (+27/-1)
src/Makefile.am (+2/-2)
src/engine/ePlayer.cpp (+128/-26)
src/engine/ePlayer.h (+3/-2)
src/engine/eSpawn.cpp (+15/-32)
src/engine/eSpawn.h (+9/-4)
src/engine/eTeam.cpp (+26/-0)
src/engine/eTeam.h (+14/-0)
src/protobuf/ePlayer.proto (+3/-1)
src/protobuf/gGame.proto (+3/-0)
src/tron/gArena.cpp (+30/-2)
src/tron/gArena.h (+13/-2)
src/tron/gCycle.cpp (+10/-20)
src/tron/gCycle.h (+2/-0)
src/tron/gGame.cpp (+172/-34)
src/tron/gGame.h (+9/-2)
src/tron/zone/zFortress.cpp (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1092. By Yann Kaiser on 2011-09-05

Fixed sg_allReady not resetting on new matches, documented /ready and ALL_READY, updated NEWS.

1091. By Yann Kaiser on 2011-09-03

ePlayerNetID::AddScore now supports showing a reason when there are no points to give. Also fixes those messages from showing up in warmup mode.

1090. By Yann Kaiser on 2011-09-03

Removed most teamwish messages in warmup mode

1089. By Yann Kaiser on 2011-09-03

Fixed WARMUP_MIN_READY_FRAC 1 not working.

1088. By Yann Kaiser on 2011-09-03

Allow quickleaving when using /teamleave

1087. By Yann Kaiser on 2011-09-03

Added ALL_READY, fixed players not quickjoining when they were dead, added notice when all teams are ready but there aren't enough players.

1086. By Yann Kaiser on 2011-09-03

Updated NEWS.

1085. By Yann Kaiser on 2011-09-03

New warmup mode and respawn fixes:
* Moved gSpawn to engine
* Teams now retain their spawnpoint for later respawning
* DO_WARMUP N>0 will make the game enter warmup mode after each N matches
  * In warmup mode, players can use the /ready command to set themselves ready and start the match
  * Team joins/switches are done instantly
  * By default, players respawn in warmup mode (WARMUP_RESPAWN_TIME)
  * The game starts when each team has ready/total > WARMUP_MIN_READY(0.51)
  * However, there should be at least WARMUP_MIN_PLAYERS(2) humans before the warmup can end
  * Readiness state is synced to clients so that newer ones can show an icon on the scoreboard

1084. By Yann Kaiser on 2011-09-01

Python3 fixes

1083. By Manuel Moos on 2011-08-29

Reading data also from directory given by environment variable ARMAGETRONAD_EXTRADATA.