github.com/td512.re3
1
0
Fork 0
mirror of https://github.com/td512/re3.git synced 2026-03-03 04:47:44 +00:00
Code Issues Projects Releases Wiki Activity
4,877 Commits 3 Branches 2 Tags
9cc12018928b73acccd575970a6e4dbcb5b460ac
Commit Graph

259 Commits

Author SHA1 Message Date
Nikolay Korolev
9cc1201892 merge 2021-08-08 13:38:21 +03:00
Nikolay Korolev
c69edce800 mission replay 2021-08-07 20:24:01 +03:00
Nikolay Korolev
5999ddc76d Merge remote-tracking branch 'upstream/miami' into miami 2021-08-03 21:44:18 +03:00
erorcun
192190769d Add ped and car density slider to menu, remove dumb collision "optimization" 2021-08-01 13:56:09 +03:00
Nikolay Korolev
70080f1fdb mission replay 2021-08-01 12:54:05 +03:00
Sergeanur
d781db6c0f Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
 2021-07-09 00:05:26 +03:00
Sergeanur
72f6780905 Use CPad functions to check key states in script loader 2021-07-08 03:37:14 +03: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
Sergeanur
d4ba7c387b Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/render/Particle.cpp
 2021-06-26 14:27:54 +03:00
Sergeanur
225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
Sergeanur
e671fe682d Merge remote-tracking branch 'GitHub/miami' into lcs 2021-06-25 00:47:06 +03:00
Sergeanur
e5aa150557 Frontend fix 2021-06-25 00:40:00 +03:00
Sergeanur
14c71f39ff High FPS Fixes 2021-06-25 00:39:47 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur
f6910d35f7 Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/render/Font.cpp
 2021-02-26 11:07:32 +02:00
withmorten
781617d484 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:55:26 +01:00
withmorten
037c332158 Merge remote-tracking branch 'origin/miami' into lcs 2021-02-18 02:38:12 +01:00
Sergeanur
ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02:00
Steve Wills
2b6628aa65 Fix seg fault when configuring controller 2021-02-17 01:12:39 +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
Sergeanur
e98164ec41 Sync aspect ratio setting with master 2021-02-12 18:00:20 +02:00
Sergeanur
e4320c02cf Enable BIND_VEHICLE_FIREWEAPON 2021-02-11 17:16:01 +02:00
Sergeanur
4f27a28762 More fixes 2021-02-11 05:03:41 +02:00
Sergeanur
3c7a7bc8a7 Fixes 2021-02-10 13:42:59 +02:00
Sergeanur
12330e38cb Controller menu 2021-02-10 08:57:51 +02:00
erorcun
713562685a OAL Loops, fixes 2021-02-02 22:30:13 +03: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
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
e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/core/re3.cpp
 2021-01-23 17:54:46 +02:00
erorcun
1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03: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
73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03: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
Sergeanur
7091ab5e75 Fix save/load and brief menus 2021-01-22 02:44:32 +02:00
Sergeanur
e6d9a0d1ad Get rid of outro screen 2021-01-22 02:19:02 +02:00
aap
ce77e80414 Merge pull request #963 from Nick007J/lcs 
all LCS script commands
 2021-01-22 00:59:20 +01:00
aap
de10f0dda6 Merge pull request #975 from aap/lcs 
loadscreens, not accurate
 2021-01-22 00:59:13 +01:00
Sergeanur
9d2509ab5b A bit of frontend and GXT 2021-01-22 01:56:47 +02:00
aap
f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +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
Nikolay Korolev
b4b4c996ba Merge branch 'lcs-dev' into lcs 2021-01-20 12:12:56 +03:00
Nikolay Korolev
dac4dd560a saves 2021-01-19 23:34:37 +03:00
aap
8baae4c77f PSP rendering and shader cleanup 2021-01-19 11:38:51 +01:00