Merge branch 'master' of https://github.com/mtiusane/new-edge into bp-on-hud

22 files changed, 29 insertions, 21 deletions

diff --git a/assets/models/ammo/rocket/rocket.md3 b/assets/models/ammo/rocket/rocket.md3
new file mode 100644
index 0000000..c181114
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket.md3
diff --git a/assets/models/ammo/rocket/rocket.tga b/assets/models/ammo/rocket/rocket.tga
new file mode 100644
index 0000000..47e4606
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket.tga
diff --git a/assets/models/ammo/rocket/rocket_1.md3 b/assets/models/ammo/rocket/rocket_1.md3
new file mode 100644
index 0000000..668f3f9
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket_1.md3
diff --git a/assets/models/ammo/rocket/rocket_2.md3 b/assets/models/ammo/rocket/rocket_2.md3
new file mode 100644
index 0000000..c2af2a0
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket_2.md3
diff --git a/assets/models/ammo/rocket/thrustc1.tga b/assets/models/ammo/rocket/thrustc1.tga
new file mode 100644
index 0000000..581b972
--- /dev/null
+++ b/assets/models/ammo/rocket/thrustc1.tga
diff --git a/assets/models/ammo/rocket/thrustc2.tga b/assets/models/ammo/rocket/thrustc2.tga
new file mode 100644
index 0000000..718f95d
--- /dev/null
+++ b/assets/models/ammo/rocket/thrustc2.tga
diff --git a/assets/models/ammo/rocket/thrustc3.tga b/assets/models/ammo/rocket/thrustc3.tga
new file mode 100644
index 0000000..ea1cc68
--- /dev/null
+++ b/assets/models/ammo/rocket/thrustc3.tga
diff --git a/assets/models/weapons/abuildupg/flash0.wav b/assets/models/weapons/abuild/flash0.wav
index 97e12c9..97e12c9 100644
--- a/assets/models/weapons/abuildupg/flash0.wav
+++ b/assets/models/weapons/abuild/flash0.wav
diff --git a/assets/models/weapons/abuildupg/impactflesh0.wav b/assets/models/weapons/abuild/impactflesh0.wav
index 53476e8..53476e8 100644
--- a/assets/models/weapons/abuildupg/impactflesh0.wav
+++ b/assets/models/weapons/abuild/impactflesh0.wav
diff --git a/assets/models/weapons/abuild/weapon.cfg b/assets/models/weapons/abuild/weapon.cfg
index 46cfdaa..a359c2e 100644
--- a/assets/models/weapons/abuild/weapon.cfg
+++ b/assets/models/weapons/abuild/weapon.cfg
@@ -5,7 +5,15 @@ icon              icons/icona_builder
 
 secondary
 {
-  flashSound        0 models/weapons/abuildupg/flash0.wav
-  impactFleshSound  0 models/weapons/abuildupg/impactflesh0.wav
+  flashSound        0 models/weapons/abuild/flash0.wav
+  impactFleshSound  0 models/weapons/abuild/impactflesh0.wav
   alwaysImpact
 }
+
+tertiary
+{
+  missileModel      models/weapons/level3upg/missile.md3
+
+  impactMark        64 granger_spit
+  impactSound       0 sound/misc/organic_bounce.wav
+}
diff --git a/assets/models/weapons/abuildupg/weapon.cfg b/assets/models/weapons/abuildupg/weapon.cfg
deleted file mode 100644
index 45d154c..0000000
--- a/assets/models/weapons/abuildupg/weapon.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-disableIn3rdPerson
-crosshair         15 gfx/2d/crosshair-alien_s
-
-icon              icons/icona_builder
-
-secondary
-{
-  flashSound        0 models/weapons/abuildupg/flash0.wav
-  impactFleshSound  0 models/weapons/abuildupg/impactflesh0.wav
-  alwaysImpact
-}
-
-tertiary
-{
-  missileModel      models/weapons/level3upg/missile.md3
-
-  impactMark        64 granger_spit
-  impactSound       0 sound/misc/organic_bounce.wav
-}
diff --git a/assets/models/weapons/rocketl/flare.tga b/assets/models/weapons/rocketl/flare.tga
new file mode 100644
index 0000000..86516ca
--- /dev/null
+++ b/assets/models/weapons/rocketl/flare.tga
diff --git a/assets/models/weapons/rocketl/flarey.tga b/assets/models/weapons/rocketl/flarey.tga
new file mode 100644
index 0000000..37f56dc
--- /dev/null
+++ b/assets/models/weapons/rocketl/flarey.tga
diff --git a/assets/models/weapons/rocketl/flash0.wav b/assets/models/weapons/rocketl/flash0.wav
new file mode 100644
index 0000000..009febe
--- /dev/null
+++ b/assets/models/weapons/rocketl/flash0.wav
diff --git a/assets/models/weapons/rocketl/impact0.wav b/assets/models/weapons/rocketl/impact0.wav
new file mode 100644
index 0000000..f232ff1
--- /dev/null
+++ b/assets/models/weapons/rocketl/impact0.wav
diff --git a/assets/models/weapons/rocketl/muzzy.tga b/assets/models/weapons/rocketl/muzzy.tga
new file mode 100644
index 0000000..a452b3f
--- /dev/null
+++ b/assets/models/weapons/rocketl/muzzy.tga
diff --git a/assets/models/weapons/rocketl/newflare.tga b/assets/models/weapons/rocketl/newflare.tga
new file mode 100644
index 0000000..fd6866e
--- /dev/null
+++ b/assets/models/weapons/rocketl/newflare.tga
diff --git a/assets/models/weapons/rocketl/rocketl.md3 b/assets/models/weapons/rocketl/rocketl.md3
new file mode 100644
index 0000000..4119209
--- /dev/null
+++ b/assets/models/weapons/rocketl/rocketl.md3
diff --git a/assets/models/weapons/rocketl/rocketl_hand.md3 b/assets/models/weapons/rocketl/rocketl_hand.md3
new file mode 100644
index 0000000..2a03eed
--- /dev/null
+++ b/assets/models/weapons/rocketl/rocketl_hand.md3
diff --git a/assets/models/weapons/rocketl/skin.tga b/assets/models/weapons/rocketl/skin.tga
new file mode 100644
index 0000000..59e1399
--- /dev/null
+++ b/assets/models/weapons/rocketl/skin.tga
diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg
new file mode 100644
index 0000000..e5dafc6
--- /dev/null
+++ b/assets/models/weapons/rocketl/weapon.cfg
@@ -0,0 +1,19 @@
+weaponModel       models/weapons/rocketl/rocketl.md3
+icon              icons/iconw_rocketl
+crosshair         48 gfx/2d/crosshair-lcannon_s
+
+primary
+{
+  missileModel          models/ammo/rocket/rocket.md3
+
+  missileSound          models/weapons/lcannon/missle.wav
+  missileParticleSystem models/weapons/rocketl/missilePS
+
+  flashDlightColor      1.0 0.7 0.0
+  flashSound            0 models/weapons/rocketl/flash0.wav
+
+  impactMark            32 gfx/marks/bullet_mrk
+  impactSound           0 models/weapons/rocketl/impact0.wav
+  impactParticleSystem  models/weapons/rocketl/impactPS
+}
+
diff --git a/assets/models/weapons/rocketl/wide.tga b/assets/models/weapons/rocketl/wide.tga
new file mode 100644
index 0000000..04a59b4
--- /dev/null
+++ b/assets/models/weapons/rocketl/wide.tga