mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-07-02 08:24:48 +00:00
Code Issues Projects Releases Wiki Activity
5409 commits 3 branches 0 tags 56 MiB
Commit graph

1920 commits

Author SHA1 Message Date
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 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
Nikolay Korolev c851d9a6ba Merge branch 'miami' into lcs 2021-08-09 00:08:42 +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 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 88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Nikolay Korolev 9cc1201892 merge 2021-08-08 13:38:21 +03:00
Nikolay Korolev c69edce800 mission replay 2021-08-07 20:24:01 +03:00
Nikolay Korolev 5999ddc76d Merge remote-tracking branch 'upstream/miami' into miami 2021-08-03 21:44:18 +03:00
aap 0338d4c393 CPhysical almost done 2021-08-02 20:05:39 +02:00
Sergeanur 865ce46fdb Fix waypoint disappearing after each save 2021-08-02 14:26:00 +03:00
erorcun 418bf3ab69 Fix R* optimization that prevents peds to spawn 2021-08-01 13:56:24 +03:00
erorcun 192190769d Add ped and car density slider to menu, remove dumb collision "optimization" 2021-08-01 13:56:09 +03:00
Nikolay Korolev 1479093d33 Merge remote-tracking branch 'upstream/miami' into miami 2021-08-01 12:54:20 +03:00
Nikolay Korolev 70080f1fdb mission replay 2021-08-01 12:54:05 +03:00
Sergeanur a481b900b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/modelinfo/MloModelInfo.cpp
#	src/modelinfo/MloModelInfo.h
#	src/renderer/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-07-31 20:43:52 +03:00
Sergeanur 835fa4e74b Make cars and peds to not despawn when you look away 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/core/config.h
#	src/peds/Population.cpp
 2021-07-31 20:32:13 +03:00
Sergeanur 232b5a04ba
Merge pull request #1251 from Sergeanur/HigherDrawDist 
Make cars and peds to not despawn when you look away
 2021-07-31 20:07:29 +03:00
Sergeanur 9d25e7f315
Merge pull request #1248 from davicr/radar-cutscene-bugfix 
Fix blip rendering during scripted sequences
 2021-07-31 20:06:20 +03:00
aap 3f3e258d77 CVisibilityPlugins, CRenderer, some fixes 2021-07-29 19:59:34 +02:00
aap 3c5bae164f CVisibilityPlugins and CRenderer fixes 2021-07-29 19:43:47 +02:00
Nikolay Korolev c4f5cbce5e fix 2021-07-27 22:27:13 +03:00
withmorten d77ed4608f fix 2021-07-26 20:25:36 +02:00
Sergeanur f73dfa12e6 Make cars and peds to not despawn when you look away 2021-07-26 04:43:26 +03:00
Nikolay Korolev c7d3b88cb7 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-25 21:44:31 +03:00
Nikolay Korolev bf4b39781b low effort save support 2021-07-25 21:44:21 +03:00
Sergeanur d83b8cf940 Merge branch 'miami' into lcs 
# Conflicts:
#	src/renderer/Hud.cpp
 2021-07-25 21:01:00 +03:00
Nikolay Korolev b69222e017 friggin the riggin 2021-07-25 11:58:03 +03:00
Sergeanur bf757fc960 Fix CPlayerInfo distance types 2021-07-24 00:59:19 +03:00
Davi bd3c3849fe Properly fix blip rendering during scripted sequences 
Changes conditionals from "DrawBlips" and "ShowRadarTrace", "ShowRadarTraceWithHeight" to allow blips to be rendered during scripted sequences when "MENU_MAP" is enabled.
 2021-07-22 16:10:15 -03:00
withmorten a437d2bc26 fix garbage data written in garage save block 2021-07-19 23:43:51 +02:00
Nikolay Korolev 0a23afebb7 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-17 10:06:37 +03:00
withmorten ec5a07b049 Merge remote-tracking branch 'origin/miami' into lcs 2021-07-15 19:11:32 +02:00
withmorten c8cb1ed013
Merge pull request #1219 from withmorten/miami-ini 
miami: switch out current ini_parser.hpp with pulzed/mINI
 2021-07-15 18:56:14 +02:00
Sergeanur 780cd225e9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:12 +03:00
Sergeanur 2ce36a48b9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:02 +03:00
Sergeanur 3377709c4b Merge branch 'miami' into lcs 2021-07-15 00:51:01 +03:00
Sergeanur 02c4ada807 Remove stupid cast 2021-07-15 00:49:46 +03:00
Sergeanur 4f78733836 Remove stupid cast 2021-07-15 00:47:11 +03:00
Nikolay Korolev 81aece7117 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-13 19:43:48 +03:00
withmorten 523b23339c disable USE_CUTSCENE_SHADOW_FOR_PED if COMPATIBLE_SAVES isn't defined 2021-07-13 00:21:11 +02:00
Sergeanur c982700a69 Enable cutscene shadows 2021-07-13 01:00:00 +03:00
withmorten 6f0f9d7d69 Merge remote-tracking branch 'origin/miami' into lcs 2021-07-12 23:36:37 +02:00