diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-06-29 00:52:09 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-06-29 16:40:28 +0200 |
| commit | 0918eb3bcdefd0d6ee4bd573b761454c99f032f6 (patch) | |
| tree | dd1bd0bfe5348ad3b4860f11b7d3dcbb6db9ca3c /assets/models | |
| parent | 93d2e4414ee25e417ee0d2ca0248448002ea4d5b (diff) | |
Initial implementation of new grenades.
Diffstat (limited to 'assets/models')
| -rw-r--r-- | assets/models/players/human_base/animation.cfg | 4 | ||||
| -rw-r--r-- | assets/models/players/human_bsuit/animation.cfg | 4 | ||||
| -rw-r--r-- | assets/models/weapons/grenade/LICENSE | 1 | ||||
| -rw-r--r-- | assets/models/weapons/grenade/flash0.wav | bin | 0 -> 20200 bytes | |||
| -rw-r--r-- | assets/models/weapons/grenade/grenade.jpg | bin | 31424 -> 19526 bytes | |||
| -rw-r--r-- | assets/models/weapons/grenade/weapon.cfg | 6 |
6 files changed, 14 insertions, 1 deletions
diff --git a/assets/models/players/human_base/animation.cfg b/assets/models/players/human_base/animation.cfg index 6ccb57b..6c65233 100644 --- a/assets/models/players/human_base/animation.cfg +++ b/assets/models/players/human_base/animation.cfg @@ -18,12 +18,16 @@ footsteps custom 130 6 0 15 // TORSO_ATTACK (MUST NOT CHANGE -- hand animation is synced to this) 136 6 0 15 // TORSO_ATTACK2 (MUST NOT CHANGE -- hand animation is synced to this) +125 10 0 50 // TORSO_ATTACK3 + 142 5 0 20 // TORSO_DROP (MUST NOT CHANGE -- hand animation is synced to this) 147 4 0 20 // TORSO_RAISE (MUST NOT CHANGE -- hand animation is synced to this) 151 1 0 15 // TORSO_STAND 152 1 0 15 // TORSO_STAND2 +110 1 1 15 // TORSO_STAND3 + 153 8 8 16 // LEGS_WALKCR 161 12 12 20 // LEGS_WALK 173 9 9 15 // LEGS_RUN diff --git a/assets/models/players/human_bsuit/animation.cfg b/assets/models/players/human_bsuit/animation.cfg index 3de86e1..965d140 100644 --- a/assets/models/players/human_bsuit/animation.cfg +++ b/assets/models/players/human_bsuit/animation.cfg @@ -17,12 +17,16 @@ footsteps custom 130 6 0 15 // TORSO_ATTACK (MUST NOT CHANGE -- hand animation is synced to this) 130 6 0 15 // TORSO_ATTACK2 (MUST NOT CHANGE -- hand animation is synced to this) +125 10 0 50 // TORSO_ATTACK3 + 142 5 0 20 // TORSO_DROP (MUST NOT CHANGE -- hand animation is synced to this) 147 4 0 20 // TORSO_RAISE (MUST NOT CHANGE -- hand animation is synced to this) 151 1 0 15 // TORSO_STAND 152 1 0 15 // TORSO_STAND2 +110 1 1 15 // TORSO_STAND3 + 153 9 9 20 // LEGS_WALKCR 162 8 8 20 // LEGS_WALK 170 13 13 23 // LEGS_RUN diff --git a/assets/models/weapons/grenade/LICENSE b/assets/models/weapons/grenade/LICENSE new file mode 100644 index 0000000..a3821a7 --- /dev/null +++ b/assets/models/weapons/grenade/LICENSE @@ -0,0 +1 @@ +flash0.wav is a derivative work of a sound made by qubodup, released into the public domain. diff --git a/assets/models/weapons/grenade/flash0.wav b/assets/models/weapons/grenade/flash0.wav Binary files differnew file mode 100644 index 0000000..ec87e69 --- /dev/null +++ b/assets/models/weapons/grenade/flash0.wav diff --git a/assets/models/weapons/grenade/grenade.jpg b/assets/models/weapons/grenade/grenade.jpg Binary files differindex a645b65..eb9240d 100644 --- a/assets/models/weapons/grenade/grenade.jpg +++ b/assets/models/weapons/grenade/grenade.jpg diff --git a/assets/models/weapons/grenade/weapon.cfg b/assets/models/weapons/grenade/weapon.cfg index 9d0811c..6e6cec6 100644 --- a/assets/models/weapons/grenade/weapon.cfg +++ b/assets/models/weapons/grenade/weapon.cfg @@ -1,12 +1,16 @@ +weaponModel models/weapons/grenade/grenade.md3 icon icons/iconw_nade +crosshair 24 gfx/2d/crosshair-lgun_s primary { missileModel models/weapons/grenade/grenade.md3 missileAnimates 0 20 20 0 + flashSound 0 models/weapons/grenade/flash0.wav + impactMark 64 gfx/marks/bullet_mrk - impactParticleSystem models/weapons/grenade/impactPS2 + impactParticleSystem models/weapons/grenade/impactPS impactSound 0 models/weapons/grenade/impact0.wav impactQuake 120 |
