Merge branch 'terencehill/gameover_stuff' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 10 Dec 2016 06:13:34 +0000 (06:13 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 10 Dec 2016 06:13:34 +0000 (06:13 +0000)
commit429e52163f53e75b848135f076b77c4eb43935ac
treea17a783b37747291741efe3d19b58bbc67c8a45c
parent6939600bdd6a345120ac3e6cf98ac93e75a1ba72
parent47ea1f521d34feccae6adef8628a8dbc809e33cc
Merge branch 'terencehill/gameover_stuff' into 'master'

gameover stuff

* Assault: when the first round ends show the message "Objective destroyed in X minutes" and block the game for 5 seconds before starting the other round in order to show objective destruction
* When a round ends block players and switch to 3rd person view (affected game types: Clan Arena, Domination, Freeze Tag, Invasion, Onslaught)

Implementation details:
* intermission_running and gameover are now 2 different conditions
* if set gameover has the effect of blocking players and triggering 3rd person view (eventchase); server must reset (respawn) players and vehicles (round_handler takes care of it) when resetting gameover to false.

See merge request !368
12 files changed:
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/command/vote.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/player.qc
qcsrc/server/round_handler.qc