From 6886be8694bdec08cea2291be86636aa32d4ab65 Mon Sep 17 00:00:00 2001 From: driAn Date: Sun, 3 Jun 2007 20:58:41 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1110 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/defaults.cfg | 12 ++++++++ config/docs.cfg | 3 +- config/menus.cfg | 59 +++++++++++++++++++++++-------------- config/sounds.cfg | 12 -------- docs/README.xml | 20 ++++++------- docs/knownissues.xml | 4 ++- docs/reference.xml | 9 ++++-- source/README.txt | 10 +++---- source/src/rendermodel.cpp | 2 +- source/src/savegamedemo.cpp | 3 -- 10 files changed, 75 insertions(+), 59 deletions(-) diff --git a/config/defaults.cfg b/config/defaults.cfg index 664e9e20..84cff9af 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -21,6 +21,8 @@ bind A left bind S backward bind D right +bind B "showmenu weapons" + alias primary [ weapon (currentprimary) ] alias secondary [ weapon 1 ] alias melee [ weapon 0 ] @@ -137,3 +139,13 @@ bind KP_PLUS "conskip -1000" //bind lalt "melee" alias timeremain [ echo time remaining: ($minutesremaining) ] + + +music ac.ogg + +alias start_intermission [ + // play once (1:40) + musicvol $maxmusicvol + fade 0 + sleep 10000 [ fade 1 ] +] \ No newline at end of file diff --git a/config/docs.cfg b/config/docs.cfg index 2d0340fe..6c73cfae 100644 --- a/config/docs.cfg +++ b/config/docs.cfg @@ -342,9 +342,10 @@ docremark [After changing this value, a "recalc" is needed to see the difference docident [map] [Loads up a map in the gamemode set previously by the 'mode' command.]; docargument [M] [name of the map to load] [string] [0]; -docremark [TODO: multiplayer voting]; +docremark [If connected to a multiplayer server, votes to load this map (others will have to type "map M" as well to agree with loading this map). To vote for a map with a specific mode, set the mode before you issue the map command (see multiplayer menu).]; docremark [A map given as "blah" refers to "packages/base/blah.cgz", "mypackage/blah" refers to "packages/mypackage/blah.cgz". At every map load, "config/default_map_settings.cfg" is loaded which sets up all texture definitions, etc. Everything defined in there can be overridden per package or per map by creating a "package.cfg" or "mapname.cfg" which contains whatever you want to do differently from the default.]; docremark [When the map finishes it will load the next map when one is defined, otherwise reloads the current map. You can define what map follows a particular map by making an alias like (in the map script): alias nextmap_blah1 blah2 (loads "blah2" after "blah1").]; +docremark [TODO: multiplayer voting]; docident [mastermode] [Sets the mastermode for the server.]; docargument [N] [the master mode] [0 (open), 1 (private)] [0]; diff --git a/config/menus.cfg b/config/menus.cfg index 4fa6d710..0bfecd10 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -203,7 +203,7 @@ alias genbotmaps [ ] ] -genbotmaps "ac_complex ac_mines ac_depot ac_desert ac_desert2" +genbotmaps "ac_complex ac_mines ac_depot ac_desert ac_desert2 ac_snow" newmenu "server operator" @@ -234,6 +234,7 @@ menuitem "Entities" "showmenu entities" menuitem "Pickups" "showmenu pickups" menuitem "Arches and slopes.." "showmenu arches" menuitem "Map operations.." "showmenu mapop" +menuitem "Bots" "showmenu botedit" menuitem "help..." "showmenu editkeys" @@ -407,15 +408,6 @@ menuitem "Newmap 256x256 cubes" "newmap 8" menuitem "Increase mapsize (2x)" "mapenlarge" menuitem "Set map title/author" "saycommand /mapmsg " -bind B "showmenu weapons" - -//newmenu items -//menubg "textures/makke/menu.jpg" - -//menuitem "Primary Weapon" "showmenu primary" -//menuitem "Secondary Weapon" "showmenu secondary" -//menuitem "Equipment" "showmenu equipment" - newmenu "weapons" menumdl weapons/assault/menu mapmodel 75 12 @@ -438,9 +430,12 @@ newmenu options menuitem "tweak minlod.. (higher = less popup, possibly lower fps)" "showmenu minlod" menuitem "tweak fpsrange.. (higher = possibly more popup)" "showmenu fpsrange" -menuitem "tweak water subdivision.." "showmenu watersubdiv" -menuitem "turn dynamic light/shadows off" "dynlight 0" -menuitem "tweak gamma.." "showmenu gamma" +menuitem "tweak water subdivision" "showmenu watersubdiv" +menuitem "tweak dynamic light/shadows" "showmenu dynlight" +menuitem "tweak water reflection" [showmenu "water reflection"] +menuitem "tweak dynamic player shadows" [showmenu "player shadows"] +menuitem "tweak gamma" "showmenu gamma" + newmenu gamma @@ -479,6 +474,20 @@ menuitem "subdivision 4 (medium quality)" "watersubdiv 4" menuitem "subdivision 8 (low quality)" "watersubdiv 8" menuitem "subdivision 16 (my 486 can do water too)" "watersubdiv 16" +newmenu dynlight + +menuitem "enable dynamic light/shadows" "dynlight 1" +menuitem "disable dynamic light/shadows" "dynlight 0" + +newmenu "water reflection" + +menuitem "enable water reflection" "waterrefract 1" +menuitem "disable water reflection" "waterrefract 0" + +newmenu "player shadows" + +menuitem "enable dynamic player shadows" "dynshadows 1" +menuitem "disable dynamic player shadows" "dynshadows 0" newmenu about @@ -500,6 +509,7 @@ menuitem "http://www.cubeengine.com/" "echo sorry no built-in web browser yet :) newmenu help menuitem "AssaultCube reference" "showmenu reference" +menuitem "search command" "saycommand /docfind yourSearchString" menuitem "default keys" "showmenu keys" menuitem "" "" menuitem "..for further information see the README" @@ -507,35 +517,35 @@ menuitem "..for further information see the README" newmenu keys -menuitem "r - reload Gun" "" +menuitem "left mouse button - attack" "" menuitem "right mouse button - use scope" "" +menuitem "R - reload Gun" "" menuitem "mousewheel up/down - cycle weapons" "" menuitem "" -menuitem "b - weapon menu" "" +menuitem "B - weapon menu" "" +menuitem "T - chat" newmenu credits -menuitem "Arghvark Project Leader" "" -menuitem " Concept, Coding" "" +menuitem "Arghvark Project Leader, Code" "" menuitem "driAn Lead Coder" "" menuitem "makkE Lead Artist" "" -menuitem "Verbal QA, Advisor, Lead Tester" "" menuitem " Maps, Models, Skins, Animation" "" menuitem " Sound, some Textures, 2D-Art" "" menuitem "Nieb Models, Hosting" "" menuitem "Mitaman Maps,Ressources" "" -menuitem "Rick Bots, Win32-Compiling" "" +menuitem "Verbal QA, Advisor, Lead Tester" "" +menuitem "Eihrul Coder, Enet Library, Cube2 backporting" menuitem "" menuitem "Thanks to:" "" -menuitem "Wouter van Oortmersson (Engine), DCP (Music)," "" +menuitem "Aardappel (Engine), Rick (Bots), absinth (AC for Mac)" "" menuitem "JCDPC (Laptop Model, Company), dtd (Hosting), Boeck" "" +menuitem "DCP (music), ac_stef (bug fixes)" menuitem "Ted Southard (DigitalFlux), Noctua Graphics, Arcitool," menuitem "Craig Fortune, 3dcafe, Rohrschach, lemong.fr," menuitem "Mayang.com, Chris Zastrow, imageafter.com (textures)" -alias master [ showmenu master ] - newmenu botedit @@ -553,3 +563,8 @@ menuitem "delpath1way1" menuitem "delpath1way2" menuitem "delpath2way1" menuitem "delpath2way2" +menuitem "wpvisible 1" +menuitem "wpflood" +menuitem "wpclear" +menuitem "wpsave" +menuitem "xhairwpsel 1" \ No newline at end of file diff --git a/config/sounds.cfg b/config/sounds.cfg index af9a47ba..02e24856 100755 --- a/config/sounds.cfg +++ b/config/sounds.cfg @@ -52,16 +52,4 @@ alias fade [ // 0=in, 1=out sleep (* $i 100) $s ] ] - -alias start_intermission [ - fade 0 - sleep 10000 [ fade 1 ] -] - -alias start_game [ - // play once (1:40) - music ac.ogg - musicvol $maxmusicvol - sleep 100000 [ fade 1 ] -] diff --git a/docs/README.xml b/docs/README.xml index 9d274fb6..d010f9c5 100644 --- a/docs/README.xml +++ b/docs/README.xml @@ -84,15 +84,12 @@
  • history - changes on this game
    • -
  • - tricks - a few AC tricks -

    • Online Resources

    - The AssaultCube Wiki contains additional documentation created by + The AssaultCube Wiki (work in progress) contains additional documentation created by the community.

    @@ -109,7 +106,7 @@ especially its FAQ might help.
  • - Visit the forum and use its search functionality. + Visit the Cube Engine forum and use its search functionality. If you don't find any useful stuff, post a detailed question there. Please respect the forum rules..
    • @@ -123,7 +120,7 @@