]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 261bc00 22cd565)
Merge branch 'master' into Mario/domination_roundbased
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)
Conflicts:
qcsrc/common/constants.qh

1  2 
gamemodes.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/notifications.qh patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/gamemode_domination.qc patch | diff1 | diff2 | blob | history
qcsrc/server/teamplay.qc patch | diff1 | diff2 | blob | history

diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/common/notifications.qh
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/mutators/gamemode_domination.qc
index 07f1b805b2e51e652e38e36597806c3e88804b13,a6d737205c493a6f83d0e0ffdc85f1b89063a686..2569a49d3188c49c57dca27cb5c1c3f8e5559aec
--- 1/qcsrc/server/mutators/gamemode_domination.qc
--- 2/qcsrc/server/mutators/gamemode_domination.qc
+++ b/qcsrc/server/mutators/gamemode_domination.qc
@@@ -632,11 -492,8 +632,11 @@@ void dom_Initialize(
  
  MUTATOR_DEFINITION(gamemode_domination)
  {
 +      MUTATOR_HOOK(GetTeamCount, dom_GetTeamCount, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(reset_map_players, dom_ResetMap, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(PlayerSpawn, dom_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientConnect, dom_ClientConnect, CBC_ORDER_ANY);
-       MUTATOR_HOOK(HavocBot_ChooseRule, dom_BotRoles, CBC_ORDER_ANY);
+       MUTATOR_HOOK(HavocBot_ChooseRole, dom_BotRoles, CBC_ORDER_ANY);
  
        MUTATOR_ONADD
        {
diff --cc qcsrc/server/teamplay.qc
Simple merge