From 62eec9724968cb383865807331d003bc1cfb9cc8 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 26 May 2023 22:04:16 +0100 Subject: [PATCH] Proper fist models .. for fisting stormtroopers with Co-Authored-By: Grant Bagwell --- .../Android/jni/OpenJK/code/cgame/cg_main.cpp | 2 +- .../Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp | 2 +- .../models/players/kyle/lhand_force_fisting.md3 | Bin 0 -> 9272 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 z_vr_assets_base/models/players/kyle/lhand_force_fisting.md3 diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp index e05a4b1..09a7751 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp @@ -1441,7 +1441,7 @@ static void CG_RegisterGraphics( void ) { //VR Hand models cgs.media.handModel_relaxed = cgi_R_RegisterModel( "models/players/kyle/lhand_r.md3" ); - cgs.media.handModel_fist = cgi_R_RegisterModel( "models/players/kyle/lhand_r.md3" ); + cgs.media.handModel_fist = cgi_R_RegisterModel( "models/players/kyle/lhand_force_fisting.md3" ); cgs.media.handModel_force = cgi_R_RegisterModel( "models/players/kyle/lhand_f.md3" ); diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp index 5b3f1a6..b7b21dd 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp @@ -1317,7 +1317,7 @@ static void CG_RegisterGraphics( void ) { //VR Hand models cgs.media.handModel_relaxed = cgi_R_RegisterModel( "models/players/kyle/lhand_r.md3" ); - cgs.media.handModel_fist = cgi_R_RegisterModel( "models/players/kyle/lhand_r.md3" ); + cgs.media.handModel_fist = cgi_R_RegisterModel( "models/players/kyle/lhand_force_fisting.md3" ); cgs.media.handModel_force = cgi_R_RegisterModel( "models/players/kyle/lhand_f.md3" ); cgs.media.saberHilt = cgi_R_RegisterModel( "models/weapons2/saber/saber_w.md3" ); diff --git a/z_vr_assets_base/models/players/kyle/lhand_force_fisting.md3 b/z_vr_assets_base/models/players/kyle/lhand_force_fisting.md3 new file mode 100644 index 0000000000000000000000000000000000000000..f28e66059b0cdb87ead6c66e76ff0734c552dd8a GIT binary patch literal 9272 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