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 |
|
Nikolay Korolev
|
747705d430
|
lcs specific hack
|
2021-08-07 20:03:45 +03:00 |
|
Sergeanur
|
5d5e0f62e8
|
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
|
2021-07-03 16:39:22 +03:00 |
|
Sergeanur
|
8e6e46a919
|
Fix collision loading for mission entities
|
2021-07-02 00:18:38 +03:00 |
|
erorcun
|
618d689dff
|
Pool fixes + peds not forming circle fix
|
2021-06-24 21:34:28 +03:00 |
|
Sergeanur
|
19dd95a1cb
|
Merge branch 'miami' into lcs
* miami:
Pool fixes + peds not forming circle fix
|
2021-05-18 08:12:47 +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
|
62b8f0f553
|
Pool fixes + peds not forming circle fix
|
2021-03-06 19:28:59 +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
|
031df36935
|
CColModel
|
2021-02-09 17:45:02 +01: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 |
|
aap
|
fef87b9219
|
fix some breakage
|
2021-01-25 10:43:12 +01:00 |
|
aap
|
d6544933aa
|
Merge pull request #984 from aap/lcs
modelinfos
|
2021-01-25 10:30:34 +01:00 |
|
aap
|
a202e67349
|
CPedModelInfo and CTempColModels
|
2021-01-24 17:14:16 +01: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 |
|
Sergeanur
|
904090cbb6
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/BaseModelInfo.cpp
|
2021-01-23 15:14:15 +02:00 |
|
aap
|
20bcd4bd69
|
colstore done
|
2021-01-23 12:40:23 +01:00 |
|
erorcun
|
f85b5e99ed
|
Includes overhaul, fix some compiler warnings
|
2021-01-23 03:23:16 +03:00 |
|
Sergeanur
|
cea6b20c09
|
Merge remote-tracking branch 'origin/miami' into lcs
# 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
|
2021-01-22 15:04:09 +02:00 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
Sergeanur
|
4bd7bafd7c
|
Merge branch 'miami' into lcs
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# premake5.lua
# src/control/Script2.cpp
# src/control/Script8.cpp
|
2021-01-15 17:57:35 +02: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
|
f73e870bde
|
Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
bug of the decade
big oof
colmodel fix
|
2021-01-12 22:29:50 +02:00 |
|
aap
|
99a6976f53
|
colmodel fix
|
2021-01-12 12:42:29 +01:00 |
|
Sergeanur
|
a223157000
|
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
|
2021-01-11 19:53:15 +02:00 |
|
Nikolay Korolev
|
5e10f1fe6a
|
sync with upstream
|
2021-01-07 18:38:40 +03:00 |
|
Nikolay Korolev
|
db1bdfd62d
|
minor refactoring
|
2021-01-07 18:30:35 +03:00 |
|
Nikolay Korolev
|
69d30f2204
|
some lcs stuff
|
2021-01-07 15:21:35 +03:00 |
|
Sergeanur
|
42e4a068bb
|
CVarConsole
|
2021-01-02 13:32:25 +02:00 |
|
Sergeanur
|
7959b7fd1f
|
NO_ISLAND_LOADING ported from re3
|
2020-12-27 18:26:30 +02:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +03: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
|
e9a5670348
|
PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes
|
2020-12-18 02:57:54 +02:00 |
|
aap
|
13cefd3293
|
more PS2 stuff; memory movement done
|
2020-12-03 16:04:59 +01:00 |
|
aap
|
d857758c16
|
start using CMemoryHeap
|
2020-11-26 17:39:59 +01:00 |
|
Sergeanur
|
cdd30f4da5
|
Move ColStore to collision
|
2020-11-16 12:49:23 +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 |
|
Sergeanur
|
a6f5f4634c
|
Make collision code placement more like original (+ small fixes)
|
2020-11-15 19:51:35 +02:00 |
|