Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added neo/models/weapons/v_jinrai_zr68c.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68c.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68c.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68c.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68c.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68c.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68c.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68c.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68c.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68c.vvd
Binary file not shown.
159 changes: 142 additions & 17 deletions neo/modelsrc/weapons/README.md

Large diffs are not rendered by default.

351 changes: 351 additions & 0 deletions neo/modelsrc/weapons/glue.py

Large diffs are not rendered by default.

1,806 changes: 1,806 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68c/anims/drawunloaded.smd

Large diffs are not rendered by default.

4,509 changes: 4,509 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68c/anims/drawunloaded_reload.smd

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions neo/modelsrc/weapons/jinrai_zr68c/composites.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
drawunloaded_reload drawunloaded reload@1_unload-
1 change: 1 addition & 0 deletions neo/modelsrc/weapons/jinrai_zr68c/glued.qci
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$sequence "drawunloaded_reload" "../jinrai_zr68c/anims/drawunloaded_reload.smd" fps 30 fadein 0.20 fadeout 0.20 node "0"
1 change: 1 addition & 0 deletions neo/modelsrc/weapons/jinrai_zr68c/v_jinrai_zr68c.qc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
$modelname "weapons/v_jinrai_zr68c.mdl"
$include "../zr68c/viewmodel.qci"
$include "../jinrai_zr68c/glued.qci"
1 change: 1 addition & 0 deletions neo/modelsrc/weapons/nsf_zr68c/v_nsf_zr68c.qc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
$modelname "weapons/v_nsf_zr68c.mdl"
$include "../zr68c/viewmodel.qci"
$include "../jinrai_zr68c/glued.qci"
Binary file modified neo/modelsrc/weapons/viewmodels.blend
Binary file not shown.
Binary file not shown.
21 changes: 21 additions & 0 deletions neo/scripts/weapon_zr68c_reload_phases.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// ZR68C ReloadPhases (sv_neo_reload_experimental), included by neo's scripts/weapon_zr68c.txt through #base.
// Per viewmodel sequence and reload step: when the step's ammo counts ("ammo") and when each of its sounds first
// hits ("sound", "sound2"), in seconds from the sequence start. export_viewmodels.py sets every time from the
// timeline markers in the .blend. "resume" names the sequence the draw plays when a switch interrupts the reload
// after the step. A resume after step N lists only the steps after N. reload's own sound plays whole, as on master.
"WeaponData"
{
"ReloadPhases"
{
"reload"
{
"1_unload" { "ammo" "0.700" "resume" "drawunloaded_reload" }
"2_load" { "ammo" "1.333" }
}
"drawunloaded_reload"
{
"2_load" { "ammo" "1.400" "sound" "1.367" "sound_name" "weapon_zr68.reload_load" "sound2" "1.800" "sound2_name" "weapon_zr68.reload_load_part2" }
"3_cycle" { "ammo" "2.333" "sound" "2.100" "sound_name" "weapon_zr68.reload_cycle" }
}
}
}
Binary file added neo/sound/weapons/zr68/zr68_reload_cycle.wav
Binary file not shown.
Binary file added neo/sound/weapons/zr68/zr68_reload_load.wav
Binary file not shown.
Binary file added neo/sound/weapons/zr68/zr68_reload_load_part2.wav
Binary file not shown.