From ad63dbdc83ab33c6250fb6be5e491d8edf25cd14 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Mon, 5 May 2008 10:43:46 +0000 Subject: [PATCH] Integration of "player setup" menu into the "settings" menu (Player setup menu is gone). Updated readme with driAn's "credits" changes. git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1879 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus.cfg | 4 +--- config/menus_settings.cfg | 28 +++++++++++++--------------- docs/README.xml | 17 ++++++----------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/config/menus.cfg b/config/menus.cfg index 5be1d0d7..34cb89f6 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -6,7 +6,6 @@ newmenu main menuitem "Multiplayer" "showmenu multiplayer" menuitem "Singleplayer" "showmenu singleplayer" -menuitem "Player Setup" "showmenu setup" menuitem "Settings" "showmenu settings" menuitem "Demo" "showmenu demo" menuitem "Editing" "showmenu editing" @@ -128,7 +127,6 @@ menuitem "DCP End-of-match music." "" menuitem "Toca Mapmodels." "" menuitem "Topher Some crosshairs." "" menuitem "leileilol Bullethole image." "" -menuitem "Kurt Keslar textures." "" menuitem "Steini Skyboxes." "" menuitem "wildweasel Vote sounds." "" menuitem "Tremulous team Gib sound." "" @@ -139,7 +137,7 @@ menuitem "Texture sources" "" menuitem "------------------"" menuitem "Articool, Boeck, Craig Fortune, Digital Flux, mayang.com, imageafter.com, " "" menuitem "Craig Fortune, Digital Flux, mayang.com, afflict.net, Rohrschach, Lemog 3D," "" -menuitem "Golgotha team, NOCTUA, Chris Zastrow, 3D Cafe." "" +menuitem "Golgotha team, NOCTUA, Chris Zastrow, 3D Cafe, Kurt Keslar." "" menuitem "" "" menuitem "Also thanks to kurtis84, player1, quase, exis, talou and others for testing." "" menuitem "Thanks to flowtron and exis for organising the 0.93 AssaultCube Release Cup." "" diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 60e4f2d1..7ffff1b8 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -1,13 +1,3 @@ -newmenu setup - -menuitemtextinput "Nickname: " "result $curname" "name $arg1" -menuitemslider "Team: " 0 1 "(curteam)" 1 "CLA RVSF" "alias newteam $arg1" -menuitem "" "" -menuitem "Select skin.." [showmenu (at [CLA RVSF] (curteam))] -menuitem "Select weapon.." "showmenu weapons" -menuitem "" "" -menuitem "[ OK ]" [team (at [CLA RVSF] $newteam)] - newmenu Crosshairs menudirlist "packages/misc/crosshairs" "png" "loadcrosshair (concatword $arg1 .png)" @@ -43,8 +33,14 @@ menuitem "Police" "skin 5" "chmenumdl RVSF playermodels/RVSF/06 all 50 newmenu settings -menuitem "Quick setup.." [ showmenu "quick setup" ] +menuitemtextinput "Nickname:" "result $curname" "name $arg1" +menuitemslider "Team: " 0 1 "(curteam)" 1 "CLA RVSF" "alias newteam $arg1" menuitem "" "" +menuitem "Select player skin.." [showmenu (at [CLA RVSF] (curteam))] +menuitem "Select weapon.." "showmenu weapons" +menuitem "Select crosshair.." "showmenu Crosshairs" +menuitem "" "" +menuitem "First-run settings.." [ showmenu "quick setup" ] menuitem "Keyboard/mouse controls.." "showmenu controls" menuitem "Video settings.." "showmenu video" menuitem "Sound settings.." "showmenu sound" @@ -52,17 +48,19 @@ menuitem "Game settings.." "showmenu ga menuitem "Head-Up display settings.." "showmenu HUD" menuitem "" "" menuitem "Delete and reset all settings.." [ showmenu "Are you sure you want to delete/reset ALL settings?" ] +menuitem "" +menuitem " [ OK ] " [ team (at [CLA RVSF] $newteam) ] newmenu "quick setup" -menuitemtextinput "Nickname: " "" "name $arg1" -menuitemtextinput "Resolution (Width): " "$scr_w" "scr_w $arg1" -menuitemtextinput "Resolution (Height): " "$scr_h" "scr_h $arg1" +menuitemtextinput "Nickname:" "" "name $arg1" +menuitemtextinput "Resolution (Width): " "$scr_w" "scr_w $arg1" +menuitemtextinput "Resolution (Height): " "$scr_h" "scr_h $arg1" menuitemslider "Mouse sensitivity: " 2 100 "($sensitivity)" 2 "" "sensitivity $arg1" menuitemslider "Graphics detail: " 1 4 "(getgfxq)" 1 "low medium good best" "new_gfx_quality $arg1" menuitemslider "Sound detail: " 1 3 "(getsoundq)" 1 "low medium high" "new_sound_quality $arg1" menuitem "" "" -menuitem " [ OK ] " "resetgl" +menuitem " [ OK ] " "resetgl" alias getgfxq [ if (= $minlod 200) [ result 4 ] [ diff --git a/docs/README.xml b/docs/README.xml index 79b2eb95..eeef570a 100644 --- a/docs/README.xml +++ b/docs/README.xml @@ -182,7 +182,7 @@ Adrian “driAn” Henke - Lead coder. + Lead coder, OpenAL, OpenGL, gameplay code @@ -203,7 +203,7 @@ Lee “eihrul” Salzman - Coder, Enet Library, Cube2 backporting. + Coder, OpenGL expert, Enet Library, Cube2 backporting. @@ -219,7 +219,7 @@ Flowtron - Universal team member, additional code, admin. + Universal team member, additional code, admin, community chief. @@ -381,14 +381,6 @@ Bullethole image. - - - Kurt Keslar - - - Dummy texture. - - Steini @@ -478,6 +470,9 @@
  • http://www.mayang.com
    • +
  • + Kurt Keslar +