mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-29 05:55:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse source 
# Conflicts:
#	utils/gxt/german.txt
This commit is contained in:
Sergeanur 2021-07-10 02:07:14 +03:00
commit 71d1b46417
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/config.h
View file

@ -468,6 +468,11 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
#undef DISABLE_LOADING_SCREEN #undef DISABLE_LOADING_SCREEN
#undef DISABLE_VSYNC_ON_TEXTURE_CONVERSION #undef DISABLE_VSYNC_ON_TEXTURE_CONVERSION
#undef EXTENDED_COLOURFILTER
#undef EXTENDED_PIPELINES
#undef SCREEN_DROPLETS
#undef NEW_RENDERER
#undef FIX_SPRITES #undef FIX_SPRITES
#define PC_WATER #define PC_WATER

7
src/vehicles/Vehicle.cpp
View file

@ -817,11 +817,12 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
if(contactSpeedRight != 0.0f){ if(contactSpeedRight != 0.0f){
// exert opposing force // exert opposing force
right = -contactSpeedRight/wheelsOnGround; right = -contactSpeedRight/wheelsOnGround;
#ifdef FIX_BUGS // BUG?
// contactSpeedRight is independent of framerate but right has timestep as a factor // contactSpeedRight is independent of framerate but right has timestep as a factor
// so we probably have to fix this // so we probably have to fix this
right *= CTimer::GetTimeStepFix(); // fixing this causes jittery cars at 15fps, and causes the car to move backwards slowly at 18fps
#endif // at 19fps, the effects are gone ...
//right *= CTimer::GetTimeStepFix();
if(wheelStatus == WHEEL_STATUS_BURST){ if(wheelStatus == WHEEL_STATUS_BURST){
float fwdspeed = Min(contactSpeedFwd, fBurstSpeedMax); float fwdspeed = Min(contactSpeedFwd, fBurstSpeedMax);

BIN
utils/gxt/gxt.exe
View file

Binary file not shown.