Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'miami' into lcs | Sergeanur | 2021-05-18 | 2 | -4/+4 |
|\ | | | | | | | | | * miami: Pool fixes + peds not forming circle fix | ||||
| * | Pool fixes + peds not forming circle fix | erorcun | 2021-03-06 | 2 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-04-09 | 1 | -2/+1 |
|\| | | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp | ||||
| * | Fixes | erorcun | 2021-02-28 | 1 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-02-16 | 1 | -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's | erorcun | 2021-01-27 | 1 | -2/+19 |
| | | |||||
| * | Fix CCollision::DistToLine | shfil | 2021-01-24 | 1 | -6/+6 |
| | | |||||
* | | CColModel | aap | 2021-02-09 | 4 | -42/+103 |
| | | |||||
* | | add w to CVector; adjust col structs a bit | aap | 2021-02-01 | 5 | -13/+19 |
| | | |||||
* | | fix some breakage | aap | 2021-01-25 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #984 from aap/lcs | aap | 2021-01-25 | 4 | -22/+85 |
|\ \ | | | | | | | modelinfos | ||||
| * | | CPedModelInfo and CTempColModels | aap | 2021-01-24 | 4 | -22/+85 |
| | | | |||||
* | | | Fix CCollision::DistToLine | shfil | 2021-01-24 | 1 | -6/+6 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-23 | 2 | -1/+2 |
|\| | | | | | | | | | # Conflicts: # src/modelinfo/BaseModelInfo.cpp | ||||
| * | Includes overhaul, fix some compiler warnings | erorcun | 2021-01-23 | 2 | -1/+2 |
| | | |||||
* | | colstore done | aap | 2021-01-23 | 2 | -20/+173 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-22 | 1 | -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 comments | withmorten | 2021-01-22 | 1 | -5/+3 |
| | | |||||
* | | Merge branch 'miami' into lcs | Sergeanur | 2021-01-15 | 1 | -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 | ||||
| * | foobar | aap | 2021-01-13 | 1 | -1/+0 |
| | | |||||
| * | fixed shoot through collision | aap | 2021-01-13 | 1 | -4/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-12 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | * origin/miami: bug of the decade big oof colmodel fix | ||||
| * | colmodel fix | aap | 2021-01-12 | 1 | -1/+0 |
| | | |||||
* | | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit | Sergeanur | 2021-01-11 | 2 | -2/+2 |
| | | |||||
* | | sync with upstream | Nikolay Korolev | 2021-01-07 | 1 | -1/+20 |
|\| | |||||
| * | minor refactoring | Nikolay Korolev | 2021-01-07 | 1 | -1/+13 |
| | | |||||
| * | CVarConsole | Sergeanur | 2021-01-02 | 1 | -0/+7 |
| | | |||||
* | | some lcs stuff | Nikolay Korolev | 2021-01-07 | 1 | -0/+1 |
|/ | |||||
* | NO_ISLAND_LOADING ported from re3 | Sergeanur | 2020-12-27 | 1 | -1/+1 |
| | |||||
* | merge attempt | Nikolay Korolev | 2020-12-19 | 2 | -2/+8 |
|\ | |||||
| * | PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes | Sergeanur | 2020-12-18 | 1 | -7/+7 |
| | | |||||
| * | more PS2 stuff; memory movement done | aap | 2020-12-03 | 1 | -1/+1 |
| | | |||||
| * | start using CMemoryHeap | aap | 2020-11-26 | 1 | -0/+6 |
| | | |||||
| * | Make collision code placement more like original (+ small fixes) | Sergeanur | 2020-11-15 | 22 | -0/+4761 |
| | |||||
* | PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes | Sergeanur | 2020-12-18 | 1 | -7/+7 |
| | |||||
* | Move ColStore to collision | Sergeanur | 2020-11-16 | 2 | -0/+279 |
| | |||||
* | Make collision code placement more like original (+ small fixes) | Sergeanur | 2020-11-15 | 22 | -0/+4651 |
# Conflicts: # premake5.lua # src/CMakeLists.txt # src/collision/Collision.cpp # src/core/Collision.h |