joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,454 Commits 3 Branches 0 Tags 63 MiB
Commit Graph

124 Commits

Author SHA1 Message Date
Sergeanur d7e764d519 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/AudioLogic.cpp
#	src/core/config.h
#	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-08-16 10:09:39 +03:00
erorcun 4a5f7464c1 Switch PR & remove X11 part from CMakeLists 2021-08-14 18:09:07 +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
Adrian Graber 6665b16ba2 Nintendo Switch support 2021-07-13 01:18:49 +02:00
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
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
withmorten cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +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
withmorten f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup"" 
This reverts commit af7573ddbe.
 2021-06-26 19:14:46 +02:00
erorcun af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup" 
This reverts commit 2b67aba94c.
 2021-06-26 00:25:59 +03:00
Sergeanur 2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +03:00
aap e014bb5359 CEntity done; C(Vu)Vector fixes and cleanup 2021-06-24 21:45:21 +03:00
aap 93e9929925 CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:34:33 +03:00
aap 50058371ef CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:32:43 +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
withmorten a78212ea80 fix MASTER crashes 2021-02-04 23:43:04 +01:00
withmorten bf299e5c17 fix MASTER crashes 2021-02-04 23:41:10 +01: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 e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
Sergeanur 2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Sergeanur 13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +02: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
withmorten 3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
Filip Gawin e9adf8162b fix 2021-01-22 19:59:27 +01:00
Filip Gawin 609cad506f Better output for validating size assert 2021-01-22 19:54:43 +01:00
withmorten 034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
withmorten ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
withmorten a6faa0384b fix common.h d3d includes 2021-01-17 22:10:04 +01:00
erorcun 5a47379bf5 Includes overhaul, fix some compiler warnings 2021-01-17 21:32:54 +01:00
Sergeanur caa7d3177c Use of sized bool types for CFont 2021-01-16 16:05:27 +02:00
Sergeanur 8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr 
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
 2021-01-12 13:22:44 +02:00
Sergeanur cb4b4d584c Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
 2021-01-12 12:55:07 +02:00
Sergeanur a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
Fire-Head 7a3ee349da sync with re3 
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
 2021-01-09 01:01:41 +03:00
Fire-Head 00d23c61d9 .ini for scaling, radar, sprites 2021-01-08 23:30:30 +03:00
Fire-Head 368d2f3279 bb .ini hello defines 2021-01-08 19:31:48 +03:00
Sergeanur ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02:00
Sergeanur 42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
Fire_Head 89e2709304
Merge pull request #1 from GTAmodding/master 
update
 2020-12-29 20:51:37 +03:00
Fire-Head 224e805fe4 Sprite Scaling option 2020-12-29 20:24:16 +03:00
erorcun 36e64dbd22 signed/unsigned fixes, and some other fixes 2020-12-27 05:23:37 +03:00
erorcun a50244dc16 signed/unsigned fixes, and some other fixes 2020-12-25 12:54:41 +03:00
Fire-Head 0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
Fire-Head 4d4758bc1e scaling 2020-12-19 22:31:54 +03:00
aap c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
erorcun cf4aedd97c Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 06:36:28 +03:00