From 74efb19587bf460af10de565dbf95ab3aafa2a59 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Sun, 13 Jan 2013 10:46:34 +0000 Subject: [PATCH] Updates git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7085 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/convert_mapconfig.sh | 4 +++- .../mapmodels/makke/broken_wood/tris.md3 | Bin 1716 -> 1812 bytes packages/textures/sub/license.txt | 11 ----------- .../{sub => zastrow}/brick_wall_08.jpg | Bin .../{sub => zastrow}/brick_wall_09.jpg | Bin .../textures/{sub => zastrow}/sub_sand.jpg | Bin 6 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 packages/textures/sub/license.txt rename packages/textures/{sub => zastrow}/brick_wall_08.jpg (100%) rename packages/textures/{sub => zastrow}/brick_wall_09.jpg (100%) rename packages/textures/{sub => zastrow}/sub_sand.jpg (100%) diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh index e15c4cb1..bd02b958 100644 --- a/config/convert_mapconfig.sh +++ b/config/convert_mapconfig.sh @@ -13,7 +13,6 @@ if [[ -r "$1" && -w "$1" ]]; then fi echo "Converting $1 to a compatible map config file..." - echo -e "\nConverting mapmodels..." sed -i '/^mapmodel/s/\/jcdpc\/laptop/g' $1 sed -i '/^mapmodel/s/\/jcdpc\/cardboardbox/g' $1 @@ -110,6 +109,9 @@ if [[ -r "$1" && -w "$1" ]]; then sed -i '/^texture/s/\/zastrow\/sub_doors512B05.jpg/g' $1 sed -i '/^texture/s/\/zastrow\/sub_window31.jpg/g' $1 sed -i '/^texture/s/\/zastrow\/sub_window33.jpg/g' $1 + sed -i '/^texture/s/\/zastrow\/sub_sand.jpg/g' $1 + sed -i '/^texture/s/\/zastrow\/brick_wall_08.jpg/g' $1 + sed -i '/^texture/s/\/zastrow\/brick_wall_09.jpg/g' $1 echo -e "\a\nConversion finished!" echo "Please check your map config file carefully for any inconsistencies." diff --git a/packages/models/mapmodels/makke/broken_wood/tris.md3 b/packages/models/mapmodels/makke/broken_wood/tris.md3 index 83a663c4c2c6616e8ef2267de3504eb986c0e9a4..5033ef35652483e2758d8fd2e5159d712678db07 100644 GIT binary patch literal 1812 zcmb7@OGwmF6voet*PP7M)bgFQI7R}GxwAPfen2AzH{!m_nvdd>FGYzULYc)(O@VN z_s1fEsnB@bpAIvBeWSs46l~z*vNg&G;svXc9GIEPC7EAbg6WiJja@SHs7vJj5xXso zVBd?b-jPVy84kok-u7-Ld(h*#@n|?SHZ&QH2G^JWmuFwpLFfSV5MqzsERk16B(~`v z?+_1q~7+maX$Vi*Y$r2~}8MWn*$D zR1MMB*w_o!LA4M)_cP{t15|Il*Tz8lE%<)?a9+L*$zIj7f5x1Ty>TXreK%T9vW}u> zJ;@q+)^jgo_QjsqyVrW=nxI`!Gql@!=Jwc_ey{b+wLm^-ALO^(4^qsrmY!riYZ&WZ z-Pej7e~N7oJ^zO@KTU5ZzR|-7JO1zsV&=)CT*vQh9xMhE$W=ix=o@l{&HfM zz7{M5%fU}z9z?!JO&mGimjJo%5a>ZnHh>f0B6!X63ds60i02MM%kX{R6Yw(l9AsXg ze&{n|_R$Q_yZxZv5raPlU4l9w_E7*$K{?QQi2E6H{VK%ueCQ1F`VRU&WO^Q~@m>C& zTj$aFbbjq$&((gkU!5n@-&`vE-I3Y{q>+KylP>c3OVW|HH-qlChyx!;N2*tzrf#h| zQZr2&8A|Ftt-I~M{=>+HRnn1iGn;z7hWaFl`sumUq;bR-C5@bRmQ(LsMnXx_k&5Y$ zKa*Im_mM{WOSMkV^~i7*&dDWlu1D)UvVeU}Nz%yK#Dx1X`Wv`IV!p2$-*n&0M!tx2 zq^{+zkgffskrTbTU+XkKu$C_l{tCQ|Hk+c&?Ed(fhPd?L+VX E1sawSOaK4? literal 1716 zcmbu9OGs5w6o!{KUzzDGduUo|Y4%jh$_Ca=5<*aPSSS*xL}hyO0ljn}4jfbj6(mG7 z2%0r8o7AKmA>t@#QaEYoEQlmuSNnd?-eeB#z{mfuwb$Bb?R_t&rn;d#)69Chu5_1N zZ!O2J`AKk{UfYRZI!2StUVX`njgG&GeJ--MMU#b9zaNiOr6xU(tbAefk55${ogHmu zWmebO+SZ<5UTrnZc)qK%H@dQL4PJAJQ?MU2Uv0?jAv7eKg_#k%T!Yv;P^^dLWv^V4 zi{(=x1!%SPE|%W_X`tG47t5|*(?um!SUn~UYOhk8`2e#P?H zupRWy92d*)a9%m}E0*60d5{acTr6Jz`LG-IfMWR~D1^PBI>qw3&tllOB9=b{2jKu5 zcCq{s=anmQvHVdegHq6+@tBLHs?(ah`W352UODwDR?SH`0mq$}RzUZ)D;*_QqnEM& z@#LT8S2@E5m4EdYvGUThTIYZL0?k5u$mKy4X2^wM3j97p_+07|Sua4tXb$=vO$X^$ zYP!kky*;SJ-wYG@M)Vze6a9!PZ_orki8W6#UNe-g zQ2)*-xpQy>DnWB)!YxRF7SKL^U3t~r1=acUOLcFn?`!ov_;aj2Zw7l^px>XzpTp1X z-yh639B-Mcw@6INabvX!%Q_|{KhYQ(SAJ4TJoP?)ZvpL>k{|GWeji`|DAYI4`ht}D z#0T*Yi|BxqeE)E~Gm&^uN<26gpWt&88IWrKZ%eneULqx*?dyD>-#^JN@#%@ANvTiu z^-1ZclAlo22CH{62o&*ZcM0{I(R_n@tDz zWwXJ3*=%qRHXq!BS#S=s;Jg+O&TBIl7n7}?&uwrXn-9)mbHUu^=CiqAKAZjnslg5< diff --git a/packages/textures/sub/license.txt b/packages/textures/sub/license.txt deleted file mode 100644 index f54d9d22..00000000 --- a/packages/textures/sub/license.txt +++ /dev/null @@ -1,11 +0,0 @@ -Files within this folder are copyright (all rights reserved) by: - Chris Zastrow (http://www.newlogicmedia.com/subverse/) - -These files are no longer available from this website. When these files were -originally obtained, they allowed redistribution with the following license: - - Greetings from the dark underworld of texture art. Thank you for giving - my textures a try. If you'd like to use these textures commercially, - please contact me via email. Please do not alter these images, or - distribute them without this "info.txt" file. Thanks if you link to my - main page, but please don't link to the files directly. Thanks, have fun! \ No newline at end of file diff --git a/packages/textures/sub/brick_wall_08.jpg b/packages/textures/zastrow/brick_wall_08.jpg similarity index 100% rename from packages/textures/sub/brick_wall_08.jpg rename to packages/textures/zastrow/brick_wall_08.jpg diff --git a/packages/textures/sub/brick_wall_09.jpg b/packages/textures/zastrow/brick_wall_09.jpg similarity index 100% rename from packages/textures/sub/brick_wall_09.jpg rename to packages/textures/zastrow/brick_wall_09.jpg diff --git a/packages/textures/sub/sub_sand.jpg b/packages/textures/zastrow/sub_sand.jpg similarity index 100% rename from packages/textures/sub/sub_sand.jpg rename to packages/textures/zastrow/sub_sand.jpg