Commit Graph

1208 Commits

Author SHA1 Message Date
c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
92b6d775d6 Record 2020-04-11 02:03:42 +03:00
be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
aap
c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
314bb83b9a fixed intro crash 2020-04-10 12:03:22 +03:00
8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +03:00
917fa80c18 record init 2020-04-10 11:03:38 +03:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
a5239b554f Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
#	src/core/Radar.cpp
2020-04-09 21:40:46 +03:00
590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
42d5f65c55 fix bug 2020-04-08 23:50:45 +03:00
5966e627f0 fix bug 2020-04-08 15:17:07 +03:00
8ee98574ff fix bug 2020-04-08 14:16:59 +03:00
8e29a5ec88 bug fix 2020-04-08 14:06:27 +03:00
560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
e6e51492f0 review fixes 2020-04-06 11:19:29 +03:00
7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
4fc2f9c359 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 17:03:59 +03:00
aap
5e9ae94298 Merge pull request #378 from aap/master
finished CCamera
2020-04-05 14:30:28 +02:00
9436b5a8a5 Merge branch 'master' into garages_dev 2020-04-05 12:47:27 +03:00
30b8d7300b shoreside garage fix 2020-04-05 12:44:58 +03:00
057b28e39b cranes init 2020-04-05 12:35:51 +03:00
2aace31b06 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 12:03:13 +03:00
c0c09f2720 Japanese 2020-04-05 12:02:51 +03:00
aap
7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
e34631adce review fixes 2020-04-01 00:07:09 +03:00
357d88a4a8 fix 2020-03-31 01:00:06 +03:00
b3bfde0db0 added forgotten function 2020-03-31 00:53:51 +03:00
24e4ecf5bb bug fixes, reorganisation 2020-03-31 00:46:44 +03:00
50b43b680e finished garages 2020-03-31 00:01:03 +03:00
23c6a28324 Merge branch 'master' into garages_dev 2020-03-29 18:54:26 +03:00
24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
0db35f8275 more garages 2020-03-29 18:48:57 +03:00
a0b077574e Merge branch 'master' into master 2020-03-29 18:39:47 +03:00
97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
02615ccd98 fix 2020-03-29 02:09:02 +03:00
38c2f8fbb0 fixes 2020-03-29 01:48:49 +03:00
194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00
93417853ed fixes 2020-03-28 23:41:37 +03:00
101c21e064 merge with master 2020-03-28 20:55:15 +03:00
775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
9fb101fdd9 Merge branch 'master' into garages_dev 2020-03-28 15:24:55 +03:00
268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
aap
e7c18fc17f removed windows.h for most .cpps 2020-03-27 20:53:47 +01:00
aap
29f69f6216 Merge pull request #357 from aap/master
Finished CCam; various smaller things
2020-03-27 18:41:22 +01:00