mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-29 13:43:43 +00:00
Code Issues Projects Releases Wiki Activity
5421 commits 3 branches 0 tags 63 MiB
Commit graph

5421 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur
4141caa4d6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/core/Radar.cpp
#	src/core/config.h
 2021-08-12 16:04:25 +03:00
Sergeanur
0a2df3ca4c Fix sampman_null 2021-08-12 15:03:38 +03:00
Sergeanur
92c5cf1877 Sync audio changes from master 2021-08-12 14:57:16 +03:00
Sergeanur
43fbf297c8 Waypoint text fix 2021-08-12 14:15:49 +03:00
Sergeanur
ec22576e49 Merge remote-tracking branch 'aap/lcs' into lcs 
# Conflicts:
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
 2021-08-12 11:45:25 +03:00
Sergeanur
9a1b826021 Merge remote-tracking branch 'origin/miami' into lcs 2021-08-12 11:43:17 +03:00
Nikolay Korolev
b99edf9a6b mission retry fix 2021-08-12 11:23:10 +03:00
Nikolay Korolev
cb35f78511 lil fix 2021-08-12 01:30:26 +03:00
Sergeanur
68c37d2d88 Reverse miami vice ped comments 2021-08-11 10:55:00 +03:00
Sergeanur
80dc23621e uncomment GetSpecialCharacterTalkSfx 2021-08-11 10:47:02 +03:00
Sergeanur
b289bb4edb Reverse special characters' ped comments 2021-08-11 10:09:20 +03:00
Sergeanur
2c79080e1b Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/Radar.cpp
#	src/core/Radar.h
 2021-08-11 09:36:58 +03:00
Sergeanur
75f812cfcd Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/RoadBlocks.cpp
#	src/core/Radar.cpp
#	src/core/Radar.h
#	src/peds/Ped.cpp
#	src/peds/Population.cpp
#	src/renderer/Renderer.cpp
#	src/vehicles/CarGen.cpp
 2021-08-11 09:32:59 +03:00
Sergeanur
463fdab6a4 Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2 2021-08-11 08:42:26 +03:00
Sergeanur
d7a28c4d2b Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-11 08:35:01 +03:00
Sergeanur
0544beb00d Add sprite to the waypoint marker 2021-08-11 08:15:30 +03:00
Sergeanur
1f98f01dcb Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-09 18:14:19 +03:00
Sergeanur
8ea411e4c5 Add sprite to the waypoint marker 2021-08-09 18:07:42 +03:00
withmorten
ab5965cc8d fix steam saves 2021-08-09 16:36:15 +02:00
withmorten
858f913fac small fix 2021-08-09 16:34:05 +02:00
Nikolay Korolev
e042ba6f24 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-08-09 00:57:35 +03:00
Nikolay Korolev
4b7dc08bf5 debug func fix 2021-08-09 00:57:18 +03:00
Nikolay Korolev
c851d9a6ba Merge branch 'miami' into lcs 2021-08-09 00:08:42 +03:00
Nikolay Korolev
3869369703 Merge remote-tracking branch 'upstream/miami' into miami 2021-08-09 00:07:50 +03:00
Nikolay Korolev
2ee32abf84 fix bug in CCurves 2021-08-09 00:07:02 +03:00
Nikolay Korolev
c5af250959 debug func 2021-08-08 23:48:07 +03:00
Barracuda6
42ad9c4378 Comment out text following #endif 2021-08-08 18:09:56 +03:00
Sergeanur
26a9ac91ee Merge branch 'miami' into lcs 2021-08-08 18:02:45 +03:00
Sergeanur
76a22c0d13 Fix 2021-08-08 18:02:23 +03:00
Sergeanur
f887d515fa Sync fix from miami 2021-08-08 17:53:01 +03:00
Nikolay Korolev
729ef37040 merge 2021-08-08 17:44:38 +03:00
Nikolay Korolev
e17504a36a Merge branch 'master' into miami 2021-08-08 17:43:07 +03:00
Nikolay Korolev
4673f509f6 Revert "small fix" 
This reverts commit bd96584433.
 2021-08-08 17:42:32 +03:00
Nikolay Korolev
35dd465c19 Revert "small fix" 
This reverts commit bd96584433.
 2021-08-08 17:41:35 +03:00
Nikolay Korolev
7b9d8c5a1f merge 2021-08-08 17:36:08 +03:00
Nikolay Korolev
8d9508bda4 Merge branch 'master' into miami 2021-08-08 17:34:28 +03:00
Nikolay Korolev
bd96584433 small fix 2021-08-08 17:34:03 +03:00
Nikolay Korolev
68db861c45 merge 2021-08-08 17:29:57 +03:00
Nikolay Korolev
873840a6a5 merge 2021-08-08 17:19:49 +03:00
Nikolay Korolev
947f67dfb7 small fix 2021-08-08 17:17:20 +03:00
Nikolay Korolev
478bdcc1ca merge 2021-08-08 17:14:21 +03:00
Nikolay Korolev
63046894b0 small refactoring 2021-08-08 16:57:37 +03:00
Nikolay Korolev
74f00c3c63 merge 2021-08-08 15:46:47 +03:00
Nikolay Korolev
668311a444 Merge branch 'master' into miami 2021-08-08 15:44:18 +03:00
Nikolay Korolev
15f770531c fixed tab 2021-08-08 15:42:44 +03:00
Nikolay Korolev
88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Nikolay Korolev
9cc1201892 merge 2021-08-08 13:38:21 +03:00
Nikolay Korolev
e6b1a0691b lcs bridge 2021-08-08 13:08:47 +03:00
Nikolay Korolev
0c4ab5b609 disable mission replay for lcs 2021-08-08 10:51:04 +03:00
Nikolay Korolev
2672504e8a more cherry-pick fix 2021-08-07 20:40:27 +03:00