Commit Graph

4576 Commits

Author SHA1 Message Date
f27e1ec818 Fix doubles in ZoneCull 2021-01-26 19:26:28 +02:00
2fea28f194 fix 2021-01-26 02:27:57 +03:00
42d9d6abc8 syncd 2021-01-26 02:27:32 +03:00
46e63da4d8 sync 2021-01-26 02:25:47 +03:00
d7bd0be53e garage stuff 2021-01-26 02:23:55 +03:00
0ae6d1fecf Merge branch 'lcs' into lcs 2021-01-26 01:01:32 +03:00
d898abf63d config 2021-01-26 00:55:55 +03:00
ba4028b9dd lcs WaterCannon 2021-01-26 00:52:03 +03:00
cea8ad4b85 Fix check 2021-01-25 19:40:19 +02:00
129d7333be Fix function dupe 2021-01-25 19:38:13 +02:00
9647901ba0 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
c21e5f5e79 Move CRunningScript 2021-01-25 19:33:02 +02:00
202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
cb34060f00 Support pads without L2-R2, add comments 2021-01-25 16:48:41 +03:00
9d4053419b Merge pull request #977 from withmorten/miami-cw
make building with Codewarrior 7 possible
2021-01-25 14:06:53 +01:00
aap
785bd8ebcc proper ini fix 2021-01-25 13:02:00 +01:00
aap
a4c5b87b90 more bletcherous stuff 2021-01-25 10:45:38 +01:00
aap
fef87b9219 fix some breakage 2021-01-25 10:43:12 +01:00
aap
4f591aa87a ini fixes 2021-01-25 10:30:57 +01:00
aap
d6544933aa Merge pull request #984 from aap/lcs
modelinfos
2021-01-25 10:30:34 +01:00
aap
453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap
4564f7aeea modelinfo fixes 2021-01-24 23:24:41 +01:00
aap
ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
1ab96abb91 Add cmake option for sanitizers 2021-01-24 21:36:13 +01:00
513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
1d3b4d1e9a Add cmake option for sanitizers 2021-01-24 21:34:53 +01:00
0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/control/Script.cpp
2021-01-24 22:22:16 +02:00
071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
5336620f5c Ped: car enter anim. fix 2021-01-24 20:05:43 +03:00
a0bf47cfd2 Fix out of bound binding orders 2021-01-24 19:39:31 +03:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
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
d68ec362dd Fix CCollision::DistToLine 2021-01-24 12:36:43 +01:00
ca1de3cd17 Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
3e6bb267f3 Fix CCollision::DistToLine 2021-01-24 12:34:40 +01:00
aap
c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
5183d7cf0f enable default resolution for vanilla defines 2021-01-23 23:18:05 +01:00
db6b7b473d whitespace fix 2021-01-23 23:02:22 +01:00
8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +03:00
4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
de32fbe75e another backport 2021-01-23 23:16:38 +03:00
6bdc0365ee another backport 2021-01-23 23:15:50 +03:00
4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
921ca7712e use ARRAY_SIZE 2021-01-23 23:10:59 +03:00