summaryrefslogtreecommitdiffstats
path: root/src/collision (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-08-111-1/+1
|\ | | | | | | | | | | # Conflicts: # src/core/Radar.cpp # src/core/Radar.h
| * Fix a bunch of CModelInfo::GetModelInfo->GetColModel callsSergeanur2021-08-111-1/+1
| |
* | lcs specific hackNikolay Korolev2021-08-071-0/+2
| |
* | Merge branch 'miami' into lcsSergeanur2021-07-031-1/+1
|\| | | | | | | | | # Conflicts: # premake5.lua
| * Fix collision loading for mission entitiesSergeanur2021-07-011-1/+1
| |
| * Pool fixes + peds not forming circle fixerorcun2021-06-242-4/+4
| |
* | Merge branch 'miami' into lcsSergeanur2021-05-182-4/+4
|\ \ | | | | | | | | | | | | * miami: Pool fixes + peds not forming circle fix
| * | Pool fixes + peds not forming circle fixerorcun2021-03-062-4/+4
| |/
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-04-091-2/+1
|\| | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp
| * Fixeserorcun2021-02-281-2/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-2/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Fix some Collision NaN/inf'serorcun2021-01-271-2/+19
| |
| * Fix CCollision::DistToLineshfil2021-01-241-6/+6
| |
* | CColModelaap2021-02-094-42/+103
| |
* | add w to CVector; adjust col structs a bitaap2021-02-015-13/+19
| |
* | fix some breakageaap2021-01-251-1/+3
| |
* | Merge pull request #984 from aap/lcsaap2021-01-254-22/+85
|\ \ | | | | | | modelinfos
| * | CPedModelInfo and CTempColModelsaap2021-01-244-22/+85
| | |
* | | Fix CCollision::DistToLineshfil2021-01-241-6/+6
|/ /
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-232-1/+2
|\| | | | | | | | | # Conflicts: # src/modelinfo/BaseModelInfo.cpp
| * Includes overhaul, fix some compiler warningserorcun2021-01-232-1/+2
| |
* | colstore doneaap2021-01-232-20/+173
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp
| * get rid of most --MIAMI commentswithmorten2021-01-221-5/+3
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-151-4/+11
|\| | | | | | | | | | | | | | | | | # Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # premake5.lua # src/control/Script2.cpp # src/control/Script8.cpp
| * foobaraap2021-01-131-1/+0
| |
| * fixed shoot through collisionaap2021-01-131-4/+12
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-121-1/+0
|\| | | | | | | | | | | | | * origin/miami: bug of the decade big oof colmodel fix
| * colmodel fixaap2021-01-121-1/+0
| |
* | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bitSergeanur2021-01-112-2/+2
| |
* | sync with upstreamNikolay Korolev2021-01-071-1/+20
|\|
| * minor refactoringNikolay Korolev2021-01-071-1/+13
| |
| * CVarConsoleSergeanur2021-01-021-0/+7
| |
* | some lcs stuffNikolay Korolev2021-01-071-0/+1
|/
* NO_ISLAND_LOADING ported from re3Sergeanur2020-12-271-1/+1
|
* merge attemptNikolay Korolev2020-12-192-2/+8
|\
| * PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-181-7/+7
| |
| * more PS2 stuff; memory movement doneaap2020-12-031-1/+1
| |
| * start using CMemoryHeapaap2020-11-261-0/+6
| |
| * Make collision code placement more like original (+ small fixes)Sergeanur2020-11-1522-0/+4761
|
* PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-181-7/+7
|
* Move ColStore to collisionSergeanur2020-11-162-0/+279
|
* Make collision code placement more like original (+ small fixes)Sergeanur2020-11-1522-0/+4651
# Conflicts: # premake5.lua # src/CMakeLists.txt # src/collision/Collision.cpp # src/core/Collision.h