mse / RSOD (public) (License: CC0 and other licenses) (since 2025-03-01) (hash sha1)
Free software FPS engine
Clone URLs: https://rocketgit.com/user/mse/RSOD ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD git://git.rocketgit.com/user/mse/RSOD
master
List of commits:
Subject Hash Author Date (UTC)
Blend avatar jump animations 8d26db0ecd4ef6a48546684e4bf2200bfea0f41b MSE 2024-09-20 08:19:20
Work on animation blending system eb5cfcf1387131b1ec8449e671d30efd787363b2 MSE 2024-09-20 06:40:35
Update stb_truetype 4948f1d29f33a33dc126d842d8d20f732f4cdef0 MSE 2024-09-18 17:38:06
Allow joystick to override mouse 6aba7a71ebe0dbd67717ae5a37e1729ebfe9895c MSE 2024-09-15 23:13:30
Add weapon switching via D-pad db14ce946f4c65ab6625875f00f82ee1b8052374 MSE 2024-09-15 20:10:20
Allow crouch to be turned off via playerCrouch flag 024d43d877ca16d21e0feeb50d70f82acd449335 MSE 2024-09-15 03:02:29
Add configurable third-person camera pitch constraints 9e2ebdd325515a5bc83cd49229cb099738fb9e0e MSE 2024-09-11 21:02:38
Add configurable thirdPersonCameraAutoRotateSpeed c3104421a4df91fbda573dadcce135f8016fa40e MSE 2024-09-11 19:27:17
Fix inventory display bug 8626c06403b025c6423ec249771598375791b6ca MSE 2024-09-02 23:38:01
Highlight agents and default MSAA to 2 f51dcb39a8abf3d2800d074dfc9606c1c8d486ec MSE 2024-08-27 03:46:04
Fix bad math e0ef61f3961a4d98608fb2c724cb631955ae1d82 MSE 2024-08-24 22:04:23
Smooth camera auto-rotation 0ddcd28b59e564e123a4984d26d2ec80a9f57ec7 MSE 2024-08-24 21:58:32
Allow free look in third-person a8b209cdd85ae914027ffd6c04990b75e9752578 MSE 2024-08-24 21:26:39
Auto-rotate third-person camera b9f034155274b8dc20b9f33d1fc39ce701017b0d MSE 2024-08-24 04:25:51
Use common math to rotate avatars 75e98c52899f17d8d511e733c1445f5eb69b738a MSE 2024-08-24 02:03:53
Correct minimap rotation in third-person 9bcf201c6b24b80b7eec2bb4b2ad296cd5d296ed MSE 2024-08-22 07:07:08
Rotate third-person agents independently of camera d4bcdb8ff8b47d6429117002a71881812c45a3dc MSE 2024-08-22 06:43:19
Remove browser launch from package-steam edb75b8fd4499e49f4a7893b0acf23bde9c8e5f9 MSE 2024-07-31 23:42:42
Work around a minimap regression acc3a99e8b96af34179824bcef7a11b0d539a499 MSE 2024-07-18 23:44:57
Check noautosave flag 185b4817614429cd43e8cdc1237fa5c9e635eff9 MSE 2024-07-12 01:04:06
Commit 8d26db0ecd4ef6a48546684e4bf2200bfea0f41b - Blend avatar jump animations
Author: MSE
Author date (UTC): 2024-09-20 08:19
Committer name: MSE
Committer date (UTC): 2024-09-20 08:19
Parent(s): eb5cfcf1387131b1ec8449e671d30efd787363b2
Signer:
Signing key:
Signing status: N
Tree: b32f284d6257a8677e5b588a41fface5a5e160cc
File Lines added Lines deleted
include/avatar.h 3 3
src/rsod.cpp 2 1
File include/avatar.h changed (mode: 100644) (index 07c9d7e..c853a12)
... ... void Avatar::blendTo( const std::string &animation ){
400 400 } }
401 401
402 402 void Avatar::simulate( const std::string &animation, double d, bool loop ){ void Avatar::simulate( const std::string &animation, double d, bool loop ){
403 bool blend = bodyFrame < 0.0 || headFrame < 0.0;
403 bool blend = bodyFrame < 0.0 && headFrame < 0.0;
404 404 if( blend ) loop = false; if( blend ) loop = false;
405 405 auto bodyAnim = bodyAnimations[blend ? "_blend" : animation]; auto bodyAnim = bodyAnimations[blend ? "_blend" : animation];
406 406 auto headAnim = headAnimations[blend ? "_blend" : animation]; auto headAnim = headAnimations[blend ? "_blend" : animation];
407 if( bodyFrame < bodyAnim.x || (loop && bodyFrame >= bodyAnim.y) )
407 if( (!blend && bodyFrame < bodyAnim.x) || (loop && bodyFrame >= bodyAnim.y) )
408 408 bodyFrame = bodyAnim.x; bodyFrame = bodyAnim.x;
409 409 if( (double)bodyAnim.y - bodyAnim.x > 0.0 ){ if( (double)bodyAnim.y - bodyAnim.x > 0.0 ){
410 410 // Play the appropriate body animation. // Play the appropriate body animation.
 
... ... void Avatar::simulate( const std::string &animation, double d, bool loop ){
415 415 bodyFrame = std::min(bodyFrame + bodyFPS * d, (double)bodyAnim.y); bodyFrame = std::min(bodyFrame + bodyFPS * d, (double)bodyAnim.y);
416 416 } }
417 417 } }
418 if( headFrame < headAnim.x || (loop && headFrame >= headAnim.y) )
418 if( (!blend && headFrame < headAnim.x) || (loop && headFrame >= headAnim.y) )
419 419 headFrame = headAnim.x; headFrame = headAnim.x;
420 420 if( (double)headAnim.y - headAnim.x > 0.0 ){ if( (double)headAnim.y - headAnim.x > 0.0 ){
421 421 // Play the appropriate head animation. // Play the appropriate head animation.
File src/rsod.cpp changed (mode: 100644) (index 2b2c7d0..646212d)
... ... void FirstPersonLoop( double d ){
3789 3789 }else{ }else{
3790 3790 move = { 0.0f, 0.0f }; move = { 0.0f, 0.0f };
3791 3791 } }
3792 // TODO: Customizable jump velocity.
3793 3792 player_translation = { player_translation = {
3794 3793 move.x, move.x,
3795 3794 jumpButtonDown ? (float)dungeon.playerAgent->jumpVel : 0.0f, jumpButtonDown ? (float)dungeon.playerAgent->jumpVel : 0.0f,
 
... ... void FirstPersonLoop( double d ){
3875 3874 ); );
3876 3875 // Bob the weapon. // Bob the weapon.
3877 3876 bobbing = true; bobbing = true;
3877 // Blend the animation.
3878 dungeon.playerAgent->avatar.blendTo( "jump" );
3878 3879 } }
3879 3880 // Rotate the third-person camera about the player. TODO: Adjust pitch. // Rotate the third-person camera about the player. TODO: Adjust pitch.
3880 3881 if(autorotate){ if(autorotate){
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/RSOD

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/RSOD

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main