Sergeanur
|
881d61f811
|
Merge remote-tracking branch 'samler/world' into Standalone
|
2020-04-17 10:16:30 +03:00 |
|
Fire-Head
|
a4922d5cb7
|
rem refs
|
2020-04-17 08:54:14 +03:00 |
|
eray orçunus
|
2c2da558ca
|
Some refs removed, little fixes and teleport
|
2020-04-16 22:19:56 +03:00 |
|
saml1er
|
e52a02fb9e
|
Merge branch 'master' into world
# Conflicts:
# src/core/World.cpp
# src/core/World.h
|
2020-04-17 00:01:53 +05:00 |
|
saml1er
|
52d0d811b7
|
Reverse CWorld
|
2020-04-16 23:46:08 +05:00 |
|
aap
|
89b7085353
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-16 09:23:31 +02:00 |
|
Nikolay Korolev
|
1fd7b0288c
|
fix Bait crash
|
2020-04-16 01:19:08 +03:00 |
|
Nikolay Korolev
|
3517f3f1a1
|
fix script crash
|
2020-04-16 00:31:57 +03:00 |
|
aap
|
afce2e1bb3
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-15 22:36:21 +02:00 |
|
Nikolay Korolev
|
5cb7e2e42a
|
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
|
2020-04-15 23:28:09 +03:00 |
|
Nikolay Korolev
|
a43ca86542
|
Merge pull request #429 from Nick007J/master
Scene edit
|
2020-04-15 23:27:23 +03:00 |
|
erorcun
|
e132c3fada
|
Merge pull request #416 from saml1er/PedPath
CPedPath complete
|
2020-04-15 19:29:17 +03:00 |
|
erorcun
|
647cfbfd45
|
Merge pull request #446 from erorcun/erorcun
Many fixes and cleanup
|
2020-04-15 19:22:28 +03:00 |
|
eray orçunus
|
4da1879975
|
Many fixes and cleanup
|
2020-04-15 19:19:45 +03:00 |
|
aap
|
90be379bed
|
implemented most of librw wrapper
|
2020-04-15 14:05:40 +02:00 |
|
Sergeanur
|
27c9f7bc88
|
Merge remote-tracking branch 'origin/master' into MoreLanguages
|
2020-04-15 10:54:15 +03:00 |
|
Fire-Head
|
daed13485e
|
CWeapon done, ps2 cheats fix
|
2020-04-15 08:03:53 +03:00 |
|
Nikolay Korolev
|
b354a72de1
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 01:06:56 +03:00 |
|
Nikolay Korolev
|
70b51d42f4
|
fixed crash
|
2020-04-15 00:33:55 +03:00 |
|
Sergeanur
|
e373d0526e
|
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Hud.h
# src/text/Messages.cpp
# src/text/Text.cpp
|
2020-04-15 00:10:50 +03:00 |
|
saml1er
|
6d5464b6bb
|
CPedPath improvements
|
2020-04-14 23:32:15 +05:00 |
|
Nikolay Korolev
|
f35d2721f5
|
fix
|
2020-04-14 20:16:02 +03:00 |
|
Nikolay Korolev
|
f2c78e4bfb
|
Merge branch 'master' into game_dev
|
2020-04-14 20:10:39 +03:00 |
|
Nikolay Korolev
|
21a11fd343
|
scene edit
|
2020-04-14 20:09:42 +03:00 |
|
saml1er
|
bf040c7cd1
|
Remove float casts
|
2020-04-14 17:05:51 +05:00 |
|
saml1er
|
8bb23ca5d4
|
Refactor CPedPath::CalcPedRoute
|
2020-04-14 16:57:28 +05:00 |
|
saml1er
|
b4d5d5249c
|
CPedPath complete
|
2020-04-14 15:45:47 +05:00 |
|
Sergeanur
|
a19fa8764f
|
CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement
|
2020-04-14 13:08:03 +03:00 |
|
Nikolay Korolev
|
f54c83c0b5
|
Merge branch 'master' into game_dev
|
2020-04-14 01:18:53 +03:00 |
|
Filip Gawin
|
2e20e040cc
|
Merge pull request #403 from saml1er/roadblocks
CRoadBlocks complete
|
2020-04-14 00:11:39 +02:00 |
|
saml1er
|
60eb60de4e
|
Use NUMROADBLOCKS enum member in CRoadBlocks
|
2020-04-14 02:13:00 +05:00 |
|
Nikolay Korolev
|
906133d3be
|
fix garages
|
2020-04-13 22:43:41 +03:00 |
|
Sergeanur
|
304b574eba
|
added missing break
|
2020-04-13 22:25:24 +03:00 |
|
Nikolay Korolev
|
c21529467a
|
fixed record
|
2020-04-13 22:16:51 +03:00 |
|
Nikolay Korolev
|
12d36d8710
|
fixed record
|
2020-04-13 22:12:41 +03:00 |
|
Nikolay Korolev
|
cb85091d34
|
scene edit
|
2020-04-13 21:50:56 +03:00 |
|
Sergeanur
|
d8be75ac46
|
Fix compilation error
|
2020-04-13 15:21:26 +03:00 |
|
saml1er
|
68f8a6a9ed
|
more CRoadBlocks::GenerateRoadBlocks improvements
|
2020-04-13 15:21:39 +05:00 |
|
Sergeanur
|
741c9405d0
|
CPacManPickups
|
2020-04-13 12:07:07 +03:00 |
|
saml1er
|
28fb1bdde7
|
Fix CRoadBlocks::GenerateRoadBlocks bugs
|
2020-04-13 05:52:18 +05:00 |
|
Nikolay Korolev
|
e71b000cc5
|
Merge branch 'master' into game_dev
|
2020-04-12 12:13:32 +03:00 |
|
Nikolay Korolev
|
04c9affe2e
|
scene init
|
2020-04-12 12:06:33 +03:00 |
|
Nikolay Korolev
|
fa0f5542cc
|
Merge pull request #402 from Nick007J/master
Record
|
2020-04-12 12:06:12 +03:00 |
|
Nikolay Korolev
|
c593599fc5
|
Merge pull request #399 from saml1er/master
CObject complete
|
2020-04-12 12:05:49 +03:00 |
|
Nikolay Korolev
|
9593a2c000
|
fixed cranes bug
|
2020-04-12 11:36:51 +03:00 |
|
saml1er
|
60898f39f2
|
Improve CRoadBlocks code
|
2020-04-12 02:08:16 +05:00 |
|
Nikolay Korolev
|
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 |
|
saml1er
|
0d19036a42
|
CRoadBlocks complete
|
2020-04-11 21:45:49 +05:00 |
|
Nikolay Korolev
|
1c0c0a0468
|
fixed malloc/new
|
2020-04-11 13:20:41 +03:00 |
|
Nikolay Korolev
|
bc90f958da
|
fix constants
|
2020-04-11 02:27:50 +03:00 |
|
Nikolay Korolev
|
c8ac25ebfd
|
Merge branch 'master' into garages_dev
|
2020-04-11 02:04:56 +03:00 |
|
Nikolay Korolev
|
92b6d775d6
|
Record
|
2020-04-11 02:03:42 +03:00 |
|
Nikolay Korolev
|
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 |
|
saml1er
|
a8f7bf0bec
|
CObject complete
|
2020-04-10 16:44:08 +05:00 |
|
Nikolay Korolev
|
314bb83b9a
|
fixed intro crash
|
2020-04-10 12:03:22 +03:00 |
|
Sergeanur
|
8917567508
|
Fixing mixed IsCutsceneProcessing and IsRunning
|
2020-04-10 11:23:35 +03:00 |
|
Nikolay Korolev
|
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 |
|
Sergeanur
|
a5239b554f
|
Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
# src/core/Radar.cpp
|
2020-04-09 21:40:46 +03:00 |
|
Fire-Head
|
590ff32469
|
PS2 Cheats, restored R*names
|
2020-04-09 06:20:44 +03:00 |
|
Nikolay Korolev
|
42d5f65c55
|
fix bug
|
2020-04-08 23:50:45 +03:00 |
|
Nikolay Korolev
|
5966e627f0
|
fix bug
|
2020-04-08 15:17:07 +03:00 |
|
Nikolay Korolev
|
8ee98574ff
|
fix bug
|
2020-04-08 14:16:59 +03:00 |
|
Nikolay Korolev
|
8e29a5ec88
|
bug fix
|
2020-04-08 14:06:27 +03:00 |
|
Sergeanur
|
560fc65538
|
Small camera fixes
|
2020-04-08 09:58:08 +03:00 |
|
Nikolay Korolev
|
4f1d6123dd
|
stats fix
|
2020-04-06 19:31:08 +03:00 |
|
Nikolay Korolev
|
e6e51492f0
|
review fixes
|
2020-04-06 11:19:29 +03:00 |
|
Nikolay Korolev
|
7dc6815903
|
Merge branch 'master' into garages_dev
|
2020-04-06 02:01:45 +03:00 |
|
Nikolay Korolev
|
7f8a78e5de
|
Cranes done
|
2020-04-06 02:01:03 +03:00 |
|
Sergeanur
|
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 |
|
Nikolay Korolev
|
9436b5a8a5
|
Merge branch 'master' into garages_dev
|
2020-04-05 12:47:27 +03:00 |
|
Nikolay Korolev
|
30b8d7300b
|
shoreside garage fix
|
2020-04-05 12:44:58 +03:00 |
|
Nikolay Korolev
|
057b28e39b
|
cranes init
|
2020-04-05 12:35:51 +03:00 |
|
Sergeanur
|
2aace31b06
|
Merge remote-tracking branch 'origin/master' into MoreLanguages
|
2020-04-05 12:03:13 +03:00 |
|
Sergeanur
|
c0c09f2720
|
Japanese
|
2020-04-05 12:02:51 +03:00 |
|
aap
|
7ff5a3a65c
|
CCamera fixes
|
2020-04-03 09:26:10 +02:00 |
|
Nikolay Korolev
|
347f0a0e9c
|
vehicles missing functions + fixes
|
2020-04-01 01:58:40 +03:00 |
|
Nikolay Korolev
|
e34631adce
|
review fixes
|
2020-04-01 00:07:09 +03:00 |
|
Nikolay Korolev
|
357d88a4a8
|
fix
|
2020-03-31 01:00:06 +03:00 |
|
Nikolay Korolev
|
b3bfde0db0
|
added forgotten function
|
2020-03-31 00:53:51 +03:00 |
|
Nikolay Korolev
|
24e4ecf5bb
|
bug fixes, reorganisation
|
2020-03-31 00:46:44 +03:00 |
|
Nikolay Korolev
|
50b43b680e
|
finished garages
|
2020-03-31 00:01:03 +03:00 |
|
Nikolay Korolev
|
23c6a28324
|
Merge branch 'master' into garages_dev
|
2020-03-29 18:54:26 +03:00 |
|
Nikolay Korolev
|
24b8c7819c
|
merge with upstream
|
2020-03-29 18:51:18 +03:00 |
|
Nikolay Korolev
|
0db35f8275
|
more garages
|
2020-03-29 18:48:57 +03:00 |
|
Fire_Head
|
a0b077574e
|
Merge branch 'master' into master
|
2020-03-29 18:39:47 +03:00 |
|
Sergeanur
|
97ffa1a658
|
Wrappers cleanup
|
2020-03-29 08:58:08 +03:00 |
|
Nikolay Korolev
|
02615ccd98
|
fix
|
2020-03-29 02:09:02 +03:00 |
|
Nikolay Korolev
|
38c2f8fbb0
|
fixes
|
2020-03-29 01:48:49 +03:00 |
|
Fire-Head
|
194ddc5f40
|
CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names
|
2020-03-28 23:55:23 +03:00 |
|
Nikolay Korolev
|
93417853ed
|
fixes
|
2020-03-28 23:41:37 +03:00 |
|
Nikolay Korolev
|
101c21e064
|
merge with master
|
2020-03-28 20:55:15 +03:00 |
|
Nikolay Korolev
|
775bc3e666
|
garage update part 2
|
2020-03-28 20:52:25 +03:00 |
|
eray orçunus
|
112685ebac
|
CCopPed done and #include cleanup
|
2020-03-28 18:52:25 +03:00 |
|
Nikolay Korolev
|
9fb101fdd9
|
Merge branch 'master' into garages_dev
|
2020-03-28 15:24:55 +03:00 |
|
Nikolay Korolev
|
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 |
|
aap
|
22e022cc9f
|
implemented some unused PS2 cams
|
2020-03-27 18:21:46 +01:00 |
|
aap
|
f0dfaac838
|
Finished CCam; various smaller things
|
2020-03-27 10:04:45 +01:00 |
|
eray orçunus
|
0fe55eb543
|
CCopPed 2 and fixes
|
2020-03-26 18:54:03 +03:00 |
|
aap
|
4e7c186285
|
change default script to story
|
2020-03-24 11:58:09 +01:00 |
|
Nikolay Korolev
|
861506d048
|
merge with upstream
|
2020-03-22 19:47:14 +03:00 |
|
Filip Gawin
|
337924c794
|
Cleanup audio code + fixes for review
|
2020-03-22 17:30:54 +01:00 |
|
Filip Gawin
|
c88c2115e2
|
Remove unneeded double to float casts
|
2020-03-22 17:30:54 +01:00 |
|
Filip Gawin
|
8f01eab5ab
|
Fixes for Serge's review
|
2020-03-22 17:30:54 +01:00 |
|
Filip Gawin
|
0d1f42add1
|
Implement ProcessCrane
|
2020-03-22 17:30:54 +01:00 |
|
Nikolay Korolev
|
34b1881528
|
CGame::Initialise
|
2020-03-22 17:23:40 +03:00 |
|
Nikolay Korolev
|
7d213a1f32
|
bullet traces fixes
|
2020-03-22 13:20:36 +03:00 |
|
Nikolay Korolev
|
65e8558794
|
Merge remote-tracking branch 'upstream/master'
|
2020-03-22 13:09:18 +03:00 |
|
erorcun
|
b17935b89e
|
Merge branch 'master' into erorcun
|
2020-03-22 04:49:24 +03:00 |
|
Nikolay Korolev
|
c2f5dfdb1e
|
bullet traces
|
2020-03-21 20:14:29 +03:00 |
|
Nikolay Korolev
|
ac610b7e6e
|
fixed erroneous assumption
|
2020-03-21 15:13:38 +03:00 |
|
eray orçunus
|
d5a6e17079
|
ProcessButtonPresses and fixes
|
2020-03-21 14:58:54 +03:00 |
|
Nikolay Korolev
|
795e07c882
|
purple nines glitch fix
|
2020-03-21 14:29:03 +03:00 |
|
erorcun
|
7aa5d16b53
|
Merge pull request #347 from Nick007J/master
replay fixes + script crash fix
|
2020-03-17 20:41:59 +03:00 |
|
erorcun
|
1ab6702ea6
|
Merge pull request #345 from whampson/save-stuff
GenericSave() done
|
2020-03-17 20:35:18 +03:00 |
|
Nikolay Korolev
|
1971b3db62
|
Merge remote-tracking branch 'upstream/master'
|
2020-03-15 18:47:36 +03:00 |
|
Nikolay Korolev
|
152d8c2f40
|
replay bug fixes, script bug fix
|
2020-03-15 18:47:21 +03:00 |
|
Wes Hampson
|
0283dbcd12
|
Fix merge conflict
|
2020-03-11 15:49:19 -07:00 |
|
erorcun
|
4cc0fc1696
|
Merge branch 'master' into erorcun
|
2020-03-12 00:57:35 +03:00 |
|
eray orçunus
|
934e9db4fc
|
CPopulation done, CCopPed and fixes
|
2020-03-12 00:48:33 +03:00 |
|
Wes Hampson
|
28342405d3
|
Add Load/Save functions
|
2020-03-10 20:26:07 -07:00 |
|
Nikolay Korolev
|
1d8b3a216c
|
more utils
|
2020-03-05 01:10:09 +03:00 |
|
Nikolay Korolev
|
2058ca6bbb
|
more utils
|
2020-03-04 23:12:16 +03:00 |
|
Nikolay Korolev
|
d492390fec
|
script utils
|
2020-03-02 22:54:13 +03:00 |
|
Nikolay Korolev
|
90ff2f73eb
|
Merge branch 'master' into script_dev
|
2020-03-01 17:44:37 +03:00 |
|
Nikolay Korolev
|
5eccf44e7a
|
review fixes
|
2020-03-01 17:42:47 +03:00 |
|
Nikolay Korolev
|
ceab73a053
|
merge with upstream
|
2020-03-01 14:19:42 +03:00 |
|
Nikolay Korolev
|
64b28c0730
|
save/load
|
2020-03-01 14:18:10 +03:00 |
|
eray orçunus
|
ae523a09a7
|
fixes
|
2020-03-01 04:44:58 +03:00 |
|
eray orçunus
|
750d3229a3
|
CPopulation 3 and fixes
|
2020-02-27 19:38:35 +03:00 |
|
Nikolay Korolev
|
4d9853b0ce
|
removed debug leftovers
|
2020-02-24 21:18:11 +03:00 |
|
Nikolay Korolev
|
56c83dfaae
|
more stuff + intro fix
|
2020-02-24 21:17:15 +03:00 |
|
Nikolay Korolev
|
6260d51d44
|
Merge branch 'master' into script_dev
|
2020-02-24 12:10:59 +03:00 |
|
Nikolay Korolev
|
7d78879c48
|
more stuff
|
2020-02-24 12:10:21 +03:00 |
|
eray orçunus
|
cbf396e6e9
|
script fixes
|
2020-02-23 18:34:53 +03:00 |
|
Nikolay Korolev
|
0255f5d15f
|
more cosmetic stuff
|
2020-02-23 14:06:12 +03:00 |
|
Nikolay Korolev
|
1721a74466
|
stuff
|
2020-02-23 13:30:37 +03:00 |
|
Nikolay Korolev
|
1ba696f5fc
|
some changes
|
2020-02-23 13:12:44 +03:00 |
|
Nikolay Korolev
|
aa5266b1b3
|
some cosmetic stuff
|
2020-02-23 02:29:38 +03:00 |
|
Nikolay Korolev
|
bc139e0702
|
ARRAY_SIZE
|
2020-02-22 17:53:28 +03:00 |
|
Nikolay Korolev
|
a312e1ff81
|
merge
|
2020-02-22 15:36:22 +03:00 |
|
Nikolay Korolev
|
3481e431c9
|
fixes
|
2020-02-22 15:35:46 +03:00 |
|
eray orçunus
|
090aef7de7
|
CPopulation 2
|
2020-02-19 21:14:17 +03:00 |
|
erorcun
|
16ea0527dd
|
Merge pull request #328 from erorcun/erorcun
CPopulation 1
|
2020-02-17 23:02:58 +03:00 |
|
eray orçunus
|
ff92b822b6
|
CPopulation 1
|
2020-02-17 15:57:50 +03:00 |
|