WebSVN – duke3d_hrp – Path Comparison – / – /highres Rev 142 and /highres/ Rev 143

Regard whitespace Rev 142 → Rev 143

 /highres/sprites/firstperson.def
 ,7 → 291,9
 // Tip Hand (2576/2577)
 model "highres/sprites/firstperson/2576_tiphand.md3" {
    scale 1.9
-   skin { pal 0 surface 0 file "highres/sprites/firstperson/duke_hand.png" }
+   skin { pal 0 surface 0 file "highres/sprites/firstperson/duke_hand_d.png" }
+   normal { file "highres/sprites/firstperson/duke_hand_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/firstperson/duke_hand_s.png" }
    detail { surface 0 file "highres/sprites/firstperson/2576_tiphand_lmap.png" detailscale 1 }
    skin { pal 0 surface 1 file "highres/sprites/firstperson/dollarnote.png" }
    frame { name "Frame0" tile 2576 }
 ,7 → 302,9
 model "highres/sprites/firstperson/2577_tiphand.md3" {
    scale 1.9
-   skin { pal 0 file "highres/sprites/firstperson/duke_hand.png" }
+   skin { pal 0 file "highres/sprites/firstperson/duke_hand_d.png" }
+   normal { file "highres/sprites/firstperson/duke_hand_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/firstperson/duke_hand_s.png" }
    detail { file "highres/sprites/firstperson/2577_tiphand_lmap.png" detailscale 1 }
    frame { name "Frame0" tile 2577 }
    hud { tile 2577 xadd -0.5 yadd 1.65 zadd -0.82 }
 ,20 → 321,32
 // Shotgun (2613)
 model "highres/sprites/firstperson/2613_shotgun.md3" {
-   scale 1.7
-   skin { pal 0 file "highres/sprites/firstperson/2613_shotgun.png" }
-   frame { name "2613" tile 2613 }
-   frame { name "2613" tile 2614 }
-   frame { name "2613" tile 2615 }
-   frame { name "2616" tile 2616 }
-   frame { name "2617" tile 2617 }
-   frame { name "2618" tile 2618 }
-   frame { name "2619" tile 2619 }
-   // anim { frame0 "pump1" frame1 "pump2" fps 30 flags 1 }
-   // frame { name "pump1" tile0 2617 tile1 2619 }
-   hud { tile 2613 xadd 0.12 yadd 1.35 zadd -0.54 angadd -24 }
-   hud { tile 2616 xadd 0.053 yadd 1.167 zadd -0.54 angadd -24 }
-   hud { tile 2617 xadd -0.21 yadd 1.28 zadd -0.8 angadd -24 }
-   hud { tile 2618 xadd -0.474 yadd 1.407 zadd -0.8 angadd -24 }
-   hud { tile 2619 xadd -0.474 yadd 1.407 zadd -0.8 angadd -24 }
+   scale 6
+   skin { pal 0 surface 0 file "highres/sprites/firstperson/2613_shotgun_d.png" }
+   skin { pal 0 surface 1 file "highres/sprites/firstperson/2613_shotgun_d.png" }
+   normal { file "highres/sprites/firstperson/2613_shotgun_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/firstperson/2613_shotgun_s.png" }
+   skin { pal 0 surface 2 file "highres/sprites/firstperson/2613_shotgun_d.png" }
+   normal { file "highres/sprites/firstperson/2613_shotgun_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/firstperson/2613_shotgun_s.png" }
+   skin { pal 0 surface 3 file "highres/sprites/firstperson/2613_shotgun_d.png" }
+   normal { file "highres/sprites/firstperson/2613_shotgun_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/firstperson/2613_shotgun_s.png" }
+   skin { pal 0 surface 4 file "highres/sprites/firstperson/duke_hand_d.png" }
+   normal { file "highres/sprites/firstperson/duke_hand_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/firstperson/duke_hand_s.png" }
+   frame { name "frame_1" tile 2613 }
+   frame { name "frame_1" tile 2614 }
+   frame { name "frame_1" tile 2615 }
+   frame { name "frame_2" tile 2616 }
+   frame { name "frame_20" tile 2617 }
+   frame { name "frame_30" tile 2618 }
+   frame { name "frame_60" tile 2619 }
+   hud { tile 2613 xadd 0.32 yadd 0.81 zadd 0.8 angadd -1200 }
+   hud { tile 2614 hide }
+   hud { tile 2615 hide }
+   hud { tile 2616 xadd 0.24 yadd 0.7 zadd 0.8 angadd -1200 }
+   hud { tile 2617 xadd 0.2 yadd 0.9 zadd 1 angadd -1350 }
+   hud { tile 2618 xadd 0 yadd 0.2 zadd 1 angadd -1350 }
+   hud { tile 2619 xadd 0 yadd 0.2 zadd 1 angadd -1350 }
 }

 /highres/sprites/pickups.def
 ,16 → 38,13
 // Shrinker (25)
 model "highres/sprites/pickups/0025_shrinker.md3" {
    scale 3.0 shade 0
    skin { pal 0 surface 0 file "highres/sprites/pickups/0025_shrinker.png" }
    skin { pal 0 surface 2 file "highres/sprites/pickups/0025_shrinker.png" }
    glow { pal 0 surface 0 file "highres/sprites/pickups/0025_shrinker_g.png" }
    glow { pal 0 surface 2 file "highres/sprites/pickups/0025_shrinker_g.png" }
    skin { pal 0 surface 1 file "highres/sprites/firstperson/2558_crystal.png" }
    glow { pal 0 surface 1 file "highres/sprites/firstperson/2558_crystal.png" }
    normal { surface 1 file "highres/sprites/pickups/0046_crystal_n.png" parallaxbias 0.1 parallaxscale 0.1 }
    frame { name "Frame0" tile 25 }
 }
 ,10 → 68,11
 // Shotgun (28)
 model "highres/sprites/pickups/0028_shotgun.md3" {
-   scale 1.25 shade 2 zadd 10
-   skin { pal 0 file "highres/sprites/pickups/0028_shotgun.jpg" }
-   detail { file "highres/detail/metal.png" detailscale 0.15 }
-   frame { name "Frame 0" tile 28 }
+   scale 15 shade 0 zadd 0
+   skin { pal 0 file "highres/sprites/pickups/0028_shotgun_d.png" }
+   normal { file "highres/sprites/pickups/0028_shotgun_n.png" parallaxbias 0.1 parallaxscale 0.1 }
+   specular { file "highres/sprites/pickups/0028_shotgun_s.png" }
+   frame { name "frame_1" tile 28 }
 }
 // Devastator (29)
 ,19 → 86,15
 // Expander (32)
 model "highres/sprites/pickups/0032_expander.md3" {
    scale 3.0 shade 0
    skin { pal 0 surface 1 file "highres/sprites/pickups/0025_shrinker.png" }
    skin { pal 0 surface 3 file "highres/sprites/pickups/0025_shrinker.png" }
    glow { pal 0 surface 1 file "highres/sprites/pickups/0025_shrinker_g.png" }
    glow { pal 0 surface 3 file "highres/sprites/pickups/0025_shrinker_g.png" }
    skin { pal 0 surface 2 file "highres/sprites/pickups/0032_crystal.png" }
    glow { pal 0 surface 2 file "highres/sprites/pickups/0032_crystal.png" }
    normal { surface 2 file "highres/sprites/pickups/0046_crystal_n.png" parallaxbias 0.1 parallaxscale 0.1 }
    skin { pal 0 surface 0 file "highres/sprites/pickups/0032_expander.png" }
    glow { pal 0 surface 0 file "highres/sprites/pickups/0032_expander_glow.png" }
    frame { name "Frame0" tile 32 }
 }

/highres/sprites/firstperson/duke_hand.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

/highres/sprites/firstperson/2613_shotgun.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

/highres/sprites/firstperson/2613_shotgun_d.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

/highres/sprites/firstperson/2613_shotgun_n.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

/highres/sprites/firstperson/2613_shotgun_s.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

/highres/sprites/firstperson/duke_hand_d.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

/highres/sprites/firstperson/duke_hand_n.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

/highres/sprites/firstperson/duke_hand_s.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

/highres/sprites/pickups/0028_shotgun.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

/highres/sprites/pickups/0028_shotgun_s.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

/highres/sprites/pickups/0028_shotgun_d.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

/highres/sprites/pickups/0028_shotgun_n.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 duke3d_hrp

Compare Revisions

Regard whitespace Rev 142 → Rev 143