89 Commits

Author SHA1 Message Date
Sergeanur
8f54093de1 Merge branch 'miami' into lcs
# Conflicts:
#	src/core/World.cpp
2021-05-10 02:48:56 +03:00
Sergeanur
1817727a66 Small Acos fix 2021-05-10 02:36:18 +03:00
aap
8fb3a3ff23 fix typo 2021-02-10 15:10:27 +01:00
aap
26bbbe0037 fix clouds 2021-02-09 20:02:29 +01:00
aap
031df36935 CColModel 2021-02-09 17:45:02 +01:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
aap
9361aeb8eb CTimeModelInfo and CWeaponModelInfo 2021-01-24 14:06:16 +01:00
aap
8cbae5d62a CSimpleModelInfo 2021-01-24 13:47:33 +01: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
af09cb06f5 Merge branch 'miami' into lcs
* miami:
  Use original names
2021-01-08 21:53:42 +02:00
Sergeanur
faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
aap
ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01:00
Sergeanur
587c788ce3 Fix 2020-12-25 17:20:57 +02:00
Sergeanur
e00b8a93bf Fix use of strncmp 2020-12-25 15:18:48 +02:00
aap
fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
a080fbfbd4 little cleanup of templates 2020-12-18 13:58:59 +01:00
aap
a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
aap
2c59e1c894 some more GTA_VERSION 2020-12-01 00:22:57 +01:00
aap
4b9fb631fc added a few registered pointers and memory debug 2020-11-30 23:44:58 +01:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
Sergeanur
fe40f65703 Reorganize CPed functions into their original cpp files 2020-11-20 01:18:37 +02:00
Sergeanur
9e45feb4fa Reorganize CPed functions into their original cpp files 2020-11-19 21:12:20 +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
aap
546ed0ff07 changes to RW layer so loading foreign files works 2020-11-11 09:42:30 +01:00
aap
e97366c023 implemented extra model flags for backface culling and alpha test from mobile 2020-10-29 19:11:47 +01:00
eray orçunus
fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +03:00
eray orçunus
8c170a62ee Fix some sanitizer errors, improve POSIX streamer 2020-10-04 22:39:54 +03:00
aap
6b7a8f96a6 CCollision done and fixes 2020-07-27 15:38:46 +02:00
aap
2e8048d0fe collision fixes 2020-07-27 15:38:12 +02:00
aap
5bedca7692 fixed COcclusion 2020-07-20 23:25:04 +02:00
Sergeanur
de8759eabd Merge branch 'master' into miami
# Conflicts:
#	src/control/Record.cpp
#	src/vehicles/Automobile.cpp
2020-07-17 13:53:11 +03:00
Sergeanur
949d0c8853 Add audio cache for faster initialization 2020-07-17 13:48:25 +03:00
aap
4e3e1d0b87 make game load all platform dffs 2020-07-16 13:36:25 +02:00
aap
3370ae04cb renamed 2dfx shadowRange to Size 2020-06-28 12:08:46 +02:00
aap
418bee9c22 renamed 2dfx shadowRange to Size 2020-06-28 12:05:42 +02:00
aap
2b21f92347 rename attractor flag to type 2020-06-25 15:13:33 +02:00
aap
cafe4d6f0c rename attractor flag to type 2020-06-25 15:13:08 +02:00
aap
62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
Nikolay Korolev
21329b8440 sync with upstream 2020-05-16 01:50:45 +03:00
Nikolay Korolev
08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
eray orçunus
acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Nikolay Korolev
d426588496 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-13 17:55:12 +03:00
Nikolay Korolev
81ea6f0258 ped attractor: start 2020-05-13 11:38:05 +03:00
Sergeanur
7c2b9478d5 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
aap
d9a8bab631 update file loader for new VC fields 2020-05-10 18:14:14 +02:00
aap
5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
aap
0552d49fce CVehicleModelInfo 2020-05-10 17:09:14 +02:00