archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-04-24 19:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,383 Commits 3 Branches 0 Tags
Commit Graph

301 Commits

Author SHA1 Message Date
Nikolay Korolev
68db861c45 merge 2021-08-08 17:29:57 +03:00
Nikolay Korolev
873840a6a5 merge 2021-08-08 17:19:49 +03:00
Nikolay Korolev
947f67dfb7 small fix 2021-08-08 17:17:20 +03:00
Nikolay Korolev
478bdcc1ca merge 2021-08-08 17:14:21 +03:00
Nikolay Korolev
63046894b0 small refactoring 2021-08-08 16:57:37 +03:00
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
erorcun
2a6f9c2757 Add ped and car density slider to menu, remove dumb collision "optimization" 2021-07-12 00:12:25 +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
47f153fe76 Use CPad functions to check key states in script loader 2021-07-08 03:24:47 +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
withmorten
cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +02:00
erorcun
cc235be3aa Less invasive red tint on Delete Game page 2021-06-27 18:14:34 +03:00
erorcun
a923728877 Fix map texture leak 2021-06-27 00:34:46 +03: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
6cb8c11285 Fix premature CTimer calls 2021-06-26 04:09:45 +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
2592da2273 Remove frameTime, fix pause mode timer 2021-06-24 21:32:44 +03:00
Sergeanur
786e101acf Use bool8 in audio code 2021-06-24 21:32:43 +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
48cec4a786 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:40:32 +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
Sergeanur
ee6b7152c7 Fix endless vibration in pause menu 2021-02-17 15:04:53 +02:00
Steve Wills
2b6628aa65 Fix seg fault when configuring controller 2021-02-17 01:12:39 +03:00
Steve Wills
e482ab6292 Fix mistake 2021-02-16 11:13:20 -05: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
Steve Wills
20d9498fdb Put fix behind ifdef 2021-02-16 10:55:11 -05:00
Steve Wills
a666de46aa Fix seg fault when configuring controller 
Since controllerAction can be -2 (line 2105)
 2021-02-14 14:06:37 -05: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
c9f804486d Fix setup 4 texts 2021-02-11 06:53:00 +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
d224f8b7ee Don't show menu map and new languages if gamefiles isn't copied 2021-02-07 20:38:53 +03:00
Sergeanur
91612eb45a Controller menu 2021-02-03 02:41:12 +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