Commit Graph

4641 Commits

Author SHA1 Message Date
shfil
1ab96abb91 Add cmake option for sanitizers 2021-01-24 21:36:13 +01:00
shfil
513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
Sergeanur
0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/control/Script.cpp
2021-01-24 22:22:16 +02:00
Sergeanur
c1f0fe1da6
Merge pull request #987 from Sergeanur/lcsHud
Partial hud
2021-01-24 22:19:31 +02:00
erorcun
071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun
b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
Sergeanur
e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
aap
1bee2caf5c CClumpModelInfo 2021-01-24 15:28:26 +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
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
Nikolay Korolev
e9d58b5a90 Merge branch 'lcs' into lcs-dev 2021-01-24 13:42:48 +03:00
Nikolay Korolev
ee89c485fc sync 2021-01-24 13:42:45 +03:00
aap
c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
Nikolay Korolev
8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
Nikolay Korolev
c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +03:00
Nikolay Korolev
4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
Nikolay Korolev
de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev
4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
aap
4269e613a3
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch
Fix plane / ccbb cheat flight pitch
2021-01-23 21:06:33 +01:00
Sergeanur
2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Nikolay Korolev
d28e9a7b62 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 23:04:38 +03:00
Nikolay Korolev
37d1aa4129 script fixes 2021-01-23 23:04:24 +03:00
Zach Charo
77051ddc78
Update Vehicle.cpp 2021-01-23 13:38:45 -06:00
aap
a1d6833bac txd store 2021-01-23 19:23:38 +01:00
Sergeanur
13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +02:00
Sergeanur
de44a17e64 Fix ini name 2021-01-23 18:16:47 +02:00
Sergeanur
e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/core/re3.cpp
2021-01-23 17:54:46 +02:00
erorcun
770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03:00
erorcun
1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03:00
Sergeanur
defbb01aaa Merge remote-tracking branch 'origin/lcs' into lcs
* origin/lcs:
  Remove size assert
  Add TXD mid field
  Enable GTA_BRIDGE
  LCS model indices
2021-01-23 15:14:24 +02:00
Sergeanur
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
Sergeanur
4bde3366c1
Merge pull request #980 from Sergeanur/lcsMID
LCS model indices
2021-01-23 15:09:54 +02:00
Sergeanur
cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
erorcun
45c2488e36 Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
erorcun
73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
Nikolay Korolev
3326603265 added some missing functions 2021-01-23 15:33:01 +03:00
Nikolay Korolev
b5c4866964 added some missing functions 2021-01-23 15:32:07 +03:00
aap
f6fb473cf9 revert accident 2021-01-23 12:59:52 +01:00
aap
a22b6168c6 wrong path node array 2021-01-23 12:50:46 +01:00
aap
2814f2e8cf wrong path node array 2021-01-23 12:49:54 +01:00
aap
20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
Nikolay Korolev
552497d71b fix 2021-01-23 14:11:57 +03:00
Nikolay Korolev
8d0100f100 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 12:54:27 +03:00
Nikolay Korolev
a105003a7a I hate GetATanOfXY 2021-01-23 12:54:08 +03:00
Sergeanur
e03aaec030 Add (Don't) walk lights 2021-01-23 04:07:50 +02:00
Sergeanur
0aad73f4a1 Remove size assert 2021-01-23 03:39:24 +02:00