From 96ecc6d28bba6bd6ebda3e02d43b7fd466d4ab67 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 10 Jan 2006 02:26:28 +0000 Subject: * Removed Q3 icons * Removed ludwig's loki setup dir * Added Tremulous icons --- misc/merge-ioq3-into-trem.sh | 4 ++ misc/tremulous.ico | Bin 0 -> 198 bytes misc/tremulous.xpm | 90 ++++++++++++++++++++++++ src/unix/quake3.gif | Bin 1378 -> 0 bytes src/unix/quake3.xpm | 161 ------------------------------------------- src/unix/setup/Makefile | 15 ---- src/unix/setup/doit | 65 ----------------- src/unix/setup/ioq3demo.sh | 44 ------------ src/unix/setup/ioquake3.sh | 44 ------------ src/unix/setup/setup.xml | 30 -------- src/win32/background.bmp | Bin 197688 -> 0 bytes src/win32/clear.bmp | Bin 5174 -> 0 bytes src/win32/icon2.ico | Bin 766 -> 0 bytes src/win32/qe3.ico | Bin 766 -> 0 bytes src/win32/winquake.rc | 12 +--- 15 files changed, 96 insertions(+), 369 deletions(-) create mode 100644 misc/tremulous.ico create mode 100644 misc/tremulous.xpm delete mode 100644 src/unix/quake3.gif delete mode 100644 src/unix/quake3.xpm delete mode 100644 src/unix/setup/Makefile delete mode 100755 src/unix/setup/doit delete mode 100644 src/unix/setup/ioq3demo.sh delete mode 100644 src/unix/setup/ioquake3.sh delete mode 100644 src/unix/setup/setup.xml delete mode 100644 src/win32/background.bmp delete mode 100644 src/win32/clear.bmp delete mode 100644 src/win32/icon2.ico delete mode 100644 src/win32/qe3.ico diff --git a/misc/merge-ioq3-into-trem.sh b/misc/merge-ioq3-into-trem.sh index 2e4add43..b7e7af1d 100755 --- a/misc/merge-ioq3-into-trem.sh +++ b/misc/merge-ioq3-into-trem.sh @@ -30,12 +30,16 @@ rm -f `find -iname "*.vcproj"` rm -f `find -iname "*.def"` rm -f `find -iname "*.q3asm"` rm -f `find -iname "*.mak"` +rm -f `find -iname "*.ico"` +rm -f `find -iname "*.bmp"` rm -f code/tools/lcc/makefile.nt rm -rf code/win32/msvc/ # Remove Linux docs rm -rf code/unix/LinuxSupport/ +rm -rf code/unix/setup/ rm -f code/unix/README.* +rm -f code/unix/quake3.* # Remove game code rm -rf code/cgame/ code/game/ code/ui/ code/q3_ui/ diff --git a/misc/tremulous.ico b/misc/tremulous.ico new file mode 100644 index 00000000..c1c847a6 Binary files /dev/null and b/misc/tremulous.ico differ diff --git a/misc/tremulous.xpm b/misc/tremulous.xpm new file mode 100644 index 00000000..5e070c86 --- /dev/null +++ b/misc/tremulous.xpm @@ -0,0 +1,90 @@ +/* XPM */ +static char * tremulous_xpm[] = { +"48 48 39 1", +" c None", +". c #0F0F0F", +"+ c #181818", +"@ c #000000", +"# c #282828", +"$ c #212121", +"% c #060606", +"& c #1D1D1D", +"* c #252525", +"= c #080808", +"- c #0E0E0E", +"; c #050505", +"> c #0B0B0B", +", c #0C0C0C", +"' c #232323", +") c #1F1F1F", +"! c #030303", +"~ c #0D0D0D", +"{ c #040404", +"] c #020202", +"^ c #141414", +"/ c #1E1E1E", +"( c #131313", +"_ c #111111", +": c #010101", +"< c #191919", +"[ c #090909", +"} c #292929", +"| c #070707", +"1 c #121212", +"2 c #1B1B1B", +"3 c #161616", +"4 c #0A0A0A", +"5 c #222222", +"6 c #242424", +"7 c #1A1A1A", +"8 c #151515", +"9 c #101010", +"0 c #171717", +" ", +" ... ", +" +@@@@@# ", +" $@@@@@@% ", +" &@@@@@@@@ * ", +" =- ;@@@@@@@@> ,@- ", +" @@' ;@@@@@@@@@ ,@@ ", +" )@! ;@@@@@@@@@ ~@@; ", +" ;@{ ]@@@@@@@@@~ ,@@; ", +" ^@@] /@@@@@@@@@@@( -@@; ", +" .@@; /@@@@@@@@@@@ -@@@/ ", +" _@@] /@@@@@@@@@@@ #:@@@_ ", +" @@@; /@@@@@@@@@@< :@@@- ", +" :@@! ]@@@@@@@@@ @@@@- ", +" $@@@; ;@@@@@@@@[ ~]@@@- ", +" %@@@; }!@@@@@@@@- }|@@@@, ", +" !@@@; 1@@@@@@@@@@ 2@@@@@~ ", +" ;@@@% [@@@@@@@@@@@@@@@@, ", +" @@@@{|||:@@@@@@@@@@@@@@!- ", +" -@@@@@@@@@@@@@@@@@@@@@] ", +" .@@@@@@@@@@@@@@@@@@@{ ", +" ]@@@@@@@@@@@@@@@@@ ", +" .@@@@@@@@@@@@@@@@ ", +" +@@@@@@@@@@@@@@@@@@@@@@@@@@/ ", +" =@@@@@@@@@@@@@@@@@@@@@@@@@/ ", +" .=@@@@@@@@@@@@@@@@@@% ", +" ,@@@@@@@@@@@@@@@@@@@@@ ", +" 2>]@@@@@@@@@@@@@@@@@@@@@@@3 ", +" *:@@@@@@@@@@@@@@@@@@@@@@@@@^ ", +" @@@||| 4]@@@@@@@@@@@@@@@@@ ", +" 556 _@@@@@@@@@@@@@@@@3 ", +" >@@@@@@@@@@@@@@@@+ ", +" ;@@@@@@@@@@@@@@@@@7 ", +" &@@@@@@@@@@@@@@@@@@@+ ", +" @@@@@@@@@@@@@@@@@@@@@/ ", +" 8@@@@@@@@@@@@@@@[ =@@| ", +" ;@@:::@@@@@@@@@[ %@@[ ", +" @@9 (@@@@@@@4 =@@ ", +" ,@@ {:@@: {@! ", +" !@@ << 3@@0 ", +" !@- 3@@6 ", +" ]@( (@[ ", +" 7@@ ]@ ", +" 7@@ * ", +" 7@} ", +" 7@ ", +" . ", +" "}; diff --git a/src/unix/quake3.gif b/src/unix/quake3.gif deleted file mode 100644 index 0e7a01ce..00000000 Binary files a/src/unix/quake3.gif and /dev/null differ diff --git a/src/unix/quake3.xpm b/src/unix/quake3.xpm deleted file mode 100644 index c9b736db..00000000 --- a/src/unix/quake3.xpm +++ /dev/null @@ -1,161 +0,0 @@ -/* XPM */ -static char *quake3[] = { -/* width height num_colors chars_per_pixel */ -" 32 32 122 2", -/* colors */ -".. c #6b1008", -".# c #6b1810", -".a c #6b2118", -".b c #6b2921", -".c c #6b3129", -".d c #731810", -".e c #732118", -".f c #732921", -".g c #733129", -".h c #733931", -".i c #733939", -".j c #734239", -".k c #734a4a", -".l c #7b1810", -".m c #7b2118", -".n c #7b2921", -".o c #7b4239", -".p c #7b4a4a", -".q c #7b524a", -".r c #7b5252", -".s c #7b5a5a", -".t c #7b6363", -".u c #7b6b6b", -".v c #7b7373", -".w c #842110", -".x c #842118", -".y c #842921", -".z c #843129", -".A c #843931", -".B c #844239", -".C c #844a42", -".D c #84524a", -".E c #845252", -".F c #845a5a", -".G c #846b63", -".H c #846b6b", -".I c #847373", -".J c #847b7b", -".K c #848484", -".L c #8c2118", -".M c #8c2921", -".N c #8c4239", -".O c #8c4a42", -".P c #8c5a52", -".Q c #8c635a", -".R c #8c6363", -".S c #8c6b6b", -".T c #8c7b7b", -".U c #8c8484", -".V c #8c848c", -".W c #8c8c8c", -".X c #942921", -".Y c #944a42", -".Z c #946363", -".0 c #946b63", -".1 c #947373", -".2 c #947b7b", -".3 c #948484", -".4 c #949494", -".5 c #9c5a5a", -".6 c #9c6363", -".7 c #9c6b63", -".8 c #9c736b", -".9 c #9c7b73", -"#. c #9c7b7b", -"## c #9c8c8c", -"#a c #9c9494", -"#b c #9c949c", -"#c c #9c9c9c", -"#d c #a55a52", -"#e c #a5736b", -"#f c #a57b73", -"#g c #a57b7b", -"#h c #a58484", -"#i c #a58c8c", -"#j c #a59c9c", -"#k c #a5a5a5", -"#l c #ad8c84", -"#m c #ad8c8c", -"#n c #ad9494", -"#o c #ada5a5", -"#p c #adadad", -"#q c #b59c9c", -"#r c #b5a5a5", -"#s c #b5adad", -"#t c #b5b5b5", -"#u c #bda5a5", -"#v c #bdadad", -"#w c #bdb5b5", -"#x c #bdbdbd", -"#y c #c69c9c", -"#z c #c6a59c", -"#A c #c6adad", -"#B c #c6b5ad", -"#C c #c6b5b5", -"#D c #c6bdbd", -"#E c #c6c6c6", -"#F c #ceb5b5", -"#G c #cec6c6", -"#H c #cecece", -"#I c #d6b5b5", -"#J c #d6bdbd", -"#K c #d6c6bd", -"#L c #d6cece", -"#M c #d6d6d6", -"#N c #decec6", -"#O c #decece", -"#P c #ded6ce", -"#Q c #ded6d6", -"#R c #dedede", -"#S c #e7d6d6", -"#T c #e7dede", -"#U c #e7e7e7", -"#V c #efe7e7", -"#W c #efefe7", -"#X c #efefef", -"#Y c #f7efef", -"#Z c #f7f7ef", -"#0 c #f7f7f7", -"#1 c #fff7f7", -"#2 c #fffff7", -"#3 c #ffffff", -/* pixels */ -"#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0#3#2#3#2", -"#3#2#3#2#3#0#3#2#3#2#3#0#3#2#Z#A#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0", -"#3#2#3#0#3#3#2#3#0#3#3#2#3#3#X#l#U#0#3#2#3#3#0#3#2#3#3#2#3#0#3#3", -"#3#2#3#2#3#0#3#3#2#3#2#3#0#3#Y#e#G#0#3#2#3#2#3#3#0#3#2#3#2#3#0#3", -"#3#2#3#0#3#3#2#3#0#3#3#2#3#2#U.6#D#X#3#2#3#3#0#3#2#3#3#0#3#2#3#2", -"#3#2#3#2#3#0#3#2#3#2#3#3#0#3#Q#d#t#X#3#2#3#2#3#0#3#2#3#3#2#3#0#3", -"#3#2#3#0#3#3#2#3#0#3#2#3#3#2#H.Y#t#X#2#3#1#3#3#2#3#2#3#0#3#3#2#3", -"#3#2#3#2#3#0#3#3#2#3#2#3#0#3#G.N#s#X#3#2#3#2#3#3#0#3#2#3#2#3#3#0", -"#3#2#3#0#3#3#2#3#0#3#3#2#3#2#A.A#o#W#3#0#3#3#2#3#2#3#3#0#3#2#3#2", -"#3#Z#O#s#R#2#3#2#3#2#3#3#0#3#r.z#k#U#2#3#0#3#2#3#2#T#F#L#X#2#3#0", -"#O.2#B#V#X#X#3#2#3#3#0#3#2#3#n.m#a#U#2#3#3#0#3#2#3#3#X#C#.#u#2#3", -".D#Q#M#H#M#Z#3#3#0#3#2#3#2#3#h.x.W#R#3#2#3#2#3#3#0#3#Z#R#D.C#M#0", -".7.D#n#R#1#3#2#3#2#3#0#3#3#1#f.x.W#R#2#3#1#3#2#3#2#0#X#F.5.o#s#U", -"#V.R.b.f.C.7#i#y#F#K#N#O#P#X.8.w.K#D#O#N#J#I#z#h.7.C.f.f.P#v#k#R", -"#3#R#a.s.h.a.#...d.d.m.y.n#A.Z.x.I.D.y.m.e.#...#.a.i.t###a#c#x#Y", -"#3#1#W#E#k.T.H.k.j.j.h.y.m.1.C.L.v.o.l.a.b.h.k.u.v.J.W#c#t#M#0#3", -"#3#2#3#0#Z#R#E#t#b#a.W.H.y.t.p.X.J.o.g.v.J.V.W.4#o#x#M#V#0#3#2#3", -"#3#2#3#2#3#3#1#0#X#U#R#r.n.I.q.M.J.p.g.U#t#M#R#V#0#0#2#3#2#3#2#3", -"#3#2#3#0#3#2#3#2#3#2#3#N.z.J.E.x.K.D.h.4#T#3#2#3#2#3#2#3#0#3#3#2", -"#3#2#3#2#3#3#0#3#2#3#2#O.A.K.Q.m.K.F.o#a#U#3#2#3#0#3#3#2#3#2#3#0", -"#3#2#3#0#3#2#3#3#2#3#0#S.B.U.T.d.4.0.p#c#X#3#2#3#2#3#0#3#3#2#3#2", -"#3#2#3#2#3#3#0#3#2#3#3#S.O.4.3.e.4#g.r#p#X#3#2#3#0#3#3#2#3#0#3#3", -"#3#2#3#0#3#2#3#2#3#0#3#T.C#a.4.b.4#h.G#s#Z#3#3#2#3#0#3#2#3#2#3#2", -"#3#2#3#2#3#3#0#3#2#3#2#U.F#j#o.c.4#m.T#w#0#3#0#3#2#3#3#2#3#0#3#3", -"#3#2#3#0#3#2#3#3#2#3#0#Y.S#o#t.j#j#q###x#0#3#2#3#3#0#3#2#3#3#2#3", -"#3#2#3#2#3#3#0#3#2#3#3#0.9#w#G.p#k#r#o#E#0#3#2#3#2#3#0#3#2#3#2#3", -"#3#2#3#0#3#2#3#2#3#0#3#2#n#E#Q.Q#p#w#x#G#0#3#2#3#3#2#3#0#3#3#2#3", -"#3#2#3#2#3#3#0#3#2#3#3#2#R#H#T.3#t#R#T#R#2#3#2#3#0#3#3#2#3#2#3#0", -"#3#2#3#0#3#2#3#3#2#3#0#3#2#U#U#s#D#0#0#W#3#3#0#3#2#3#2#3#3#0#3#2", -"#3#2#3#2#3#3#0#3#2#3#3#2#3#2#3#X#E#0#3#2#3#0#3#3#2#3#0#3#2#3#3#0", -"#3#2#3#0#3#2#3#2#3#0#3#2#3#3#0#3#W#2#3#0#3#3#2#3#0#3#3#2#3#0#3#2", -"#3#2#3#2#3#3#0#3#2#3#3#2#3#0#3#2#3#3#0#3#2#3#2#3#2#3#0#3#3#2#3#2" -}; diff --git a/src/unix/setup/Makefile b/src/unix/setup/Makefile deleted file mode 100644 index a25cd652..00000000 --- a/src/unix/setup/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -VERSION=FIXME -RELEASE=1 - -all: - VERSION=$(VERSION) RELEASE=$(RELEASE) ./doit - -sign: - for i in *.run; do \ - gpg -bao $$i.asc $$i; \ - done - -clean: - rm -rf *.run image - -.PHONY: all sign clean diff --git a/src/unix/setup/doit b/src/unix/setup/doit deleted file mode 100755 index a3c8e0a3..00000000 --- a/src/unix/setup/doit +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -: ${MAKESELF:=/usr/share/loki-setup/makeself} -: ${SETUPIMAGE:=/usr/share/loki-setup/image} - -: ${VERSION:=0.0_`date +%Y%m%d%H%M`} -: ${RELEASE:=0} - -set -e -set -x - -arch=`uname -m` - -# $ยง&%!! -setup_arch=$arch -links= -case "$arch" in - i?86) arch=i386; setup_arch=x86; links="amd64 x86_64" ;; - x86_64) links=amd64 -esac - -rm -rf image -mkdir image - -### loki-setup files -cp -a $SETUPIMAGE/{setup.data,setup.sh} image/ - -### splash -rm -f image/setup.data/splash.xpm -[ -e splash.xpm ] && cp splash.xpm image/setup.data/splash.xpm - -### binaries -mkdir image/tmp -pushd image/tmp -mkdir baseq3 demoq3 missionpack -src="../../../release$arch-glibc/" -install -m 755 $src/linuxquake3 ioquake3.$arch -install -m 755 $src/linuxq3ded ioq3ded.$arch -install -m 644 $src/baseq3/*.so baseq3 -install -m 644 $src/missionpack/*.so missionpack -pushd demoq3 -ln -s ../baseq3/*.so . -popd -popd - -tar --owner=root --group=root -C image/tmp -cf image/ioquake3.tar . -rm -rf image/tmp - -### setup.xml -sed 's/@VERSION@/'$VERSION'/g' < setup.xml > image/setup.data/setup.xml - -### start script -mkdir -p image/bin/Linux/$setup_arch -for i in $links; do - ln -s $setup_arch image/bin/Linux/$i -done -install -m 755 ioquake3.sh image/bin/Linux/$setup_arch/ioquake3 -install -m 755 ioq3demo.sh image/bin/Linux/$setup_arch/ioq3demo - -### README and COPYING -install -m 644 ../../../README image/README -install -m 644 ../../../COPYING.txt image/COPYING - -### makeself installer -$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.$arch.run "icculus.org/quake3 $VERSION" ./setup.sh diff --git a/src/unix/setup/ioq3demo.sh b/src/unix/setup/ioq3demo.sh deleted file mode 100644 index e022afed..00000000 --- a/src/unix/setup/ioq3demo.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -readlink() { - local path=$1 ll - - if [ -L "$path" ]; then - ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" && - echo "${ll/* -> }" - else - return 1 - fi -} - -script=$0 -count=0 -while [ -L "$script" ] -do - script=$(readlink "$script") - count=`expr $count + 1` - if [ $count -gt 100 ] - then - echo "Too many symbolic links" - exit 1 - fi -done -cd "`dirname $script`" - - -lib=lib -test -e lib64 && lib=lib64 - -if test "x$LD_LIBRARY_PATH" = x; then - LD_LIBRARY_PATH="`pwd`/$lib" -else - LD_LIBRARY_PATH="`pwd`/$lib:$LD_LIBRARY_PATH" -fi -export LD_LIBRARY_PATH - -arch=`uname -m` -case "$arch" in - i?86) arch=i386 ;; -esac - -exec ./ioquake3.$arch +set sv_pure 0 +set vm_cgame 0 +set vm_game 0 +set vm_ui 0 +set fs_game demoq3 "$@" diff --git a/src/unix/setup/ioquake3.sh b/src/unix/setup/ioquake3.sh deleted file mode 100644 index 39c651ca..00000000 --- a/src/unix/setup/ioquake3.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -readlink() { - local path=$1 ll - - if [ -L "$path" ]; then - ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" && - echo "${ll/* -> }" - else - return 1 - fi -} - -script=$0 -count=0 -while [ -L "$script" ] -do - script=$(readlink "$script") - count=`expr $count + 1` - if [ $count -gt 100 ] - then - echo "Too many symbolic links" - exit 1 - fi -done -cd "`dirname $script`" - - -lib=lib -test -e lib64 && lib=lib64 - -if test "x$LD_LIBRARY_PATH" = x; then - LD_LIBRARY_PATH="`pwd`/$lib" -else - LD_LIBRARY_PATH="`pwd`/$lib:$LD_LIBRARY_PATH" -fi -export LD_LIBRARY_PATH - -arch=`uname -m` -case "$arch" in - i?86) arch=i386 ;; -esac - -exec ./ioquake3.$arch "$@" diff --git a/src/unix/setup/setup.xml b/src/unix/setup/setup.xml deleted file mode 100644 index 172b933c..00000000 --- a/src/unix/setup/setup.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - README - - - COPYING - - - - - diff --git a/src/win32/background.bmp b/src/win32/background.bmp deleted file mode 100644 index 88b3dabf..00000000 Binary files a/src/win32/background.bmp and /dev/null differ diff --git a/src/win32/clear.bmp b/src/win32/clear.bmp deleted file mode 100644 index 14516380..00000000 Binary files a/src/win32/clear.bmp and /dev/null differ diff --git a/src/win32/icon2.ico b/src/win32/icon2.ico deleted file mode 100644 index 8ba93283..00000000 Binary files a/src/win32/icon2.ico and /dev/null differ diff --git a/src/win32/qe3.ico b/src/win32/qe3.ico deleted file mode 100644 index a7f4f0a3..00000000 Binary files a/src/win32/qe3.ico and /dev/null differ diff --git a/src/win32/winquake.rc b/src/win32/winquake.rc index 0d78b89f..7022dfac 100644 --- a/src/win32/winquake.rc +++ b/src/win32/winquake.rc @@ -7,11 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#ifndef __MINGW32__ -#include "winres.h" -#else #include -#endif ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -57,11 +53,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -#ifndef __MINGW32__ -IDI_ICON1 ICON DISCARDABLE "qe3.ico" -#else -IDI_ICON1 ICON DISCARDABLE "../win32/qe3.ico" -#endif +IDI_ICON1 ICON DISCARDABLE "../../misc/tremulous.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -70,7 +62,7 @@ IDI_ICON1 ICON DISCARDABLE "../win32/qe3.ico" STRINGTABLE DISCARDABLE BEGIN - IDS_STRING1 "Quake3" + IDS_STRING1 "Tremulous" END #endif // English (U.S.) resources -- cgit