Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,712 Commits 3 Branches 2 Tags
138abb91f6232ef40e1093b3c37122e1b0bf2cf1
Commit Graph

605 Commits

Author SHA1 Message Date
Sergeanur
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
erorcun
cac1c5bd42 Saner loop 2021-06-30 04:12:59 +03:00
erorcun
9f0daee186 Sanitizer fixes 2021-06-30 03:31:10 +03:00
withmorten
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
Sergeanur
eaebaa6db3 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
 2021-06-28 05:16:21 +03:00
Sergeanur
f8297df9c5 Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
Sergeanur
776e8ff2ee Fix some timer calls 2021-06-24 21:45:48 +03:00
Sergeanur
1558788df1 Fix IsSphereVisible calls 2021-06-24 21:45:48 +03:00
aap
e014bb5359 CEntity done; C(Vu)Vector fixes and cleanup 2021-06-24 21:45:21 +03:00
majestic
f34365dfc0 some fixes for CPed 2021-06-24 21:44:40 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
c7821635fd Wait states ported (scripted animations) 2021-06-24 21:42:10 +03:00
Sergeanur
fad64667a7 Fix some timer calls 2021-06-24 21:34:33 +03:00
Sergeanur
f2c8522daa Fix IsSphereVisible calls 2021-06-24 21:34:33 +03:00
aap
93e9929925 CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:34:33 +03:00
majestic
42e655b4cc some fixes for CPed 2021-06-24 21:34:32 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
erorcun
618d689dff Pool fixes + peds not forming circle fix 2021-06-24 21:34:28 +03:00
Sergeanur
19dd95a1cb Merge branch 'miami' into lcs 
* miami:
  Pool fixes + peds not forming circle fix
 2021-05-18 08:12:47 +03:00
Sergeanur
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
Sergeanur
fdb6428c6b Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-05-12 03:29:36 +03:00
Sergeanur
2fc431d1bb Complete sfx enum, rename some sounds + fixes of missing ped comments 2021-05-12 03:26:54 +03:00
Sergeanur
8f54093de1 Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/World.cpp
 2021-05-10 02:48:56 +03:00
Sergeanur
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
Sergeanur
519218572a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
 2021-04-09 04:31:46 +03:00
erorcun
62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +03:00
erorcun
97008905b6 Fix FPEs 2021-03-02 03:38:41 +03:00
erorcun
a311f643f9 Fixes 2021-02-28 15:50:51 +03:00
Sergeanur
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
Nikolay Korolev
7c74c01741 fixed attractors 2021-02-11 13:35:56 +03:00
erorcun
775db94a96 Ped jump teleport/kill fix 2021-02-10 15:26:42 +03:00
erorcun
b464bb7fd4 Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim 2021-02-08 13:23:19 +03:00
erorcun
2cad49940e Use our synonyms for attack anims again 2021-02-07 21:13:54 +03:00
withmorten
4281730b16 fix UB and potential crashes when doing ice cream 2021-02-02 11:27:30 +01:00
erorcun
c4328afce7 Even more fixes & shorten quit screen 2021-01-29 19:16:26 +03:00
erorcun
810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
Sergeanur
97351ad2c2 Use original animation names from VCS 2021-01-27 18:50:24 +02:00
Sergeanur
9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
withmorten
9d4053419b Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
Sergeanur
0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
 2021-01-24 22:22:16 +02:00
erorcun
071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Sergeanur
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
 2021-01-23 15:14:15 +02:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
 2021-01-22 15:04:09 +02:00
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
Nikolay Korolev
50cde66067 fix 2021-01-22 00:14:30 +03:00
Nikolay Korolev
061fd25c61 fixes 2021-01-19 02:38:02 +03:00
Nikolay Korolev
c09297997e script full 2021-01-18 22:19:30 +03:00