Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 22:27:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into issue52_grab_y_offset

Browse source
This commit is contained in:
Deconimus 2024-04-02 13:26:52 +02:00
parent 01a7a67536 618f147da6
commit 70019f281a
4 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/models/window_frame.blend
View file

Binary file not shown.

BIN
assets/test_chambers/materials.blend
View file

Binary file not shown.

BIN
assets/test_chambers/test_chamber_00/test_chamber_00.blend
View file

Binary file not shown.

2
src/scene/ball_catcher.c
View file

@ -107,7 +107,7 @@ void ballCatcherCheckBalls(struct BallCatcher* catcher, struct BallLauncher* bal
}
catcher->caughtBall = &launcher->currentBall;
soundPlayerPlay(soundsBallCatcher, 5.0f, 1.0f, &catcher->rigidBody.transform.position, &catcher->rigidBody.velocity, SoundTypeAll);
soundPlayerPlay(soundsBallCatcher, 2.5f, 1.0f, &catcher->rigidBody.transform.position, &catcher->rigidBody.velocity, SoundTypeAll);
ballMarkCaught(catcher->caughtBall);
skAnimatorRunClip(&catcher->animator, dynamicAssetClip(PROPS_COMBINE_BALL_CATCHER_DYNAMIC_ANIMATED_MODEL, PROPS_COMBINE_BALL_CATCHER_ARMATURE_CATCH_CLIP_INDEX), 0.0f, 0);
}