-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix blunderbuss effect offset and animations * Tweak blunderbuss mount offset * Add particles for the blunderbuss and a bullet texture for it * Tweak blunderbuss muzzle smoke * Add blunderbuss to test level
- Loading branch information
1 parent
74d0722
commit 4bfd67f
Showing
7 changed files
with
215 additions
and
59 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1034,7 +1034,7 @@ | |
} | ||
}, | ||
{ | ||
"id": "kick_bomb", | ||
"id": "blunderbuss", | ||
"kind": "item", | ||
"position": { | ||
"x": 176.682, | ||
|
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,69 @@ | ||
{ | ||
"local_coords": false, | ||
"emission_shape": "Point", | ||
"one_shot": true, | ||
"lifetime": 0.4, | ||
"lifetime_randomness": 0, | ||
"explosiveness": 1, | ||
"amount": 1, | ||
"shape": { | ||
"Circle": { | ||
"subdivisions": 20 | ||
} | ||
}, | ||
"emitting": false, | ||
"initial_direction": { | ||
"x": 0, | ||
"y": -1 | ||
}, | ||
"initial_direction_spread": 0.3, | ||
"initial_velocity": 0, | ||
"initial_velocity_randomness": 0, | ||
"linear_accel": 0.00000017881393, | ||
"size": 2, | ||
"size_randomness": 0, | ||
"size_curve": { | ||
"points": [ | ||
[ | ||
0, | ||
2 | ||
], | ||
[ | ||
0.48, | ||
1 | ||
], | ||
[ | ||
1, | ||
0 | ||
] | ||
], | ||
"interpolation": "Linear", | ||
"resolution": 30 | ||
}, | ||
"blend_mode": "Alpha", | ||
"colors_curve": { | ||
"start": { | ||
"r": 0.8863636, | ||
"g": 0.8863636, | ||
"b": 0.8863636, | ||
"a": 1 | ||
}, | ||
"mid": { | ||
"r": 0.59090906, | ||
"g": 0.59090906, | ||
"b": 0.59090906, | ||
"a": 1 | ||
}, | ||
"end": { | ||
"r": 0.4090909, | ||
"g": 0.4090909, | ||
"b": 0.4090909, | ||
"a": 1 | ||
} | ||
}, | ||
"gravity": { | ||
"x": 0, | ||
"y": 0.0000011920929 | ||
}, | ||
"post_processing": {} | ||
} |
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,69 @@ | ||
{ | ||
"local_coords": false, | ||
"emission_shape": "Point", | ||
"one_shot": true, | ||
"lifetime": 0.5, | ||
"lifetime_randomness": 0, | ||
"explosiveness": 1, | ||
"amount": 1, | ||
"shape": { | ||
"Circle": { | ||
"subdivisions": 20 | ||
} | ||
}, | ||
"emitting": false, | ||
"initial_direction": { | ||
"x": 0, | ||
"y": -1 | ||
}, | ||
"initial_direction_spread": 0.3, | ||
"initial_velocity": 54.300003, | ||
"initial_velocity_randomness": 0.4, | ||
"linear_accel": -0.89999986, | ||
"size": 4.0, | ||
"size_randomness": 0, | ||
"size_curve": { | ||
"points": [ | ||
[ | ||
0, | ||
1.64 | ||
], | ||
[ | ||
0.49, | ||
1.88 | ||
], | ||
[ | ||
1, | ||
0 | ||
] | ||
], | ||
"interpolation": "Linear", | ||
"resolution": 30 | ||
}, | ||
"blend_mode": "Alpha", | ||
"colors_curve": { | ||
"start": { | ||
"r": 0.75, | ||
"g": 0.75, | ||
"b": 0.75, | ||
"a": 1 | ||
}, | ||
"mid": { | ||
"r": 0.90909094, | ||
"g": 0.90909094, | ||
"b": 0.90909094, | ||
"a": 1 | ||
}, | ||
"end": { | ||
"r": 1, | ||
"g": 1, | ||
"b": 1, | ||
"a": 1 | ||
} | ||
}, | ||
"gravity": { | ||
"x": 0, | ||
"y": -54.1 | ||
}, | ||
"post_processing": {} | ||
} |
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.