From: Rudolf Polzer Date: Mon, 26 Apr 2010 09:10:20 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~482^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=740a38b25a4637627123304d6355a355376a1979;hp=ef35235811287ea777c208252d49f626ede8c44f Merge branch 'master' of ssh://git.xonotic.org/xonotic --- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..fb9e9b14 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,179 @@ +*.7z -crlf -diff +*.aft crlf=input +*.aliases crlf=input +all crlf=input +*.animinfo crlf=input +*.aps -crlf -diff +*.ase -crlf +*.bat -crlf +*.bgs crlf=input +*.blend -crlf -diff +*.bmp -crlf -diff +branch-manager crlf=input +BSDmakefile crlf=input +bsp2ent crlf=input +*.bsp -crlf -diff +*.cache -crlf -diff +*.cbp -crlf +*.cbp -crlf -diff +*.c crlf=input +*.cfg crlf=input +*.cg crlf=input +ChangeLog crlf=input +CHANGES crlf=input +COMPILING crlf=input +*.conf crlf=input +CONTRIBUTORS crlf=input +COPYING crlf=input +*.cpp crlf=input +*.css crlf=input +Current -crlf -diff +*.cvsignore crlf=input +*.cvswrappers crlf=input +*.db -crlf -diff +*.default crlf=input +*.def crlf=input +*.dem -crlf -diff +*.dev -crlf +*.dll -crlf -diff +DOCS -crlf -diff +*.dot crlf=input +DoxyConfig crlf=input +Doxyfile crlf=input +*.doxygen crlf=input +*.dpm -crlf -diff +*.dsp -crlf +*.dsw -crlf +*.dtd crlf=input +*.dylib -crlf -diff +*.EncoderPlugin crlf=input +*.ent -crlf +*.form crlf=input +*.framegroups crlf=input +*.game crlf=input +gendox crlf=input +gendoxfunctions crlf=input +genDoxyfile crlf=input +*.gif -crlf -diff +*.gitattributes crlf=input +git-branch-manager crlf=input +git-filter-index crlf=input +git-filter-repository crlf=input +*.gitignore crlf=input +git-pullall crlf=input +git-split-repository crlf=input +git-svn-checkout crlf=input +git-svn-update crlf=input +git-update-octopus crlf=input +*.glp crlf=input +*.glsl crlf=input +GPL crlf=input +*.hardwired crlf=input +*.h crlf=input +*.hs crlf=input +*.html crlf=input +*.html-part crlf=input +*.icns -crlf -diff +*.ico -crlf -diff +*.idsoftware crlf=input +*.inc crlf=input +*.instantaction crlf=input +*.java crlf=input +*.jhm crlf=input +*.jnlp crlf=input +*.jpg -crlf -diff +*.jsmooth crlf=input +LGPL crlf=input +LICENSE crlf=input +*.lmp -crlf -diff +*.loaders crlf=input +*.lso -crlf -diff +makefile crlf=input +Makefile crlf=input +*.makespr32 crlf=input +makespr32 crlf=input +*.map -crlf +*.mapinfo crlf=input +*.m crlf=input +*.md3 -crlf -diff +*.md5anim -crlf +*.md5mesh -crlf +*.mdl -crlf -diff +*.med crlf=input +*.mf crlf=input +*.mid -crlf -diff +*.mk crlf=input +*.mmpz -crlf -diff +*.modinfo crlf=input +*.modules crlf=input +nexuiz-map-compiler crlf=input +nexuiz-osx-agl crlf=input +nexuiz-osx-sdl crlf=input +*.nib -crlf +*.obj -crlf +OFFSETS -crlf -diff +*.ogg -crlf -diff +*.options crlf=input +pangorc crlf=input +*.patch crlf=input +*.patchsets crlf=input +*.pcx -crlf -diff +*.pk3 -crlf -diff +PkgInfo crlf=input +*.pl crlf=input +*.plist crlf=input +*.pm crlf=input +*.png -crlf -diff +POSITIONS -crlf -diff +*.proj -crlf +*.properties crlf=input +*.psd -crlf -diff +*.py crlf=input +*.q3map1 crlf=input +*.qc crlf=input +*.qdt crlf=input +*.qh crlf=input +*.rb crlf=input +*.rc2 crlf=input +*.rc -crlf +*.readme crlf=input +README crlf=input +*.rtlights -crlf -diff +SCHEMA crlf=input +*.scm crlf=input +SDL -crlf -diff +SDLMain.m crlf=input +*.shader crlf=input +*.sh crlf=input +*.skin crlf=input +*.sln -crlf +*.sounds crlf=input +*.sp2 -crlf -diff +*.spr32 -crlf -diff +*.spr -crlf -diff +*.src crlf=input +*.strings crlf=input +*.strip crlf=input +strip crlf=input +*.svg -crlf -diff +*.TAB -crlf -diff +*.tga -crlf -diff +TMAP -crlf -diff +todo crlf=input +TODO crlf=input +*.ttf -crlf -diff +*.TTF -crlf -diff +*.txt crlf=input +*.TXT crlf=input +*.vcproj -crlf +*.wav -crlf -diff +*.waypoints -crlf -diff +*.width crlf=input +*.workspace -crlf +*.xcf -crlf -diff +*.xlink crlf=input +*.xml crlf=input +*.xpm crlf=input +*.zip -crlf -diff +zipdiff crlf=input +*.zym -crlf -diff diff --git a/.gitignore b/.gitignore index 042cc4d1..51e98a05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ darkplaces fteqcc div0-gittools +netradiant diff --git a/Docs/basics.html b/Docs/basics.html index fed325b8..fbe2d50f 100644 --- a/Docs/basics.html +++ b/Docs/basics.html @@ -1,378 +1,378 @@ - - - - - - - -Nexuiz - A free open-source fast paced first person shooter (FPS) for Windows, Linux and OSX - - - - -
-
- - - -
- -
- - + + + + + + + +Nexuiz - A free open-source fast paced first person shooter (FPS) for Windows, Linux and OSX + + + + +
+
+ + + +
+ +
+ + diff --git a/Docs/compile-settings.txt b/Docs/compile-settings.txt index 851432c5..847f7cb9 100644 --- a/Docs/compile-settings.txt +++ b/Docs/compile-settings.txt @@ -1,50 +1,50 @@ -This file contains the q3map2 compile settings used to compile the maps that are part of Nexuiz. -There are also compile-scripts for some maps (mapname.sh). -They can be found in your Nexuiz/data/maps folder - ------------- -Standard ------------- - -"...q3map2.exe" -meta "...nexuizmap.map" -"...q3map2.exe" -vis "...nexuizmap.bsp" -"...q3map2.exe" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 "...nexuizmap.bsp" - ------------- -Only update the entities. ------------- - -"...q3map2.exe" -onlyents "...nexuizmap.map" - ------------- -bloodprison.map ------------- - -"...q3map2.exe" -meta -samplesize 8 -mv 1000000 -mi 6000000 "...bloodprisonctf.map" -"...q3map2.exe" -scale 1.2 "...bloodprisonctf.bsp" -"...q3map2.exe" -vis "...bloodprisonctf.bsp" -"...q3map2.exe" -light -deluxe -fast -filter -deluxe -patchshadows -samples 3 "...bloodprisonctf.bsp" - ------------- -final_rage.map ------------- - -"...q3map2.exe" -meta -v -samplesize 8 -skyfix -np 50 "...final_rage.map" -"...q3map2.exe" -vis -v "...final_rage.map" -"...q3map2.exe" -light -deluxe -compensate 1.4 -fast -gamma 1.5 -patchshadows -areascale 1.5 -pointscale 2 -v -bounce 3 -bouncegrid "...final_rage.map" - ------------- -reslimed.map ------------- - -"...q3map2.exe" -meta -patchmeta -v "...reslimed.map" -"...q3map2.exe" -vis "...reslimed.bsp" -"...q3map2.exe" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 "...reslimed.bsp" - ------------- -strength.map ------------- - -"...q3map2.exe" -meta "...strength.map" -"...q3map2.exe" -vis "...strength.bsp" -"...q3map2.exe" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 "...strength.bsp" +This file contains the q3map2 compile settings used to compile the maps that are part of Nexuiz. +There are also compile-scripts for some maps (mapname.sh). +They can be found in your Nexuiz/data/maps folder + +------------ +Standard +------------ + +"...q3map2.exe" -meta "...nexuizmap.map" +"...q3map2.exe" -vis "...nexuizmap.bsp" +"...q3map2.exe" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 "...nexuizmap.bsp" + +------------ +Only update the entities. +------------ + +"...q3map2.exe" -onlyents "...nexuizmap.map" + +------------ +bloodprison.map +------------ + +"...q3map2.exe" -meta -samplesize 8 -mv 1000000 -mi 6000000 "...bloodprisonctf.map" +"...q3map2.exe" -scale 1.2 "...bloodprisonctf.bsp" +"...q3map2.exe" -vis "...bloodprisonctf.bsp" +"...q3map2.exe" -light -deluxe -fast -filter -deluxe -patchshadows -samples 3 "...bloodprisonctf.bsp" + +------------ +final_rage.map +------------ + +"...q3map2.exe" -meta -v -samplesize 8 -skyfix -np 50 "...final_rage.map" +"...q3map2.exe" -vis -v "...final_rage.map" +"...q3map2.exe" -light -deluxe -compensate 1.4 -fast -gamma 1.5 -patchshadows -areascale 1.5 -pointscale 2 -v -bounce 3 -bouncegrid "...final_rage.map" + +------------ +reslimed.map +------------ + +"...q3map2.exe" -meta -patchmeta -v "...reslimed.map" +"...q3map2.exe" -vis "...reslimed.bsp" +"...q3map2.exe" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 "...reslimed.bsp" + +------------ +strength.map +------------ + +"...q3map2.exe" -meta "...strength.map" +"...q3map2.exe" -vis "...strength.bsp" +"...q3map2.exe" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 "...strength.bsp" diff --git a/Docs/egyptsoc/egyptsoc_readme.txt b/Docs/egyptsoc/egyptsoc_readme.txt index 0bed9ea6..a457e02b 100644 --- a/Docs/egyptsoc/egyptsoc_readme.txt +++ b/Docs/egyptsoc/egyptsoc_readme.txt @@ -1,61 +1,61 @@ -============================================================ -Date: 13th August 2001. -file: tp-egyptian.zip -author: Sock -email: sock@planetquake.com -URL: http://www.planetquake.com/simland -New URL: http://www.simonoc.com/pages/materials/tpegypt/index.htm -Version: 1.5 - -============================================================ - -COPYRIGHT NOTICES ------------------ - -If you use any of these Egyptian shader/textures I kindly ask -YOU to give me credit for my work within your README file or -TEXT file distributed with your map/mod. - -============================================================ - -Testing of Shaders ------------------- - -* All of the shaders included with this texture pack have been - tested with Q3 point release 1.27g. - -============================================================ - -Instructions for using the Egyptian Texture Pack ---------------------------------------------------- - -** You must have installed the Q3 editor tools first ** - -1. Extract the tp-egyptian.zip file in the BASEQ3 directory. - This will create 6 texture directory under the - BASEQ3/TEXTURES directory as follows :- - - BASEQ3/TEXTURES/EGYPTSOC_FLOOR - BASEQ3/TEXTURES/EGYPTSOC_MAT - BASEQ3/TEXTURES/EGYPTSOC_SFX - BASEQ3/TEXTURES/EGYPTSOC_TRIM - BASEQ3/TEXTURES/EGYPTSOC_TRIMD - BASEQ3/TEXTURES/EGYPTSOC_WALL - -2. Goto the SCRIPTS sub-directory under the BASEQ3 - directory and find the following - file :- SHADERLIST.TXT. - -3. Open this file up in a text editor and add the - following line at the bottom of the file. - - EGYPTSOC - -4. Close the file and open Q3Radiant and you should - find on the texture menu the 1 new subdirectory. - -For a full explaination of each texture/shader please -refer to the website. - -Enjoy -Sock +============================================================ +Date: 13th August 2001. +file: tp-egyptian.zip +author: Sock +email: sock@planetquake.com +URL: http://www.planetquake.com/simland +New URL: http://www.simonoc.com/pages/materials/tpegypt/index.htm +Version: 1.5 + +============================================================ + +COPYRIGHT NOTICES +----------------- + +If you use any of these Egyptian shader/textures I kindly ask +YOU to give me credit for my work within your README file or +TEXT file distributed with your map/mod. + +============================================================ + +Testing of Shaders +------------------ + +* All of the shaders included with this texture pack have been + tested with Q3 point release 1.27g. + +============================================================ + +Instructions for using the Egyptian Texture Pack +--------------------------------------------------- + +** You must have installed the Q3 editor tools first ** + +1. Extract the tp-egyptian.zip file in the BASEQ3 directory. + This will create 6 texture directory under the + BASEQ3/TEXTURES directory as follows :- + + BASEQ3/TEXTURES/EGYPTSOC_FLOOR + BASEQ3/TEXTURES/EGYPTSOC_MAT + BASEQ3/TEXTURES/EGYPTSOC_SFX + BASEQ3/TEXTURES/EGYPTSOC_TRIM + BASEQ3/TEXTURES/EGYPTSOC_TRIMD + BASEQ3/TEXTURES/EGYPTSOC_WALL + +2. Goto the SCRIPTS sub-directory under the BASEQ3 + directory and find the following + file :- SHADERLIST.TXT. + +3. Open this file up in a text editor and add the + following line at the bottom of the file. + + EGYPTSOC + +4. Close the file and open Q3Radiant and you should + find on the texture menu the 1 new subdirectory. + +For a full explaination of each texture/shader please +refer to the website. + +Enjoy +Sock diff --git a/Docs/eventlog.txt b/Docs/eventlog.txt index 030ba52f..1152b434 100644 --- a/Docs/eventlog.txt +++ b/Docs/eventlog.txt @@ -1,171 +1,171 @@ -cvars: -______________ - - sv_eventlog master switch (default: 0) - sv_eventlog_files print frags, scores and captures for separate files each match (default: 0) - sv_eventlog_console print frags, scores and captures to serverconsole during the match (default: 1) - sv_logscores_bots choose whether bot are included in stats or not (default: 0) - - sv_eventlog_files_counter number of matches logged until now - sv_eventlog_files_nameprefix file name prefix to be used (default: nexuiz) - sv_eventlog_files_namesuffix file name extension to be used (default: .log) - sv_eventlog_files_timestamps prefix log lines in the files with :time events (default: 1) - -log format: -______________ - - :logversion:3 - :gamestart:_: - :gameinfo:mutators:LIST:mutator1:mutator2:... - - (note that mutators are listed by their cvar name with g_ removed, - unless such a cvar is 1 by default - then the mutator is listed with - a no_ prefix if the cvar is 0) - - :gameinfo:end - :join:::: - :join:::bot: - :name:: - :part: - :team::: - :kill:frag:::type=:items=:victimitems= - :kill:tk:::type=:items=:victimitems= - :kill:suicide:::type=:items= - :kill:accident:::type=:items= - :ctf:steal:: - :ctf:dropped:: - :ctf:pickup:: - :ctf:capture:: - :ctf:return:: - :ctf:returned: - :dom:taken:: - :keyhunt:capture::::: - :keyhunt:carrierfrag::::: - :keyhunt:collect::::: - :keyhunt:destroyed::::: - :keyhunt:destroyed_holdingkey::::: - :keyhunt:dropkey::::: - :keyhunt:losekey::::: - :keyhunt:push::::: - :keyhunt:pushed::::: - :scores:_: - :labels:player:,,... - :player:see-labels:,,...:::: - :player:see-labels:,,...::spectator:: - :labels:teamscores:,,... - :teamscores:see-labels:,,...: - :end - :restart - :gameover - :vote:suggested:: - :vote:keeptwo:::::::::...:didn't vote: - :vote:finished:::::::::...:didn't vote: - :vote:suggestion_accepted: - :vote:vcall:: - :vote:vyes::::: - :vote:vno::::: - :vote:vtimeout::::: - :vote:vstop: - :vote:vlogin: - :vote:vdo:: - :time: - :recordset::