Merge branch 'Melanosuchus/minigames' into Mario/combined_updates

Conflicts:
	_hud_descriptions.cfg
	qcsrc/client/command/cl_cmd.qc
	qcsrc/client/hud.qc
	qcsrc/client/hud.qh
	qcsrc/client/main.qc
	qcsrc/client/view.qc
	qcsrc/common/constants.qh
	qcsrc/common/minigames/cl_minigames.qc
	qcsrc/common/minigames/cl_minigames.qh
	qcsrc/common/minigames/cl_minigames_hud.qc
	qcsrc/common/minigames/minigame/all.qh
	qcsrc/common/minigames/minigame/nmm.qc
	qcsrc/common/minigames/minigame/ttt.qc
	qcsrc/common/minigames/minigames.qc
	qcsrc/common/minigames/minigames.qh
	qcsrc/common/minigames/sv_minigames.qc
	qcsrc/common/minigames/sv_minigames.qh
	qcsrc/common/notifications.qh
	qcsrc/server/autocvars.qh
	qcsrc/server/cl_client.qc
	qcsrc/server/cl_player.qc
	qcsrc/server/progs.src

diff --cc _hud_descriptions.cfg
index 5cabda2f6b118ad5208bb1529bb0a24a62e27b25,ab53df710f2f423e9cbd3995c0c0c4b2531ebb2c..79b89b86167ae53e9bedcf2f2089a25b60bea1c9
--- 1/_hud_descriptions.cfg
--- 2/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@@ -310,5 -310,43 +310,45 @@@ seta hud_panel_buffs_bg_color_team "" "
  seta hud_panel_buffs_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
  seta hud_panel_buffs_bg_border "" "if set to something else than \"\" = override default size of border around the background"
  seta hud_panel_buffs_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 +seta hud_panel_buffs_progressbar "" "use progressbar behind buff names"
 +seta hud_panel_buffs_progressbar_name "" "name of progressbar to use behind buff names"
+ 
+ seta hud_panel_minigameboard "" "enable/disable this panel"
+ seta hud_panel_minigameboard_pos "" "position of this panel"
+ seta hud_panel_minigameboard_size "" "size of this panel"
+ seta hud_panel_minigameboard_bg "" "if set to something else than \"\" = override default background"
+ seta hud_panel_minigameboard_bg_color "" "if set to something else than \"\" = override default panel background color"
+ seta hud_panel_minigameboard_bg_color_team "" "override panel color with team color in team based games"
+ seta hud_panel_minigameboard_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+ seta hud_panel_minigameboard_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+ seta hud_panel_minigameboard_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+ 
+ seta hud_panel_minigamestatus "" "enable/disable this panel"
+ seta hud_panel_minigamestatus_pos "" "position of this panel"
+ seta hud_panel_minigamestatus_size "" "size of this panel"
+ seta hud_panel_minigamestatus_bg "" "if set to something else than \"\" = override default background"
+ seta hud_panel_minigamestatus_bg_color "" "if set to something else than \"\" = override default panel background color"
+ seta hud_panel_minigamestatus_bg_color_team "" "override panel color with team color in team based games"
+ seta hud_panel_minigamestatus_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+ seta hud_panel_minigamestatus_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+ seta hud_panel_minigamestatus_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+ 
+ seta hud_panel_minigamehelp "" "enable/disable this panel"
+ seta hud_panel_minigamehelp_pos "" "position of this panel"
+ seta hud_panel_minigamehelp_size "" "size of this panel"
+ seta hud_panel_minigamehelp_bg "" "if set to something else than \"\" = override default background"
+ seta hud_panel_minigamehelp_bg_color "" "if set to something else than \"\" = override default panel background color"
+ seta hud_panel_minigamehelp_bg_color_team "" "override panel color with team color in team based games"
+ seta hud_panel_minigamehelp_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+ seta hud_panel_minigamehelp_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+ seta hud_panel_minigamehelp_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+ 
+ seta hud_panel_minigamemenu "" "enable/disable this panel"
+ seta hud_panel_minigamemenu_pos "" "position of this panel"
+ seta hud_panel_minigamemenu_size "" "size of this panel"
+ seta hud_panel_minigamemenu_bg "" "if set to something else than \"\" = override default background"
+ seta hud_panel_minigamemenu_bg_color "" "if set to something else than \"\" = override default panel background color"
+ seta hud_panel_minigamemenu_bg_color_team "" "override panel color with team color in team based games"
+ seta hud_panel_minigamemenu_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+ seta hud_panel_minigamemenu_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+ seta hud_panel_minigamemenu_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"

diff --cc defaultXonotic.cfg
Simple merge

diff --cc hud_luma.cfg
index ae0b5f0d972d70883f3da799fcee296a00014958,ec4e415f238e9fb6ddeee7a160072e3acac10c0a..896789b5e2747930788582841a41a64dfd8e6753
--- 1/hud_luma.cfg
--- 2/hud_luma.cfg
+++ b/hud_luma.cfg
@@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team "
  seta hud_panel_buffs_bg_alpha ""
  seta hud_panel_buffs_bg_border ""
  seta hud_panel_buffs_bg_padding ""
 +seta hud_panel_buffs_progressbar 1
 +seta hud_panel_buffs_progressbar_name "progressbar"
  
+ seta hud_panel_minigameboard "1"
+ seta hud_panel_minigameboard_pos "0.22 0.15"
+ seta hud_panel_minigameboard_size "0.50 0.60"
+ seta hud_panel_minigameboard_bg "border_small"
+ seta hud_panel_minigameboard_bg_color ""
+ seta hud_panel_minigameboard_bg_color_team ""
+ seta hud_panel_minigameboard_bg_alpha ""
+ seta hud_panel_minigameboard_bg_border ""
+ seta hud_panel_minigameboard_bg_padding ""
+ 
+ seta hud_panel_minigamestatus "1"
+ seta hud_panel_minigamestatus_pos "0.74 0.15"
+ seta hud_panel_minigamestatus_size "0.2 0.60"
+ seta hud_panel_minigamestatus_bg "border_small"
+ seta hud_panel_minigamestatus_bg_color ""
+ seta hud_panel_minigamestatus_bg_color_team ""
+ seta hud_panel_minigamestatus_bg_alpha ""
+ seta hud_panel_minigamestatus_bg_border ""
+ seta hud_panel_minigamestatus_bg_padding ""
+ 
+ seta hud_panel_minigamehelp "1"
+ seta hud_panel_minigamehelp_pos "0.22 0.78"
+ seta hud_panel_minigamehelp_size "0.50 0.20"
+ seta hud_panel_minigamehelp_bg ""
+ seta hud_panel_minigamehelp_bg_color ""
+ seta hud_panel_minigamehelp_bg_color_team ""
+ seta hud_panel_minigamehelp_bg_alpha ""
+ seta hud_panel_minigamehelp_bg_border ""
+ seta hud_panel_minigamehelp_bg_padding ""
+ 
+ seta hud_panel_minigamemenu "0"
+ seta hud_panel_minigamemenu_pos "0 0.26"
+ seta hud_panel_minigamemenu_size "0.2 0.49"
+ seta hud_panel_minigamemenu_bg "border_small"
+ seta hud_panel_minigamemenu_bg_color ""
+ seta hud_panel_minigamemenu_bg_color_team ""
+ seta hud_panel_minigamemenu_bg_alpha ""
+ seta hud_panel_minigamemenu_bg_border ""
+ seta hud_panel_minigamemenu_bg_padding ""
+ 
  menu_sync

diff --cc hud_luminos.cfg
index 4d95e94f7662d5c80acfaf3d7b08f0bb76b66256,d9e3fdfc9edb9aedc67881e684079da12f61a582..6bd8cf978380fe1c3481d361ea1a531b2126f125
--- 1/hud_luminos.cfg
--- 2/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team "
  seta hud_panel_buffs_bg_alpha ""
  seta hud_panel_buffs_bg_border ""
  seta hud_panel_buffs_bg_padding ""
 +seta hud_panel_buffs_progressbar 1
 +seta hud_panel_buffs_progressbar_name "progressbar"
  
+ seta hud_panel_minigameboard "1"
+ seta hud_panel_minigameboard_pos "0.22 0.15"
+ seta hud_panel_minigameboard_size "0.50 0.60"
+ seta hud_panel_minigameboard_bg "border_small"
+ seta hud_panel_minigameboard_bg_color ""
+ seta hud_panel_minigameboard_bg_color_team ""
+ seta hud_panel_minigameboard_bg_alpha ""
+ seta hud_panel_minigameboard_bg_border ""
+ seta hud_panel_minigameboard_bg_padding ""
+ 
+ seta hud_panel_minigamestatus "1"
+ seta hud_panel_minigamestatus_pos "0.74 0.15"
+ seta hud_panel_minigamestatus_size "0.2 0.60"
+ seta hud_panel_minigamestatus_bg "border_small"
+ seta hud_panel_minigamestatus_bg_color ""
+ seta hud_panel_minigamestatus_bg_color_team ""
+ seta hud_panel_minigamestatus_bg_alpha ""
+ seta hud_panel_minigamestatus_bg_border ""
+ seta hud_panel_minigamestatus_bg_padding ""
+ 
+ seta hud_panel_minigamehelp "1"
+ seta hud_panel_minigamehelp_pos "0.22 0.78"
+ seta hud_panel_minigamehelp_size "0.50 0.20"
+ seta hud_panel_minigamehelp_bg ""
+ seta hud_panel_minigamehelp_bg_color ""
+ seta hud_panel_minigamehelp_bg_color_team ""
+ seta hud_panel_minigamehelp_bg_alpha ""
+ seta hud_panel_minigamehelp_bg_border ""
+ seta hud_panel_minigamehelp_bg_padding ""
+ 
+ seta hud_panel_minigamemenu "0"
+ seta hud_panel_minigamemenu_pos "0 0.26"
+ seta hud_panel_minigamemenu_size "0.2 0.49"
+ seta hud_panel_minigamemenu_bg "border_small"
+ seta hud_panel_minigamemenu_bg_color ""
+ seta hud_panel_minigamemenu_bg_color_team ""
+ seta hud_panel_minigamemenu_bg_alpha ""
+ seta hud_panel_minigamemenu_bg_border ""
+ seta hud_panel_minigamemenu_bg_padding ""
+ 
  menu_sync

diff --cc hud_luminos_minimal.cfg
index e0a381c6f4fe9c7acbbaac030a3212bbf3832cac,67db42dfd14096ee4bca81782c312fbf3ee77575..b44a78862a2a8b0f2281abc6b422c94f43a791f1
--- 1/hud_luminos_minimal.cfg
--- 2/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team "
  seta hud_panel_buffs_bg_alpha ""
  seta hud_panel_buffs_bg_border ""
  seta hud_panel_buffs_bg_padding ""
 +seta hud_panel_buffs_progressbar 1
 +seta hud_panel_buffs_progressbar_name "progressbar"
  
+ seta hud_panel_minigameboard "1"
+ seta hud_panel_minigameboard_pos "0.22 0.15"
+ seta hud_panel_minigameboard_size "0.50 0.60"
+ seta hud_panel_minigameboard_bg "border_small"
+ seta hud_panel_minigameboard_bg_color ""
+ seta hud_panel_minigameboard_bg_color_team ""
+ seta hud_panel_minigameboard_bg_alpha ""
+ seta hud_panel_minigameboard_bg_border ""
+ seta hud_panel_minigameboard_bg_padding ""
+ 
+ seta hud_panel_minigamestatus "1"
+ seta hud_panel_minigamestatus_pos "0.74 0.15"
+ seta hud_panel_minigamestatus_size "0.2 0.60"
+ seta hud_panel_minigamestatus_bg "border_small"
+ seta hud_panel_minigamestatus_bg_color ""
+ seta hud_panel_minigamestatus_bg_color_team ""
+ seta hud_panel_minigamestatus_bg_alpha ""
+ seta hud_panel_minigamestatus_bg_border ""
+ seta hud_panel_minigamestatus_bg_padding ""
+ 
+ seta hud_panel_minigamehelp "1"
+ seta hud_panel_minigamehelp_pos "0.22 0.78"
+ seta hud_panel_minigamehelp_size "0.50 0.20"
+ seta hud_panel_minigamehelp_bg ""
+ seta hud_panel_minigamehelp_bg_color ""
+ seta hud_panel_minigamehelp_bg_color_team ""
+ seta hud_panel_minigamehelp_bg_alpha ""
+ seta hud_panel_minigamehelp_bg_border ""
+ seta hud_panel_minigamehelp_bg_padding ""
+ 
+ seta hud_panel_minigamemenu "0"
+ seta hud_panel_minigamemenu_pos "0 0.26"
+ seta hud_panel_minigamemenu_size "0.2 0.49"
+ seta hud_panel_minigamemenu_bg "border_small"
+ seta hud_panel_minigamemenu_bg_color ""
+ seta hud_panel_minigamemenu_bg_color_team ""
+ seta hud_panel_minigamemenu_bg_alpha ""
+ seta hud_panel_minigamemenu_bg_border ""
+ seta hud_panel_minigamemenu_bg_padding ""
+ 
  menu_sync

diff --cc hud_luminos_minimal_xhair.cfg
index 2d72b3cd41633ef007903a5abca354485892a373,f6067e7c53a8ed1509b599542f67c6b1f19a4aee..464f9b07c751a848b4bbcfdbcb99630457aec70e
--- 1/hud_luminos_minimal_xhair.cfg
--- 2/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team "
  seta hud_panel_buffs_bg_alpha ""
  seta hud_panel_buffs_bg_border ""
  seta hud_panel_buffs_bg_padding ""
 +seta hud_panel_buffs_progressbar 1
 +seta hud_panel_buffs_progressbar_name "progressbar"
  
+ seta hud_panel_minigameboard "1"
+ seta hud_panel_minigameboard_pos "0.22 0.15"
+ seta hud_panel_minigameboard_size "0.50 0.60"
+ seta hud_panel_minigameboard_bg "border_small"
+ seta hud_panel_minigameboard_bg_color ""
+ seta hud_panel_minigameboard_bg_color_team ""
+ seta hud_panel_minigameboard_bg_alpha ""
+ seta hud_panel_minigameboard_bg_border ""
+ seta hud_panel_minigameboard_bg_padding ""
+ 
+ seta hud_panel_minigamestatus "1"
+ seta hud_panel_minigamestatus_pos "0.74 0.15"
+ seta hud_panel_minigamestatus_size "0.2 0.60"
+ seta hud_panel_minigamestatus_bg "border_small"
+ seta hud_panel_minigamestatus_bg_color ""
+ seta hud_panel_minigamestatus_bg_color_team ""
+ seta hud_panel_minigamestatus_bg_alpha ""
+ seta hud_panel_minigamestatus_bg_border ""
+ seta hud_panel_minigamestatus_bg_padding ""
+ 
+ seta hud_panel_minigamehelp "1"
+ seta hud_panel_minigamehelp_pos "0.22 0.78"
+ seta hud_panel_minigamehelp_size "0.50 0.20"
+ seta hud_panel_minigamehelp_bg ""
+ seta hud_panel_minigamehelp_bg_color ""
+ seta hud_panel_minigamehelp_bg_color_team ""
+ seta hud_panel_minigamehelp_bg_alpha ""
+ seta hud_panel_minigamehelp_bg_border ""
+ seta hud_panel_minigamehelp_bg_padding ""
+ 
+ seta hud_panel_minigamemenu "0"
+ seta hud_panel_minigamemenu_pos "0 0.26"
+ seta hud_panel_minigamemenu_size "0.2 0.49"
+ seta hud_panel_minigamemenu_bg "border_small"
+ seta hud_panel_minigamemenu_bg_color ""
+ seta hud_panel_minigamemenu_bg_color_team ""
+ seta hud_panel_minigamemenu_bg_alpha ""
+ seta hud_panel_minigamemenu_bg_border ""
+ seta hud_panel_minigamemenu_bg_padding ""
+ 
  menu_sync

diff --cc hud_luminos_old.cfg
index 88c0d8f414c547d61a65ee5870a02c8d8549e7e4,45c6107c942cce0fe0c2e0d1cbd00020d802ef11..8892c72e28b375d5ad84d6e1f43f7954274de0be
--- 1/hud_luminos_old.cfg
--- 2/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team "
  seta hud_panel_buffs_bg_alpha ""
  seta hud_panel_buffs_bg_border ""
  seta hud_panel_buffs_bg_padding ""
 +seta hud_panel_buffs_progressbar 1
 +seta hud_panel_buffs_progressbar_name "progressbar"
  
+ seta hud_panel_minigameboard "1"
+ seta hud_panel_minigameboard_pos "0.22 0.15"
+ seta hud_panel_minigameboard_size "0.50 0.60"
+ seta hud_panel_minigameboard_bg "border_small"
+ seta hud_panel_minigameboard_bg_color ""
+ seta hud_panel_minigameboard_bg_color_team ""
+ seta hud_panel_minigameboard_bg_alpha ""
+ seta hud_panel_minigameboard_bg_border ""
+ seta hud_panel_minigameboard_bg_padding ""
+ 
+ seta hud_panel_minigamestatus "1"
+ seta hud_panel_minigamestatus_pos "0.74 0.15"
+ seta hud_panel_minigamestatus_size "0.2 0.60"
+ seta hud_panel_minigamestatus_bg "border_small"
+ seta hud_panel_minigamestatus_bg_color ""
+ seta hud_panel_minigamestatus_bg_color_team ""
+ seta hud_panel_minigamestatus_bg_alpha ""
+ seta hud_panel_minigamestatus_bg_border ""
+ seta hud_panel_minigamestatus_bg_padding ""
+ 
+ seta hud_panel_minigamehelp "1"
+ seta hud_panel_minigamehelp_pos "0.22 0.78"
+ seta hud_panel_minigamehelp_size "0.50 0.20"
+ seta hud_panel_minigamehelp_bg ""
+ seta hud_panel_minigamehelp_bg_color ""
+ seta hud_panel_minigamehelp_bg_color_team ""
+ seta hud_panel_minigamehelp_bg_alpha ""
+ seta hud_panel_minigamehelp_bg_border ""
+ seta hud_panel_minigamehelp_bg_padding ""
+ 
+ seta hud_panel_minigamemenu "0"
+ seta hud_panel_minigamemenu_pos "0 0.26"
+ seta hud_panel_minigamemenu_size "0.2 0.49"
+ seta hud_panel_minigamemenu_bg "border_small"
+ seta hud_panel_minigamemenu_bg_color ""
+ seta hud_panel_minigamemenu_bg_color_team ""
+ seta hud_panel_minigamemenu_bg_alpha ""
+ seta hud_panel_minigamemenu_bg_border ""
+ seta hud_panel_minigamemenu_bg_padding ""
+ 
  menu_sync

diff --cc hud_nexuiz.cfg
index f3d9180be8358244232da09e0c6040f5e8b8a873,a5af3c7df58ec5dab760bcbea2603d9c879b6e95..8c5f78cd12d078beb08b7bfa491f3d358d5e0718
--- 1/hud_nexuiz.cfg
--- 2/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team "
  seta hud_panel_buffs_bg_alpha ""
  seta hud_panel_buffs_bg_border ""
  seta hud_panel_buffs_bg_padding ""
 +seta hud_panel_buffs_progressbar 1
 +seta hud_panel_buffs_progressbar_name "progressbar"
  
+ seta hud_panel_minigameboard "1"
+ seta hud_panel_minigameboard_pos "0.22 0.15"
+ seta hud_panel_minigameboard_size "0.50 0.60"
+ seta hud_panel_minigameboard_bg "border_small"
+ seta hud_panel_minigameboard_bg_color ""
+ seta hud_panel_minigameboard_bg_color_team ""
+ seta hud_panel_minigameboard_bg_alpha ""
+ seta hud_panel_minigameboard_bg_border ""
+ seta hud_panel_minigameboard_bg_padding ""
+ 
+ seta hud_panel_minigamestatus "1"
+ seta hud_panel_minigamestatus_pos "0.74 0.15"
+ seta hud_panel_minigamestatus_size "0.2 0.60"
+ seta hud_panel_minigamestatus_bg "border_small"
+ seta hud_panel_minigamestatus_bg_color ""
+ seta hud_panel_minigamestatus_bg_color_team ""
+ seta hud_panel_minigamestatus_bg_alpha ""
+ seta hud_panel_minigamestatus_bg_border ""
+ seta hud_panel_minigamestatus_bg_padding ""
+ 
+ seta hud_panel_minigamehelp "1"
+ seta hud_panel_minigamehelp_pos "0.22 0.78"
+ seta hud_panel_minigamehelp_size "0.50 0.20"
+ seta hud_panel_minigamehelp_bg ""
+ seta hud_panel_minigamehelp_bg_color ""
+ seta hud_panel_minigamehelp_bg_color_team ""
+ seta hud_panel_minigamehelp_bg_alpha ""
+ seta hud_panel_minigamehelp_bg_border ""
+ seta hud_panel_minigamehelp_bg_padding ""
+ 
+ seta hud_panel_minigamemenu "0"
+ seta hud_panel_minigamemenu_pos "0 0.26"
+ seta hud_panel_minigamemenu_size "0.2 0.49"
+ seta hud_panel_minigamemenu_bg "border_small"
+ seta hud_panel_minigamemenu_bg_color ""
+ seta hud_panel_minigamemenu_bg_color_team ""
+ seta hud_panel_minigamemenu_bg_alpha ""
+ seta hud_panel_minigamemenu_bg_border ""
+ seta hud_panel_minigamemenu_bg_padding ""
+ 
  menu_sync

diff --cc qcsrc/client/command/cl_cmd.qc
index edb6d366d2a0393ef8f4f79ee3c26d4f83876649,ecd05c16f55bc5c3d49a7d7222775e110061b809..5ea800de535d79982e96cd5ecdd4a3805b814ad0
--- 1/qcsrc/client/command/cl_cmd.qc
--- 2/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@@ -309,7 -294,7 +309,7 @@@ void LocalCommand_hud(int request, int 
                        print("  'configname' is the name to save to for \"save\" action,\n");
                        print("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
                        print("  and 'layout' is how to organize the scoreboard columns for the set action.\n");
-                       print("  Full list of commands here: \"configure, quickmenu, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
 -                      print("  Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
++                      print("  Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
                        return;
                }
        }

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/hud.qh
Simple merge

diff --cc qcsrc/client/main.qc
index 3398066e82b6fcd79931ec56681976059b684c83,b21166f81e289ea8db4b3581dc5187df89b27651..b63b829e22b39f9d6e689cbcc72b800b9f17a236
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -218,10 -114,9 +218,12 @@@ void CSQC_Init(void
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
        CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
        CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
 +      CALL_ACCUMULATED_FUNCTION(RegisterEffects);
 +
 +      initialize_minigames();
  
+       initialize_minigames();
+ 
        WaypointSprite_Load();
  
        // precaches

diff --cc qcsrc/common/minigames/cl_minigames.qc
index f6af765b744b0f87eb2083f717d9b27e290aab86,0bac54c67863df0689c02310f485cdc51cfb4dbe..7ee7fca4c938b503e81a3706014d38adf1b1d80f
--- 1/qcsrc/common/minigames/cl_minigames.qc
--- 2/qcsrc/common/minigames/cl_minigames.qc
+++ b/qcsrc/common/minigames/cl_minigames.qc
@@@ -104,10 -105,9 +105,10 @@@ void deactivate_minigame(
  {
        if ( !active_minigame )
                return;
-       
++
        active_minigame.minigame_event(active_minigame,"deactivate");
        entity e = world;
-       while( (e = findentity(e, owner, self)) )
+       while( (e = findentity(e, owner, active_minigame)) )
                if ( e.minigame_autoclean )
                {
                        minigame_autoclean_entity(e);
@@@ -251,10 -255,13 +256,13 @@@ void ent_read_minigame(
        
        if ( minigame_ent )
                minigame_ent.minigame_event(minigame_ent,"network_receive",self,sf);
--      
-       dprint("CL Reading entity: ",ftos(num_for_edict(self)),
-               " classname:",self.classname," enttype:",ftos(self.enttype) );
-       dprint(" sf:",ftos(sf)," netname:",self.netname,"\n\n");
++
+       if ( sf & MINIG_SF_CREATE )
+       {
+               dprint("CL Reading entity: ",ftos(num_for_edict(self)),
+                       " classname:",self.classname," enttype:",ftos(self.enttype) );
+               dprint(" sf:",ftos(sf)," netname:",self.netname,"\n\n");
+       }
  }
  #undef ReadFloat
  #undef ReadString
@@@ -280,9 -287,8 +288,8 @@@ string minigame_getWrappedLine(float w
        
        if ( take_until > strlen(s) )
                take_until = strlen(s);
--      
-       float i;
-       for ( i = 0; i < take_until; i++ )
++
+       for ( int i = 0; i < take_until; i++ )
                if ( substring(s,i,1) == "\n" )
                {
                        take_until = i;

diff --cc qcsrc/common/minigames/cl_minigames_hud.qc
index 7df7609794339ca7a10a440219286d18486d889f,4bf4b1b3e1f5f898e88889f9436efaa2fdcb5d92..b418eb714c681b691f89b55d6b17daa3e584dd85
--- 1/qcsrc/common/minigames/cl_minigames_hud.qc
--- 2/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@@ -479,8 -484,7 +484,7 @@@ void HUD_MinigameMenu (
  
        HUD_MinigameMenu_DrawEntry(panel_pos,_("Minigames"),hud_fontsize*2,'0.25 0.47 0.72');
        panel_pos_y += hud_fontsize_y*2;
--      
-       entity e;
++
        vector color;
        vector offset;
        float itemh;

diff --cc qcsrc/common/minigames/minigame/all.qh
index ed4ccade0d99d0b7deaa25b1a62ec31c7270eaee,a63d3335fe47ce91e90c6b156cb2c38f9b0125f7..2505b142be14580942a76ce0d5915fce261159b2
--- 1/qcsrc/common/minigames/minigame/all.qh
--- 2/qcsrc/common/minigames/minigame/all.qh
+++ b/qcsrc/common/minigames/minigame/all.qh
@@@ -62,7 -63,7 +63,8 @@@ that .owner is set to the minigame sess
  
  #include "nmm.qc"
  #include "ttt.qc"
 +//#include "c4.qc"
+ #include "pong.qc"
  
  /**
   * Registration:
@@@ -73,10 -74,9 +75,11 @@@
  #define REGISTERED_MINIGAMES \
        MINIGAME(nmm, "Nine Men's Morris") \
        MINIGAME(ttt, "Tic Tac Toe") \
+       MINIGAME(pong, "Pong") \
        /*empty line*/
  
 +//MINIGAME(c4,  "Connect Four") \
 +
  /**
   * Set up automatic entity read/write functionality
   * To ensure that everything is handled automatically, spawn on the server using msle_spawn

diff --cc qcsrc/common/notifications.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
index 067a6e749725dd6d6021acc5fdeea9ba8238c747,e9c9e8615f9fa5f50ba73e4dd97c155fb8a6493f..31547fa6996593592148a00c4fb5cce62e2de9a6
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -17,23 -17,12 +17,25 @@@
  #include "weapons/hitplot.qh"
  #include "weapons/weaponsystem.qh"
  
 +#include "../common/animdecide.qh"
 +
 +#include "../common/effects.qh"
 +
  #include "../common/net_notice.qh"
 +#include "../common/physics.qh"
 +
 +#include "../common/triggers/subs.qh"
 +#include "../common/triggers/triggers.qh"
 +#include "../common/triggers/trigger/secret.qh"
 +
 +#include "../common/minigames/sv_minigames.qh"
  
+ #include "../common/minigames/sv_minigames.qh"
+ 
  #include "../common/monsters/sv_monsters.qh"
  
 +#include "../common/vehicles/sv_vehicles.qh"
 +
  #include "../warpzonelib/server.qh"
  
  float c1, c2, c3, c4;
@@@ -1584,13 -1388,11 +1586,13 @@@ void UpdateChatBubble(
                self.chatbubbleentity = spawn();
                self.chatbubbleentity.owner = self;
                self.chatbubbleentity.exteriormodeltoclient = self;
 +              self.chatbubbleentity.alpha = 1;
 +              self.chatbubbleentity.customizeentityforclient = ChatBubbleCustomize;
                self.chatbubbleentity.think = ChatBubbleThink;
                self.chatbubbleentity.nextthink = time;
 -              setmodel(self.chatbubbleentity, "models/misc/chatbubble.spr"); // precision set below
 +              setmodel(self.chatbubbleentity, "models/misc/chatbubble.md3"); // precision set below
                //setorigin(self.chatbubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1');
-               setorigin(self.chatbubbleentity, '0 0 15' + self.maxs.z * '0 0 1');
+               setorigin(self.chatbubbleentity, '0 0 15' + self.maxs_z * '0 0 1');
                setattachment(self.chatbubbleentity, self, "");  // sticks to moving player better, also conserves bandwidth
                self.chatbubbleentity.mdl = self.chatbubbleentity.model;
                //self.chatbubbleentity.model = "";

diff --cc qcsrc/server/g_world.qc
index d8d1d0a8a8fde123dfe076c16dc62671ceb60d1c,0bde6b2fcfa19fa0d619477968b0897b37c5a915..c6a5a0ae99676c9e4ba735d1e49afc5cec489cf5
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -633,10 -611,9 +633,12 @@@ void spawnfunc_worldspawn (void
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
        CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
 +      CALL_ACCUMULATED_FUNCTION(RegisterEffects);
 +
 +      initialize_minigames();
  
+       initialize_minigames();
+ 
        ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid));
  
        TemporaryDB = db_create();