Commit Graph

1208 Commits

Author SHA1 Message Date
29b76fc4f5 small thing 2021-01-01 22:57:17 +03:00
b4b9f9601b Merge branch 'miami' into lcs-dev 2021-01-01 14:55:00 +03:00
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00
575845772f Merge branch 'miami' into lcs-dev 2021-01-01 13:21:42 +03:00
56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
9c2f1b0833 More bike leftovers 2020-12-28 14:00:44 +02:00
149aef929d fixed replay 2020-12-26 12:56:20 +03:00
e00b8a93bf Fix use of strncmp 2020-12-25 15:18:48 +02:00
b12eef1d56 Fix use of strncmp 2020-12-25 15:18:13 +02:00
5f98b4fdca Merge remote-tracking branch 'upstream/miami' into miami 2020-12-25 12:12:09 +03:00
86f04884de fix garage 2020-12-25 12:11:22 +03:00
6a2edcea46 Small type use fixes
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/vehicles/Cranes.cpp
2020-12-25 09:03:13 +02:00
de31bdc89f Small type use fixes 2020-12-25 08:59:32 +02:00
dcb28bfd53 fix 2020-12-20 17:12:34 +03:00
fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
140fa2a21c restore original code, fixes, ps2 font 2020-12-19 21:25:45 +03:00
76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
55cf1a37cb Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-18 13:50:37 +01:00
aap
a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
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
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
2903ebe296 Fix placement of some script functions
# Conflicts:
#	src/control/Script5.cpp
2020-12-16 23:29:17 +02:00
9a9b1e7574 Fix placement of some script functions 2020-12-16 23:28:06 +02:00
f76dfaee82 Use SetPedState 2020-12-15 05:11:02 +02:00
ac95138c18 More fixes 2020-12-15 04:16:29 +02:00
ab3e258f19 SetPedState fixes 2020-12-15 03:25:05 +02:00
3b8ac474a2 Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREE
Fixes 881
2020-12-14 15:33:16 +01:00
0563478de0 Fix some formatting issues 2020-12-14 11:18:46 +02:00
f42a01f653 CPed::SetWeaponLockOnTarget 2020-12-14 09:47:07 +02:00
8fb461b873 removed obsolete ifdef (since we have GTA_REPLAY) 2020-12-13 00:20:44 +03:00
01c95378e1 fixed some replay bugs 2020-12-12 23:05:12 +03:00
bfe382c315 better fix 2020-12-12 21:06:14 +03:00
229b8f304a fixed a bug 2020-12-12 20:37:26 +03:00
82c40b73ca fixed a bug 2020-12-12 20:35:17 +03:00
4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03:00
aap
ccbbde549e Merge pull request #869 from Nick007J/miami
garages revision + fixes
2020-12-09 09:55:50 +01:00
ac3484b82e Merge pull request #872 from withmorten/sized-enums-miami
Get rid of sized enums 2: Electric Boogaloo
2020-12-09 03:31:03 +03:00
6b654094a5 Merge pull request #871 from withmorten/sized-enums
Get rid of sized enums
2020-12-09 03:15:20 +03:00
016ff5b4aa sync with upstream 2020-12-08 12:00:24 +03:00
f3e9c82432 Pool fixes from master 2020-12-08 07:52:03 +02:00
b13b26b5fb GenerateOneRandomCar cleanup 2020-12-08 03:33:56 +02:00
aae4f3319f Fixes 2020-12-08 03:29:08 +02:00
8d3864a4e5 Fix CRecordDataForChase::ShouldThisPadBeLeftAlone 2020-12-08 02:56:20 +02:00
84cc31fea3 Fix wrong define 2020-12-08 02:27:35 +02:00
87bca997a4 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-07 21:50:18 +03:00
c5fbb594a5 ps2 hud, restore original code 2020-12-07 21:12:13 +03:00
7e11f639aa don't cast script param to uint8 2020-12-07 02:02:59 +01:00