archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-04-20 17:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,588 Commits 3 Branches 0 Tags
Commit Graph

97 Commits

Author SHA1 Message Date
Sergeanur
2be8fcfa64 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.cpp
#	src/core/Radar.cpp
 2021-08-29 08:58:54 +03:00
Nikolay Korolev
915888d275 fixed debug teleport 2021-08-26 21:14:26 +03:00
Sergeanur
43fbf297c8 Waypoint text fix 2021-08-12 14:15:49 +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
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
f887d515fa Sync fix from miami 2021-08-08 17:53:01 +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
Sergeanur
865ce46fdb Fix waypoint disappearing after each save 2021-08-02 14:26:00 +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
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
withmorten
f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup"" 
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
 2021-06-26 19:14:46 +02:00
erorcun
af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup" 
This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
 2021-06-26 00:25:59 +03:00
Sergeanur
2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +03:00
Sergeanur
e671fe682d Merge remote-tracking branch 'GitHub/miami' into lcs 2021-06-25 00:47:06 +03:00
Sergeanur
14c71f39ff High FPS Fixes 2021-06-25 00:39:47 +03:00
Sergeanur
0c3ee871f4 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:42:10 +03:00
Sergeanur
bd94c16e78 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:34:32 +03:00
Sergeanur
596e12b897 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:32:43 +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
aap
82245789ed proper radar clipping 2021-02-28 14:55:14 +01:00
aap
931bc690cd proper radar clipping 2021-02-28 14:55:01 +01: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
Filip Gawin
3d4791f291 Revert "First batch of fixes (CallAndMessage)" 
This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe.
 2021-01-31 21:06:38 +01:00
Filip Gawin
7a3b80a9b7 First batch of fixes (CallAndMessage) 2021-01-31 20:44:39 +01:00
erorcun
d52b917c54 Some regular fixes and UB fixes 2021-01-29 19:23:02 +03:00
erorcun
c4328afce7 Even more fixes & shorten quit screen 2021-01-29 19:16:26 +03: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
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01: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
Sergeanur
b5deee823c Load LCS radar blips 2021-01-22 04:00:17 +02:00
withmorten
034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
withmorten
f2596b3759 Merge remote-tracking branch 'upstream/master' into cw 2021-01-21 03:20:31 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Nikolay Korolev
23831e38e6 sync 2021-01-20 21:14:12 +03:00
Sergeanur
cc94419a72 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
 2021-01-20 19:32:03 +02:00
aap
2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
aap
505438cd90 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-19 21:33:17 +01:00
aap
bb66028e74 pc radar fix 2021-01-19 21:33:09 +01:00
withmorten
25d3066eae fix RWLIBS build without GTA_PS2_STUFF 2021-01-19 12:05:38 +01:00
Nikolay Korolev
4703ec5164 sync 2021-01-17 16:03:37 +03:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Nikolay Korolev
f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
erorcun
a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +03:00
Nikolay Korolev
d7789661cd Merge remote-tracking branch 'upstream/miami' into miami 2020-10-18 17:30:51 +03:00
eray orçunus
f60e3d667a Minor things 2020-10-18 13:53:17 +03:00