From 3988689ac141b17e5da2afa4fc6797914319d917 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Tue, 22 Apr 2008 03:30:26 +0000 Subject: [PATCH] Changed multiplayer menus to adapt new vote/master changes. Updated changelog. git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1821 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus_multiplayer.cfg | 64 ++++++++++++++++-------------------- source/ChangeLog.txt | 10 ++++-- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index 279cb92a..45e9b646 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -1,48 +1,40 @@ newmenu multiplayer -menuitem "Join Game" "showmenu server" -menuitem "Join LAN Game" "lanconnect" -menuitem "Update Servers" "updatefrommaster;showmenu server" -menuitem "Disconnect" "disconnect" -menuitem "Vote" "showmenu gamemode" -menuitem "Chat" "saycommand" -menuitem "Team Chat" "saycommand %" -menuitem "VoiceCom" "showmenu voicecom" -menuitem "Server Operator" "showmenu [server operator]" +menuitem "Join a server" "showmenu server" +menuitem "Update servers" "updatefrommaster; showmenu server" +menuitem "Join LAN Game" "lanconnect" +menuitem "Disconnect" "disconnect" +menuitem "Server voting..." [ showmenu "Server voting" ] +menuitem "Chat" "saycommand" +menuitem "Team Chat" "saycommand %" +menuitem "VoiceCom" "showmenu voicecom" +newmenu "Server voting" -newmenu gamemode +menuitem "Vote to change mode/map" "showmenu Gamemode" +menuitem "Vote to change mastermode" "showmenu Mastermode" +menuitem "Vote to force a team change" [ showmenu "force team" ] +menuitem "Vote to kick a player" [showmenu "kick player"] +menuitem "Vote to ban a player" [showmenu "ban player"] +menuitem "Vote to remove bans" "removebans" -menuitem "Team Deathmatch" "mode 0; showmenu maps" -menuitem "Deathmatch" "mode 2; showmenu maps" -menuitem "Team Survivor" "mode 4; showmenu maps" -menuitem "Survivor" "mode 3; showmenu maps" -menuitem "Capture the Flag" "mode 5; showmenu maps_ctf" -menuitem "Pistol Frenzy" "mode 6; showmenu maps" +newmenu Gamemode + +menuitem "Team Deathmatch" "mode 0; showmenu maps" +menuitem "Deathmatch" "mode 2; showmenu maps" +menuitem "Team Survivor" "mode 4; showmenu maps" +menuitem "Survivor" "mode 3; showmenu maps" +menuitem "Capture the Flag" "mode 5; showmenu maps_ctf" +menuitem "Pistol Frenzy" "mode 6; showmenu maps" menuitem "Last Swiss Standing" "mode 9; showmenu maps" -menuitem "One Shot, One Kill" "mode 10; showmenu maps" -menuitem "Team One Shot, One Kill" "mode 11; showmenu maps" - -newmenu "server operator" - -menuitem "Claim Master" "setmaster 1" -menuitem "Give Up Master" "setmaster 0" -menuitem "Claim Admin" "saycommand /setadmin 1 myPassword" -menuitem "Give Up Admin" "setadmin 0" -menuitem "" "" -menuitem "Set Mastermode" "showmenu mastermode" -menuitem "Change Mode/Map" "showmenu gamemode" -menuitem "Force Team Change" [showmenu "force team"] -menuitem "Kick Player" [showmenu "kick player"] -menuitem "Ban Player" [showmenu "ban player"] -menuitem "Remove Bans" "removebans" -menuitem "Give Master" [showmenu "give master"] +menuitem "One Shot, One Kill" "mode 10; showmenu maps" +menuitem "Team One Shot, One Kill" "mode 11; showmenu maps" -newmenu mastermode +newmenu Mastermode -menuitem "Open" "mastermode 0" -menuitem "Private" "mastermode 1" +menuitem "Unlock the server (open)" "mastermode 0" +menuitem "Lock the server (private)" "mastermode 1" newmenu voicecom 1 1 diff --git a/source/ChangeLog.txt b/source/ChangeLog.txt index 3304da33..dd81a985 100644 --- a/source/ChangeLog.txt +++ b/source/ChangeLog.txt @@ -25,7 +25,6 @@ NEW STUFF! * New netcode with various new features and changes. * Muzzle flashes. * OpenAL support (Allows for 5.1 surround sound). -* Bullet ricochet sounds. * Brand new mapmodels made by Toca. @@ -35,7 +34,7 @@ Feature changes: * Map menu shows ALL maps in the maps directory. * Dropflag support. * Whois command. -* Sauer mapsounds backport. +* Sauerbraten ambient map-sounds backport. * Auto-getmap and CFG sending. * New (C#) masterserver. * CSL (cube server lister) support. @@ -52,6 +51,9 @@ Feature changes: * Bullethole sound effects. * Cursor now makes a nice flickering effect. * Sliders, checkboxes and text-inputs now available for menus. +* There is no more "master" (setmaster 1) system, as the voting system has taken its place. +* Menu sounds. +* Bullet ricochet sounds. Small Changes: @@ -67,6 +69,7 @@ Small Changes: * Wider server-list. * Reset binds command. * Reset all settings command. +* HUDgun, etc doesn't appear while in editmode. Bugs (from 0.93) fixes: @@ -77,4 +80,7 @@ Bugs (from 0.93) fixes: * "Unknown" servers now show as "empty". * Forceteam/autoteam/team change issues fixed. * HUD gun no longer appears to go through walls. +* Fixed reloading while scoping issue. +* "hideradar 0" doesn't disable the minimap anymore. +* Scope is always drawn at correct aspect ratio now.