From: Rudolf Polzer Date: Sat, 27 Aug 2011 15:08:30 +0000 (+0200) Subject: update gitattributes X-Git-Tag: xonotic-v0.5.0 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd14ff5643823377209b2d370c7866eb80baff37;p=xonotic%2Fxonotic-nexcompat.pk3dir.git update gitattributes --- diff --git a/.gitattributes b/.gitattributes index aecf250..bf8bf30 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,242 @@ * -crlf +*.0 -diff -crlf +*.1 crlf=input +*.3 crlf=input +*.7z -diff -crlf +*.ac crlf=input +*.a -diff -crlf +*.afm crlf=input +*.aft crlf=input +*.ai -diff -crlf +*.aliases crlf=input +all crlf=input +*.am crlf=input +*.animinfo crlf=input +*.aps -diff -crlf +*.asc -diff -crlf +*.ase -crlf +*.bat -crlf +*.bgs crlf=input +*.blend1 -diff -crlf +*.blend -diff -crlf +blind_id -diff -crlf +*.bmp -diff -crlf +branch-manager crlf=input +*.brand crlf=input +BSDmakefile crlf=input +bsp2ent crlf=input +*.bsp -diff -crlf +*.cache crlf=input +*.cbp -crlf +*.cbp -diff -crlf +*.c crlf=input +*.cfg crlf=input +*.cg crlf=input +ChangeLog crlf=input +CHANGES crlf=input +cjpeg -diff -crlf +COMPILING crlf=input +compress-texture crlf=input +*.conf crlf=input +CONTRIBUTORS crlf=input +COPYING crlf=input +*.cpp crlf=input +create crlf=input +*.cron crlf=input +crypto-keygen-standalone -diff -crlf +*.css crlf=input +*.cvswrappers crlf=input +*.d0ir crlf=input +*.d0pk -diff -crlf +*.db crlf=input +*.db.* crlf=input +*.def2ent crlf=input +*.default crlf=input +*.def crlf=input +*.dem -diff -crlf +*.dev -crlf +dir -diff -crlf +*.directory crlf=input +djpeg -diff -crlf +*.dll -diff -crlf +DOCS -diff -crlf +*.dot crlf=input +DoxyConfig crlf=input +doxyfile crlf=input +Doxyfile crlf=input +*.doxygen crlf=input +*.dpm -diff -crlf +*.dsp -crlf +*.dsw -crlf +*.dtd crlf=input +*.dylib -diff -crlf +empty -diff -crlf +*.EncoderPlugin crlf=input +*.ent crlf=input +etc_svc_git-daemon_run crlf=input +*.flac -diff -crlf +*.flp -diff -crlf +*.form crlf=input +*.framegroups crlf=input +*.fteqccfail -diff -crlf +*.game crlf=input +*.gdb crlf=input +gendox crlf=input +gendoxfunctions crlf=input +genDoxyfile crlf=input +*.gif -diff -crlf +*.gitattributes crlf=input +git-branch-manager crlf=input +git-filter-index crlf=input +git-filter-repository crlf=input +*.gitignore crlf=input +git-pk3-import crlf=input +git-pk3-merge crlf=input +git-pullall crlf=input +git-recurse 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-2 crlf=input +GPL-3 crlf=input +GPL crlf=input +*.hardwired crlf=input +*.h crlf=input +*.hs crlf=input +*.htaccess crlf=input +*.html crlf=input +*.html-part crlf=input +*.icns -diff -crlf +*.ico -diff -crlf +*.idl crlf=input +*.idsoftware crlf=input +*.inc crlf=input +*.in crlf=input +*.info-1 -diff -crlf +*.info-2 -diff -crlf +*.info -diff -crlf +*.inl crlf=input +*.iOS crlf=input +*.iqm -diff -crlf +*.java crlf=input +*.jhm crlf=input +*.jnlp crlf=input +jpegtran -diff -crlf +*.jpg -diff -crlf +*.jsmooth crlf=input +*.la crlf=input +LGPL crlf=input +LICENSE crlf=input +*.lmp -diff -crlf +*.loaders crlf=input +*.lso -diff -crlf +*.m4 crlf=input +makefile crlf=input +Makefile crlf=input +makespr32 crlf=input +*.map -crlf filter=mapclean +*.mapinfo crlf=input +*.m crlf=input +*.md3 -diff -crlf +*.md5anim -crlf +*.md5mesh -crlf +*.mdl -diff -crlf +*.med crlf=input +*.mf crlf=input +*.mid -diff -crlf +*.mk crlf=input +*.mkdir -diff -crlf +*.mmpz -diff -crlf +*.modules crlf=input +*.mp3 -diff -crlf +*.nib -crlf +*.obj -crlf +OFFSETS -diff -crlf +*.ogg -diff -crlf +*.options crlf=input +*.otf -diff -crlf +pangorc crlf=input +*.part crlf=input +*.patch crlf=input +*.patchsets crlf=input +*.pbxproj crlf=input +*.pc crlf=input +*.pfb -diff -crlf +*.pfm -diff -crlf +*.php crlf=input +*.pk3 -diff -crlf +PkgInfo crlf=input +*.pl crlf=input +*.plist crlf=input +*.pm crlf=input +*.png -diff -crlf +*.po crlf=input +POSITIONS -diff -crlf +*.pot crlf=input +*.proj -crlf +*.properties crlf=input +*.psd -diff -crlf +*.py crlf=input +*.q3map1 crlf=input +*.qc crlf=input +*.qdt crlf=input +*.qh crlf=input +*.rar -diff -crlf +*.rb crlf=input +*.rc2 crlf=input +*.rc -crlf +rdjpgcom -diff -crlf +*.readme crlf=input +README crlf=input +*.rtlights crlf=input +SCHEMA crlf=input +*.scm crlf=input +sdl-config crlf=input +SDL -diff -crlf +*.sfd -diff -crlf +*.shader crlf=input +*.sh crlf=input +*.skin crlf=input +*.sln -crlf +*.sounds crlf=input +*.sp2 -diff -crlf +*.spr32 -diff -crlf +*.spr -diff -crlf +*.src crlf=input +*.strings crlf=input +strip crlf=input +*.svg -diff -crlf +*.TAB -diff -crlf +*.tga -diff -crlf +TMAP -diff -crlf +todo crlf=input +TODO crlf=input +*.ttf -diff -crlf +*.txt crlf=input +*.txt.* crlf=input +update-shaderlists crlf=input +*.vbs -crlf +*.vcproj -crlf +*.vcxproj crlf=input +versionbuilder crlf=input +*.vhost crlf=input +*.wav -diff -crlf +*.waypoints crlf=input +*.width crlf=input +*.workspace -crlf +wrjpgcom -diff -crlf +*.xcf -diff -crlf +*.xlink crlf=input +*.xml crlf=input +xonotic-map-compiler-autobuild crlf=input +xonotic-map-compiler crlf=input +xonotic-map-screenshot crlf=input +xonotic-osx-sdl crlf=input +*.xpm crlf=input +*.xrns -diff -crlf +*.zip -diff -crlf +zipdiff crlf=input +*.zym -diff -crlf diff --git a/scripts/nexcompat-exosystem.shader b/scripts/nexcompat-exosystem.shader index 62a2a87..1b1dd01 100644 --- a/scripts/nexcompat-exosystem.shader +++ b/scripts/nexcompat-exosystem.shader @@ -1,44 +1,44 @@ -textures/skies/exosystem -{ - qer_editorimage env/exosystem/exosystem_preview.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun 1 1 1 350 60 41.743 - q3map_surfacelight 550 - skyparms env/exosystem/exosystem - - -} - -textures/skies/exosystem2 -{ - qer_editorimage env/exosystem/exosystem2_preview.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun 1 .40625 .17578125 150 -55.452 17.379 - q3map_surfacelight 300 - skyparms env/exosystem/exosystem2 - - -} - -textures/skies/heaven -{ - qer_editorimage env/heaven/heaven_preview.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun .9607843137254902 .7176470588235294 .3803921568627451 350 270 10 - q3map_surfacelight 300 - skyparms env/heaven/heaven - - -} +textures/skies/exosystem +{ + qer_editorimage env/exosystem/exosystem_preview.tga + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm sky + + //q3map_sun + q3map_sun 1 1 1 350 60 41.743 + q3map_surfacelight 550 + skyparms env/exosystem/exosystem - - +} + +textures/skies/exosystem2 +{ + qer_editorimage env/exosystem/exosystem2_preview.tga + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm sky + + //q3map_sun + q3map_sun 1 .40625 .17578125 150 -55.452 17.379 + q3map_surfacelight 300 + skyparms env/exosystem/exosystem2 - - +} + +textures/skies/heaven +{ + qer_editorimage env/heaven/heaven_preview.tga + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm sky + + //q3map_sun + q3map_sun .9607843137254902 .7176470588235294 .3803921568627451 350 270 10 + q3map_surfacelight 300 + skyparms env/heaven/heaven - - +}