-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Added gun movement when near a block - Added frag grenade explosion - Added smoke grenades - Added stun grenades (flashbang) - Added command to clear the extra slots items "/mwclear" - Stackable magazines ammo - Fixed ammo repair in the craft - Fixed rendering issue on MacOS - Fixed second skin layer when wearing an armor
- Loading branch information
Showing
66 changed files
with
11,110 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
run/ModularWarfare/prototype/assets/modularwarfare/models/item/prototype.smoke_grenade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"parent": "item/generated", | ||
"textures": { | ||
"layer0": "modularwarfare:items/grenades/prototype.smoke_grenade" | ||
}, | ||
"display": { | ||
"thirdperson_lefthand": { | ||
"scale": [ | ||
0.0, | ||
0.0, | ||
0.0 | ||
] | ||
}, | ||
"thirdperson_righthand": { | ||
"scale": [ | ||
0.0, | ||
0.0, | ||
0.0 | ||
] | ||
} | ||
} | ||
} |
22 changes: 22 additions & 0 deletions
22
run/ModularWarfare/prototype/assets/modularwarfare/models/item/prototype.stun_grenade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"parent": "item/generated", | ||
"textures": { | ||
"layer0": "modularwarfare:items/grenades/prototype.stun_grenade" | ||
}, | ||
"display": { | ||
"thirdperson_lefthand": { | ||
"scale": [ | ||
0.0, | ||
0.0, | ||
0.0 | ||
] | ||
}, | ||
"thirdperson_righthand": { | ||
"scale": [ | ||
0.0, | ||
0.0, | ||
0.0 | ||
] | ||
} | ||
} | ||
} |
Binary file added
BIN
+4.41 KB
...fare/prototype/assets/modularwarfare/skins/grenades/prototype.smoke_grenade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+77.9 KB
...rfare/prototype/assets/modularwarfare/skins/grenades/prototype.stun_grenade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-7.11 KB
run/ModularWarfare/prototype/assets/modularwarfare/sounds/ak47/distant.ogg.sfk
Binary file not shown.
Binary file removed
BIN
-1.94 KB
run/ModularWarfare/prototype/assets/modularwarfare/sounds/ak47/shoot1.ogg.sfk
Binary file not shown.
File renamed without changes.
Binary file modified
BIN
+31 Bytes
(100%)
...totype/assets/modularwarfare/textures/items/grenades/prototype.frag_grenade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+545 Bytes
...otype/assets/modularwarfare/textures/items/grenades/prototype.smoke_grenade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+501 Bytes
...totype/assets/modularwarfare/textures/items/grenades/prototype.stun_grenade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion
3
run/ModularWarfare/prototype/grenades/prototype.frag_grenade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
{ | ||
"displayName": "Frag Grenade", | ||
"internalName": "prototype.frag_grenade", | ||
"grenadeType": "frag", | ||
"fuseTime": 5, | ||
"damageWorld": false, | ||
"explosionPower": 5, | ||
"explosionPower": 8, | ||
"throwStrength": 1.0, | ||
"throwerVulnerable": true | ||
} |
11 changes: 11 additions & 0 deletions
11
run/ModularWarfare/prototype/grenades/prototype.smoke_grenade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"displayName": "Smoke Grenade", | ||
"internalName": "prototype.smoke_grenade", | ||
"grenadeType": "smoke", | ||
"smokeTime": 10, | ||
|
||
"fuseTime": 5, | ||
"damageWorld": false, | ||
"explosionPower": 5, | ||
"throwStrength": 1.0 | ||
} |
7 changes: 7 additions & 0 deletions
7
run/ModularWarfare/prototype/grenades/prototype.stun_grenade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"displayName": "Stun Grenade", | ||
"internalName": "prototype.stun_grenade", | ||
"grenadeType": "stun", | ||
"fuseTime": 5, | ||
"throwStrength": 1.0 | ||
} |
16 changes: 16 additions & 0 deletions
16
run/ModularWarfare/prototype/grenades/render/prototype.smoke_grenade.render.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"modelFileName": "smoke_grenade.obj", | ||
"extra": { | ||
"modelScale": 1.0, | ||
"translateAll": { | ||
"x": -5.0, | ||
"y": 4.0, | ||
"z": 0.0 | ||
}, | ||
"thirdPersonOffset": { | ||
"x": 0.0, | ||
"y": 0.0, | ||
"z": 0.0 | ||
} | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
run/ModularWarfare/prototype/grenades/render/prototype.stun_grenade.render.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
{ | ||
"modelFileName": "stun_grenade.obj", | ||
"arms": { | ||
"rightArm": { | ||
"armScale": { | ||
"x": 0.8, | ||
"y": 0.8, | ||
"z": 0.8 | ||
}, | ||
"armPos": { | ||
"x": 0.26, | ||
"y": -0.65, | ||
"z": 0.0 | ||
}, | ||
"armRot": { | ||
"x": 0.0, | ||
"y": 0.0, | ||
"z": -90.0 | ||
}, | ||
"armChargePos": { | ||
"x": 0.47, | ||
"y": -0.39, | ||
"z": 0.14 | ||
}, | ||
"armChargeRot": { | ||
"x": 0.0, | ||
"y": 0.0, | ||
"z": -90.0 | ||
} | ||
} | ||
}, | ||
"extra": { | ||
"modelScale": 1.0, | ||
"thirdPersonOffset": { | ||
"x": 0.0, | ||
"y": 0.0, | ||
"z": 0.0 | ||
}, | ||
"translateAll": { | ||
"x": 0.0, | ||
"y": 0.0, | ||
"z": 0.0 | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
Model Information: | ||
* title: Low-Poly Attachments | ||
* author: TastyTony (https://sketchfab.com/TastyTony) | ||
|
||
Model License: | ||
* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/) | ||
* requirements: Author must be credited. Commercial use is allowed. | ||
|
||
If you use this 3D model in your project be sure to copy paste this credit wherever you share it |
Oops, something went wrong.