From d36387088cb9338aa4484a7e6e82bfe69defa1e2 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 17 Apr 2010 21:00:10 +0200 Subject: [PATCH] fix lots of CRLFs --- .gitattributes | 6 +- Docs/basics.html | 756 +++--- Docs/compile-settings.txt | 100 +- Docs/egyptsoc/egyptsoc_readme.txt | 122 +- Docs/eventlog.txt | 342 +-- Docs/faq.html | 706 ++--- Docs/htmlfiles/style.css | 856 +++--- Docs/irc.html | 212 +- Docs/mapdownload.txt | 196 +- Docs/mapping.txt | 1006 +++---- Docs/nexuiz.game | 24 +- Docs/say-esc.html | 268 +- Docs/scorelog.txt | 88 +- .../application/DemoRecorderApplication.java | 916 +++---- .../application/DemoRecorderException.java | 26 +- .../application/DemoRecorderUtils.java | 190 +- .../application/NDRPreferences.java | 132 +- .../application/RecorderJobPoolExecutor.java | 96 +- .../application/democutter/DemoCutter.java | 440 ++-- .../democutter/DemoCutterException.java | 28 +- .../democutter/DemoCutterUtils.java | 80 +- .../application/democutter/DemoPacket.java | 204 +- .../application/jobs/EncoderJob.java | 48 +- .../application/jobs/RecordJob.java | 1278 ++++----- .../application/jobs/RecordsDoneJob.java | 34 +- .../application/plugins/EncoderPlugin.java | 138 +- .../plugins/EncoderPluginException.java | 28 +- .../com/nexuiz/demorecorder/main/Driver.java | 36 +- .../demorecorder/ui/DemoRecorderUI.java | 40 +- .../ui/swinggui/ApplyTemplateDialog.java | 350 +-- .../demorecorder/ui/swinggui/JobDialog.java | 1474 +++++------ .../ui/swinggui/NexuizUserDirFilter.java | 62 +- .../ui/swinggui/PreferencesDialog.java | 390 +-- .../ui/swinggui/RecordJobTemplate.java | 226 +- .../demorecorder/ui/swinggui/StatusBar.java | 172 +- .../demorecorder/ui/swinggui/SwingGUI.java | 2308 ++++++++--------- .../RecordJobTemplatesTableModel.java | 484 ++-- .../tablemodels/RecordJobsTableModel.java | 408 +-- .../ShowErrorDialogExceptionHandler.java | 42 +- .../ui/swinggui/utils/SwingGUIUtils.java | 52 +- .../ui/swinggui/utils/XProperties.java | 864 +++--- .../main/src/main/resources/about.html | 40 +- .../main/resources/help/DemoRecorderHelp.hs | 84 +- .../resources/help/DemoRecorderHelpIndex.xml | 8 +- .../resources/help/DemoRecorderHelpTOC.xml | 76 +- .../main/resources/help/JHelpDev Project.xml | 62 +- .../help/html/advanced-how-it-works.html | 154 +- .../help/html/advanced-prelim-stop.html | 46 +- .../help/html/advanced-table-settings.html | 52 +- .../resources/help/html/advanced-topics.html | 36 +- .../resources/help/html/apply_templates.html | 154 +- .../resources/help/html/basic_tutorial.html | 338 +-- .../main/resources/help/html/changelog.html | 104 +- .../help/html/compat-limitations.html | 110 +- .../src/main/resources/help/html/credits.html | 54 +- .../src/main/resources/help/html/faq.html | 200 +- .../resources/help/html/introduction.html | 56 +- .../src/main/resources/help/html/license.html | 30 +- .../main/resources/help/html/open-save.html | 54 +- .../help/html/plugin-architecture.html | 162 +- .../help/html/plugin-virtualdub.html | 326 +-- .../main/resources/help/html/preferences.html | 128 +- .../main/resources/help/html/templates.html | 138 +- .../NexuizDemoRecorder/plugins/sample/pom.xml | 68 +- .../plugins/impl/sample/SamplePlugin.java | 404 +-- ...recorder.application.plugins.EncoderPlugin | 2 +- .../impl/virtualdub/VirtualDubPlugin.java | 710 ++--- ...recorder.application.plugins.EncoderPlugin | 2 +- readme.html | 200 +- server/readme.txt | 104 +- server/server.cfg | 246 +- 71 files changed, 9688 insertions(+), 9688 deletions(-) diff --git a/.gitattributes b/.gitattributes index edd30fd6..67420ef0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -95,8 +95,8 @@ makespr32 crlf=input *.mapinfo crlf=input *.m crlf=input *.md3 -crlf -diff -*.md5anim crlf=input -*.md5mesh crlf=input +*.md5anim -crlf +*.md5mesh -crlf *.mdl -crlf -diff *.med crlf=input *.mf crlf=input @@ -124,7 +124,7 @@ PkgInfo crlf=input *.pm crlf=input *.png -crlf -diff POSITIONS -crlf -diff -*.proj crlf=input +*.proj -crlf *.properties crlf=input *.psd -crlf -diff *.py crlf=input 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::