WebSVN – vaca_plus – Path Comparison – / – /vacation/ Rev 24 and /vacation/ Rev 25

Regard whitespace Rev 24 → Rev 25

 /vacation/textures.def
 ,25 → 9,6
 texture 96 { pal 0 { file "vacation/textures/0096.jpg" } }
-texture 336 {
-   pal 0 { file "vacation/textures/0336.jpg" }
-  // pal 2 { file "highres/textures/0336_2.jpg" }
-  // pal 21 { file "highres/textures/0336_2.jpg" }
-   normal { file "highres/textures/0336_n.png" parallaxbias 0.3 parallaxscale 0.1 }
-}
-texture 337 {
-   pal 0 { file "vacation/textures/0337.jpg" }
-  // pal 2 { file "highres/textures/0337_2.jpg" }
-  // pal 21 { file "highres/textures/0337_2.jpg" }
-   normal { file "highres/textures/0337_n.png" parallaxbias 0.3 parallaxscale 0.1 }
-}
-texture 338 {
-   pal 0 { file "vacation/textures/0338.jpg" }
-  // pal 2 { file "highres/textures/0338_2.jpg" }
-  // pal 21 { file "highres/textures/0338_2.jpg" }
-   normal { file "highres/textures/0338_n.png" parallaxbias 0.3 parallaxscale 0.1 }
-}
 texture 889 {
    pal 0 { file "vacation/textures/0889.png" }
    pal 2 { file "highres/textures/0889_2.jpg" }
 ,12 → 164,12
    pal 17 { file "highres/textures/0545.jpg" }
    pal 21 { file "vacation/textures/3794.png" }
    pal 22 { file "highres/textures/0545.jpg" }
-   normal { file "highres/textures/0545_n.png" parallaxbias 0 parallaxscale 0.1 }
+   normal { file "highres/textures/0545_n.png" parallaxbias 0.0 parallaxscale 0.05 }
    detail { file "highres/detail/fabric.png" xscale 0.3 yscale 0.15 }
 }
 texture 3794 {
    pal 0 { file "vacation/textures/3794.png" }
-   normal { file "highres/textures/0545_n.png" parallaxbias 0 parallaxscale 0.1 }
+   normal { file "highres/textures/0545_n.png" parallaxbias 0.0 parallaxscale 0.05 }
    detail { file "highres/detail/fabric.png" xscale 0.3 yscale 0.15 }
 }

/vacation/textures/0336.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/textures/0337.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/textures/0338.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /vacation/xxx.def
 ,6 → 5,9
 --------------------------------------------------------------------------------
 */
+tilefromtexture 1321 { file "vacation/8bit/xxx/1321.png" }
+tilefromtexture 1322 { file "vacation/8bit/xxx/1322.png" }
 // XXX Beach Babe (3670-3684)
 model "vacation/sprites/characters/3670_beachbabe.md3" {
    scale 1.5 shade 0

/vacation/sprites/props.def
48,10 → 48,12
scale 1.3 shade 0

skin { pal 0 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
/*
skin { pal 1 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
skin { pal 2 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
skin { pal 7 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
skin { pal 8 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
*/

skin { pal 0 surface 1 file "vacation/sprites/props/3700_tikigod.png" }
detail { surface 1 file "highres/detail/rock.png" xscale 0.15 yscale 0.15 } // This is so that the jewel is not covered with the rocky detail texture.

/vacation/sprites/pickups.def
65,6 → 65,7
scale 3.0 shade 0
skin { pal 0 file "vacation/sprites/pickups/0045_crystal.png" }
// glow { pal 0 file "vacation/sprites/pickups/0045_crystal.png" }
normal { file "highres/sprites/pickups/0046_crystal_n.png" parallaxbias 0.1 parallaxscale 0.1 }
frame { name "Frame0" tile 45 }
}
texture 45 { pal 0 { file "vacation/sprites/pickups/0045.png" } }

 /vacation/sprites/firstperson.def
 ,34 → 30,26
 // Key Card Hand (2568)
 model "highres/sprites/firstperson/2568_keycardhand.md3" {
    scale 1.9 shade 0
-   skin { pal 0  surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand.png" }
-   skin { pal 0  surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand.png" }
-   skin { pal 10 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_10.png" }
-   skin { pal 10 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_10.png" }
-   skin { pal 11 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 11 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 12 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 12 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 13 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_13.png" }
-   skin { pal 13 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_13.png" }
-   skin { pal 14 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_14.png" }
-   skin { pal 14 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_14.png" }
-   skin { pal 15 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_15.png" }
-   skin { pal 15 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_15.png" }
-   skin { pal 16 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_16.png" }
-   skin { pal 16 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_16.png" }
-   skin { pal 18 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 18 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 21 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_21.png" }
-   skin { pal 21 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_21.png" }
-   skin { pal 22 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 22 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 23 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_23.png" }
-   skin { pal 23 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_23.png" }
-   skin { pal 24 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_24.png" }
-   skin { pal 24 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_24.png" }
-   frame { name "key" tile 2568 }
+   skin { pal 0  surface 0 file "vacation/sprites/firstperson/2568_keycardhand.png" }
+   skin { pal 10 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_10.png" }
+   skin { pal 11 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_11_22.png" }
+   skin { pal 12 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_12_18.png" }
+   skin { pal 13 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_13.png" }
+   skin { pal 14 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_14.png" }
+   skin { pal 15 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_15.png" }
+   skin { pal 16 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_16.png" }
+   skin { pal 18 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_12_18.png" }
+   skin { pal 21 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_21.png" }
+   skin { pal 22 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_11_22.png" }
+   skin { pal 23 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_23.png" }
+   skin { pal 24 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_24.png" }
+   skin { pal 0 surface 1 file "highres/sprites/firstperson/duke_hand_d.png" }
+   normal { pal 0 surface 1 file "highres/sprites/firstperson/duke_hand_n.png" }
+   specular { pal 0 surface 1 file "highres/sprites/firstperson/duke_hand_s.png" }
+   frame { name "Frame0" tile 2568 }
   // hud { tile 2568 xadd -0.25 yadd 0.24 zadd -0.1 angadd 0 }
-   hud { tile 2568 xadd 0.25 yadd 0.24 zadd -0.1 angadd 0 flipped }
+   hud { tile 2568 xadd 0.25 yadd 0.24 zadd -0.1 angadd 512 flipped }
 }

/vacation/sprites/firstperson/2563_tripkeyhand_10.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_21.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_13.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_23.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_14.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_15.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_24.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_11_22.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_12_18.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_10.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_21.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_13.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_14.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_11_22.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_23.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_15.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_24.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_12_18.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /vacation/skyboxes.def
 ,6 → 16,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 89 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 90 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 34,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 90 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 91 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 52,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 91 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 92 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 70,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 92 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 93 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 88,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 93 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 94 pal 0
    front  "vacation/skyboxes/94_dawn_dusk/dawn_duskFT.png"
    right  "vacation/skyboxes/94_dawn_dusk/dawn_duskRT.png"

/vacation/8bit/xxx/1321.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/8bit/xxx/1322.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

Subversion Repositories vaca_plus

Compare Revisions

Regard whitespace Rev 24 → Rev 25