From bc7d428cfeed3bc71373b1b66caf86ce8509d358 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 17 Aug 2010 20:59:47 +0200 Subject: [PATCH] sync better with nexuiz --- .gitattributes | 193 ------------------------------------- env/hip_inter/README.TXT | 28 +++--- scripts/newsky_nebulae.txt | 10 +- 3 files changed, 19 insertions(+), 212 deletions(-) diff --git a/.gitattributes b/.gitattributes index a2b2bfc..aecf250 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,194 +1 @@ * -crlf - -*.7z -crlf -diff -*.ac crlf=input -*.afm crlf=input -*.aft crlf=input -*.aliases crlf=input -all crlf=input -*.am 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 -compress-texture crlf=input -*.conf crlf=input -CONTRIBUTORS crlf=input -COPYING crlf=input -*.cpp crlf=input -create crlf=input -*.css crlf=input -Current -crlf -diff -*.cvsignore crlf=input -*.cvswrappers crlf=input -*.dat -crlf -diff -*.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 -*.in crlf=input -*.instantaction crlf=input -*.iqm -crlf -diff -*.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 -*.mkdir -crlf -diff -*.mmpz -crlf -diff -*.modinfo crlf=input -*.modules crlf=input -nexuiz-map-compiler 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 -*.pfb -crlf -diff -*.pfm -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 -update-shaderlists crlf=input -*.vcproj -crlf -*.wav -crlf -diff -*.waypoints -crlf -diff -w crlf=input -*.width crlf=input -*.workspace -crlf -*.xcf -crlf -diff -*.xlink crlf=input -*.xml crlf=input -xonotic-map-compiler-autobuild crlf=input -xonotic-map-compiler crlf=input -*.xpm crlf=input -*.zip -crlf -diff -zipdiff crlf=input -*.zym -crlf -diff diff --git a/env/hip_inter/README.TXT b/env/hip_inter/README.TXT index 9bf1733..4fd1677 100644 --- a/env/hip_inter/README.TXT +++ b/env/hip_inter/README.TXT @@ -1,14 +1,14 @@ -UPDATED THE 28TH, REMOVED A FUNKY PLANET - -INTERSTELLAR -high res 1024^2 environment map -ships as TGA. - - -By Jockum Skoglund aka hipshot -hipshot@zfight.com -www.zfight.com -Stockholm, 2005 08 25 - - -Modify however you like, just cred me for my work, maybe link to my page. +UPDATED THE 28TH, REMOVED A FUNKY PLANET + +INTERSTELLAR +high res 1024^2 environment map +ships as TGA. + + +By Jockum Skoglund aka hipshot +hipshot@zfight.com +www.zfight.com +Stockholm, 2005 08 25 + + +Modify however you like, just cred me for my work, maybe link to my page. diff --git a/scripts/newsky_nebulae.txt b/scripts/newsky_nebulae.txt index 883ba04..ebfe5f2 100644 --- a/scripts/newsky_nebulae.txt +++ b/scripts/newsky_nebulae.txt @@ -6,15 +6,15 @@ Version: 1.0 Released: October 2009 Author: Severin "sev" Meyer -Created for Xonotic and first released at +Created for Nexuiz and first released at ================================================================================ Blender and Gimp ================================================================================ -To create the skybox images, I used the method explained here: - - +To create the skybox images, I used the method explained here: + + In short, the environment is projected onto a cube with an EnvMap material, and after the rendering, the projection can be extracted with "Save EnvMap", found in the Texture Panel. @@ -32,7 +32,7 @@ GNU General Public License I release all the files that are part of this project under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. - + All the files that are part of this project are distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -- 2.39.2