crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
4,852 Commits 3 Branches 0 Tags 79 MiB
a481b900b9
Commit Graph

4081 Commits

Author SHA1 Message Date
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
Magnus Larsen
d923cd2f24 Allow sector ped count to exceed gap-list size 
This solves the gnNumTempPedList assertion.
To prove this works, change gapTempPedList's length to 12, and visit the
Triad's basketball court.

# Conflicts:
#	src/peds/Ped.cpp
 2021-07-31 20:34:32 +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
aap
bf035b8167
Merge pull request #1259 from aap/lcs 
CVisibilityPlugins, CRenderer, some fixes
 2021-07-31 19:08:01 +02:00
Sergeanur
e8dcc8432d Possible crashfix with wanted level 2021-07-30 20:36:07 +03:00
aap
3f3e258d77 CVisibilityPlugins, CRenderer, some fixes 2021-07-29 19:59:34 +02:00
aap
30061396e8 CVisibilityPlugins and CRenderer fixes; pulled MLO back in 2021-07-29 19:43:06 +02:00
Sergeanur
b77d93ba4a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-29 01:59:20 +03:00
Sergeanur
7bacf3b6f4 Reverse unused audio functions 2021-07-29 01:52:49 +03:00
Sergeanur
cce97588fe Reverse unused audio functions from mobile 
# Conflicts:
#	src/audio/AudioManager.h
 2021-07-29 00:43:04 +03:00
Sergeanur
04126cd18a Merge branch 'miami' into lcs 2021-07-28 10:32:58 +03:00
Sergeanur
2aa37813d2 cAudioManager declaration reordering 2021-07-28 10:32:43 +03:00
Sergeanur
92679555b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/MusicManager.cpp
 2021-07-28 09:42:24 +03:00
Sergeanur
8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur
7adc85995f Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2021-07-28 09:24:23 +03:00
Sergeanur
61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur
98003d0d41 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:56:42 +03:00
Sergeanur
49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur
029e315f0a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:42:18 +03:00
Sergeanur
16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur
f82c3c8ea7 Merge branch 'miami' into lcs 2021-07-27 22:39:14 +03:00
Sergeanur
9dbaa7a77f PolRadio type fixes 2021-07-27 22:38:57 +03:00
Sergeanur
fbb42085bd Merge branch 'miami' into lcs 2021-07-27 22:30:45 +03:00
Sergeanur
7aa8d7c073 AudioManager.cpp reordering 2021-07-27 22:29:40 +03:00
Nikolay Korolev
c4f5cbce5e fix 2021-07-27 22:27:13 +03:00
Nikolay Korolev
c26a57fb9f fix 2021-07-27 22:18:24 +03:00
Sergeanur
ad2ccdb44a Merge branch 'miami' into lcs 2021-07-27 22:02:45 +03:00
Sergeanur
782d38c6b7 Sort AudioCollision functions into original order 2021-07-27 22:02:25 +03:00
Sergeanur
ec7d702185
Merge pull request #1255 from Nick007J/lcs 
low effort save support
 2021-07-27 20:59:08 +03:00
Sergeanur
6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
Nikolay Korolev
0461a36a4e fix 2021-07-26 21:59:56 +03:00
Nikolay Korolev
9e374491c5 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-26 21:58:37 +03:00
Sergeanur
c0488b3190 Fix stuck looking flag when answering phone and idle weapon animation 2021-07-26 20:40:55 +03:00
Sergeanur
1180f32d9c Fix bike kick sound 2021-07-26 11:33:56 +03:00
Sergeanur
371f1be9b3 Fix smooth spray when using chainsaw or when you stop shooting while using free camera and PC controls 2021-07-26 09:54:04 +03:00
Sergeanur
250727c9ca Fix muzzleflash rotation 2021-07-26 09:52:39 +03:00
Sergeanur
f7a2c265b3 Remove deceiving comment 2021-07-26 09:16:43 +03:00
Sergeanur
123f2fda9b Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:22:57 +03:00
Sergeanur
1aac4d802f Fix Tommy looking at one spot due to crouching + shooting 2021-07-26 07:41:34 +03:00
Sergeanur
ed9c911a0e Fix traffic light corona facing wrong side 2021-07-26 04:40:23 +03:00
Sergeanur
a510a03b8a Small fix 2021-07-25 22:27:00 +03:00
Sergeanur
c234cb4663 Law enforcers and generic female ped comments 2021-07-25 22:16:02 +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
Sergeanur
5032d24ad8 Fix 2021-07-25 19:59:02 +03:00
Sergeanur
601f63f4fb Sync fix from master 2021-07-25 19:50:00 +03:00
Nikolay Korolev
b69222e017 friggin the riggin 2021-07-25 11:58:03 +03:00
Nikolay Korolev
dc729009ac Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-24 01:02:23 +03:00
Sergeanur
bf757fc960 Fix CPlayerInfo distance types 2021-07-24 00:59:19 +03:00