diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
| commit | 7c02e34b08a4e44a7f7935bf6b1bee45c3a8df6c (patch) | |
| tree | e3ff69394522a6cc7dd11edf27cd69df6c0a5819 /assets/models/weapons/rocketl | |
| parent | bd6fc418d171378de5de2b7450e22f70b4899b5c (diff) | |
| parent | 5130cdd357c5b3b442d39ee05052739419456e77 (diff) | |
Merge branch 'newguns'
Conflicts:
src/cgame/cg_local.h
src/cgame/cg_main.c
Diffstat (limited to 'assets/models/weapons/rocketl')
| -rw-r--r-- | assets/models/weapons/rocketl/flash0.wav | bin | 99924 -> 99924 bytes | |||
| -rw-r--r-- | assets/models/weapons/rocketl/rocketl.md3 | bin | 5796 -> 6004 bytes | |||
| -rw-r--r-- | assets/models/weapons/rocketl/rocketl_flash.md3 | bin | 0 -> 868 bytes | |||
| -rw-r--r-- | assets/models/weapons/rocketl/weapon.cfg | 2 |
4 files changed, 2 insertions, 0 deletions
diff --git a/assets/models/weapons/rocketl/flash0.wav b/assets/models/weapons/rocketl/flash0.wav Binary files differindex 009febe..89e78b7 100644 --- a/assets/models/weapons/rocketl/flash0.wav +++ b/assets/models/weapons/rocketl/flash0.wav diff --git a/assets/models/weapons/rocketl/rocketl.md3 b/assets/models/weapons/rocketl/rocketl.md3 Binary files differindex 4119209..d515cf4 100644 --- a/assets/models/weapons/rocketl/rocketl.md3 +++ b/assets/models/weapons/rocketl/rocketl.md3 diff --git a/assets/models/weapons/rocketl/rocketl_flash.md3 b/assets/models/weapons/rocketl/rocketl_flash.md3 Binary files differnew file mode 100644 index 0000000..c1acf35 --- /dev/null +++ b/assets/models/weapons/rocketl/rocketl_flash.md3 diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg index e5dafc6..5c6b70b 100644 --- a/assets/models/weapons/rocketl/weapon.cfg +++ b/assets/models/weapons/rocketl/weapon.cfg @@ -11,9 +11,11 @@ primary flashDlightColor 1.0 0.7 0.0 flashSound 0 models/weapons/rocketl/flash0.wav + flashQuake 1 impactMark 32 gfx/marks/bullet_mrk impactSound 0 models/weapons/rocketl/impact0.wav impactParticleSystem models/weapons/rocketl/impactPS + impactQuake 50 } |