Commit Graph

873 Commits

Author SHA1 Message Date
d8be75ac46 Fix compilation error 2020-04-13 15:21:26 +03:00
68f8a6a9ed more CRoadBlocks::GenerateRoadBlocks improvements 2020-04-13 15:21:39 +05:00
741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
28fb1bdde7 Fix CRoadBlocks::GenerateRoadBlocks bugs 2020-04-13 05:52:18 +05:00
e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
04c9affe2e scene init 2020-04-12 12:06:33 +03:00
fa0f5542cc Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
c593599fc5 Merge pull request #399 from saml1er/master
CObject complete
2020-04-12 12:05:49 +03:00
9593a2c000 fixed cranes bug 2020-04-12 11:36:51 +03:00
60898f39f2 Improve CRoadBlocks code 2020-04-12 02:08:16 +05:00
fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
aap
3c999a1eb8 fixed traffic light position 2020-04-11 19:33:39 +02:00
0d19036a42 CRoadBlocks complete 2020-04-11 21:45:49 +05:00
1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
bc90f958da fix constants 2020-04-11 02:27:50 +03:00
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