Sergeanur
|
2c79080e1b
|
Merge branch 'miami' into lcs
# Conflicts:
# src/core/Radar.cpp
# src/core/Radar.h
|
2021-08-11 09:36:58 +03:00 |
|
Sergeanur
|
d7a28c4d2b
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
|
2021-08-11 08:35:01 +03:00 |
|
Sergeanur
|
519218572a
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/PedModelInfo.cpp
|
2021-04-09 04:31:46 +03:00 |
|
erorcun
|
a311f643f9
|
Fixes
|
2021-02-28 15:50:51 +03:00 |
|
Sergeanur
|
e38467ef3a
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
|
2021-02-16 18:08:19 +02:00 |
|
aap
|
3f60034c39
|
add w to CVector; adjust col structs a bit
|
2021-02-01 10:57:55 +01:00 |
|
erorcun
|
be88a42bad
|
Fix some Collision NaN/inf's
|
2021-01-28 00:51:43 +03:00 |
|
shfil
|
d68ec362dd
|
Fix CCollision::DistToLine
|
2021-01-24 12:36:43 +01:00 |
|
shfil
|
ca1de3cd17
|
Fix CCollision::DistToLine
|
2021-01-24 12:35:45 +01:00 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
aap
|
ab14a0bc61
|
foobar
|
2021-01-13 20:40:20 +01:00 |
|
aap
|
3a6935f126
|
fixed shoot through collision
|
2021-01-13 20:39:00 +01:00 |
|
Sergeanur
|
cfda5eb148
|
PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes
|
2020-12-18 02:58:09 +02:00 |
|
Sergeanur
|
9bb8ebaa10
|
Make collision code placement more like original (+ small fixes)
# Conflicts:
# premake5.lua
# src/CMakeLists.txt
# src/collision/Collision.cpp
# src/core/Collision.h
|
2020-11-16 00:36:54 +02:00 |
|