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
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
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
6dc8c5bd92
Merge branch 'miami' into lcs
2021-07-27 20:58:17 +03:00
c0488b3190
Fix stuck looking flag when answering phone and idle weapon animation
2021-07-26 20:40:55 +03:00
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
f7a2c265b3
Remove deceiving comment
2021-07-26 09:16:43 +03:00
1aac4d802f
Fix Tommy looking at one spot due to crouching + shooting
2021-07-26 07:41:34 +03:00
d83b8cf940
Merge branch 'miami' into lcs
...
# Conflicts:
# src/renderer/Hud.cpp
2021-07-25 21:01:00 +03:00
aec797671e
Fix aiming with minigun and flamethrower with PC controls
2021-07-22 22:15:27 +03:00
cc13e31264
Merge branch 'miami' into lcs
2021-07-22 21:17:55 +03:00
5e34b1efcf
Possible fix of RemoveAndAdd crash
2021-07-22 20:37:49 +03:00
953e4fc4ff
Fix falling damage
2021-07-22 20:07:51 +03:00
3377709c4b
Merge branch 'miami' into lcs
2021-07-15 00:51:01 +03:00
fb5a207abc
Fix NearPed count going negative
2021-07-13 17:45:01 +02:00
55d30a11ec
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# src/audio/AudioManager.h
# src/control/Garages.cpp
# src/control/Garages.h
# src/control/Script5.cpp
# src/core/config.h
# utils/gxt/american.txt
# utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
6f103a3b82
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-10 02:06:43 +02:00
5d5e0f62e8
Merge branch 'miami' into lcs
...
# Conflicts:
# premake5.lua
2021-07-03 16:39:22 +03:00
1c0878f65b
Sanitizer fixes 2
2021-07-03 02:57:32 +03:00
4eea98c66b
Peds: Efforts to find the reason of crashes on GCC 7.5.0
...
* Prevent deleted peds to be in nearPeds list (was always needed, might be unrelated to crashes)
* Add asserts to nearPeds and PedIK ctor (crash reasons)
* Shouldn't fix reported crashes since they were caused by null peds.
2021-07-02 23:56:54 +03:00
138abb91f6
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/Script4.cpp
# src/core/Frontend.cpp
2021-06-30 21:26:36 +03:00
cac1c5bd42
Saner loop
2021-06-30 04:12:59 +03:00
9f0daee186
Sanitizer fixes
2021-06-30 03:31:10 +03:00
d17d437de3
rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)
2021-06-28 13:57:05 +02:00
eaebaa6db3
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/Script5.cpp
# src/entities/Entity.cpp
2021-06-28 05:16:21 +03:00
f8297df9c5
Redo ReadSaveBuf + common.h cleanup
2021-06-28 05:12:54 +03:00
776e8ff2ee
Fix some timer calls
2021-06-24 21:45:48 +03:00
1558788df1
Fix IsSphereVisible calls
2021-06-24 21:45:48 +03:00
e014bb5359
CEntity done; C(Vu)Vector fixes and cleanup
2021-06-24 21:45:21 +03:00
f34365dfc0
some fixes for CPed
2021-06-24 21:44:40 +03:00
1fa0116f5f
Use bool8 in audio code
2021-06-24 21:44:36 +03:00
c7821635fd
Wait states ported (scripted animations)
2021-06-24 21:42:10 +03:00
fad64667a7
Fix some timer calls
2021-06-24 21:34:33 +03:00
f2c8522daa
Fix IsSphereVisible calls
2021-06-24 21:34:33 +03:00
93e9929925
CEntity and C(Vu)Vector fixes and cleanup
2021-06-24 21:34:33 +03:00
42e655b4cc
some fixes for CPed
2021-06-24 21:34:32 +03:00
5bcdb933a7
Use bool8 in audio code
2021-06-24 21:34:32 +03:00
618d689dff
Pool fixes + peds not forming circle fix
2021-06-24 21:34:28 +03:00
19dd95a1cb
Merge branch 'miami' into lcs
...
* miami:
Pool fixes + peds not forming circle fix
2021-05-18 08:12:47 +03:00
3596897961
Merge pull request 'Pool fixes + peds not forming circle fix' ( #4 ) from erorcun/re3:miami into miami
...
Reviewed-on: https://git.jacksmininetwork.co.uk/re/re3/pulls/4
2021-05-18 04:33:47 +00:00
fdb6428c6b
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
2021-05-12 03:29:36 +03:00
2fc431d1bb
Complete sfx enum, rename some sounds + fixes of missing ped comments
2021-05-12 03:26:54 +03:00
8f54093de1
Merge branch 'miami' into lcs
...
# Conflicts:
# src/core/World.cpp
2021-05-10 02:48:56 +03:00
3dda658e42
Use some GetMatrix/SetMatrix logic based on SA
...
# Conflicts:
# src/control/Pickups.cpp
# src/control/RoadBlocks.cpp
# src/core/World.cpp
# src/entities/Entity.cpp
# src/objects/CutsceneHead.cpp
# src/objects/Object.cpp
2021-05-10 02:45:04 +03:00
519218572a
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/modelinfo/PedModelInfo.cpp
2021-04-09 04:31:46 +03:00
62b8f0f553
Pool fixes + peds not forming circle fix
2021-03-06 19:28:59 +03:00
97008905b6
Fix FPEs
2021-03-02 03:38:41 +03:00
a311f643f9
Fixes
2021-02-28 15:50:51 +03:00
e38467ef3a
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
2021-02-16 18:08:19 +02:00
7c74c01741
fixed attractors
2021-02-11 13:35:56 +03:00
