Nikolay Korolev
0a23afebb7
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-17 10:06:37 +03:00
Sergeanur
3377709c4b
Merge branch 'miami' into lcs
2021-07-15 00:51:01 +03:00
Nikolay Korolev
81aece7117
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-13 19:43:48 +03:00
withmorten
523b23339c
disable USE_CUTSCENE_SHADOW_FOR_PED if COMPATIBLE_SAVES isn't defined
2021-07-13 00:21:11 +02:00
Sergeanur
c982700a69
Enable cutscene shadows
2021-07-13 01:00:00 +03:00
withmorten
6f0f9d7d69
Merge remote-tracking branch 'origin/miami' into lcs
2021-07-12 23:36:37 +02:00
Nikolay Korolev
91d958bf27
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-12 10:32:01 +03:00
withmorten
2f7ae611ed
Vanilla config for Windows and win-x86 only
2021-07-12 04:26:27 +02:00
Sergeanur
55d30a11ec
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/AudioManager.h
# src/control/Garages.cpp
# src/control/Garages.h
# src/control/Script5.cpp
# src/core/config.h
# utils/gxt/american.txt
# utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
Sergeanur
3f5fdc39a5
Reorganize config.h
2021-07-12 03:58:34 +03:00
erorcun
02e84b4b97
Merge pull request #1150 from withmorten/miami-saves
...
miami: finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-12 01:07:32 +03:00
Nikolay Korolev
776d46aacb
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-11 10:23:59 +03:00
withmorten
6f103a3b82
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-10 02:06:43 +02:00
Sergeanur
71d1b46417
Merge branch 'miami' into lcs
...
# Conflicts:
# utils/gxt/german.txt
2021-07-10 02:07:14 +03:00
withmorten
0b269571d7
add librw defines to vanilla defines undefs
2021-07-09 18:05:26 +02:00
Nikolay Korolev
10cc444482
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-02 11:28:46 +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
Sergeanur
a73a2c9179
Pause radio when game is paused
2021-06-30 21:21:45 +03:00
Nikolay Korolev
73e112a217
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-06-27 14:53:43 +03:00
Sergeanur
883d8172b0
Merge remote-tracking branch 'origin/miami' into lcs
2021-06-27 14:33:39 +03:00
erorcun
05a29c7e6c
Multi-threaded audio fixes
2021-06-27 00:00:07 +03:00
erorcun
9c8ef3cca0
Merge pull request #1151 from erorcun/miami
...
Multi-threaded audio streams on OAL
2021-06-26 16:28:43 +03:00
erorcun
107c4df69c
Multi-threaded audio streams
...
Under MULTITHREADED_AUDIO define.
2021-06-26 16:24:23 +03:00
Nikolay Korolev
636f67ca3f
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-06-26 14:34:52 +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
Nikolay Korolev
8a5afd0db2
sync
2021-06-25 10:15:19 +03:00
withmorten
4e3fc35401
add no-git-hash option to premake
2021-06-25 02:41:40 +02: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
74867af2e7
Fixes
2021-06-24 21:50:09 +03:00
Sergeanur
fb03ee45b5
Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES
...
# Conflicts:
# src/core/config.h
2021-06-24 21:45:21 +03:00
Sergeanur
60bb16d26c
Increase the number of audio channels to PS2 count and some small audio fixes
2021-06-24 21:45:18 +03:00
Sergeanur
714cd47db9
Original pool sizes
2021-06-24 21:42:10 +03:00
Sergeanur
499b16678f
Fix engine sounds, player and male01 ped comments
2021-06-24 21:42:10 +03:00
Sergeanur
be019c6126
Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES
...
# Conflicts:
# src/core/config.h
2021-06-24 21:34:33 +03:00
Sergeanur
02655313e9
Increase the number of audio channels to PS2 count and some small audio fixes
2021-06-24 21:34:33 +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
Sergeanur
cba1f85026
Add russian support
2021-02-18 11:34:23 +02: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
0c60ceeb33
Cmake version for hash
2021-02-12 21:09:46 +03:00
erorcun
2c784d979a
Remove version text, add toggleable debug info(with commit hash!)
2021-02-12 21:09:23 +03:00
Sergeanur
e4320c02cf
Enable BIND_VEHICLE_FIREWEAPON
2021-02-11 17:16:01 +02:00
Sergeanur
d6068c421d
Add undef
2021-02-10 09:08:02 +02:00
Sergeanur
b6af7393e8
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
...
* origin/miami:
fix clouds
Use our synonyms for attack anims again
Detect joystick menu for XInput
reorganize shaders; use modulate flag; update librw
fix generic.txd crash
Use original animation names from VCS
# Conflicts:
# src/core/MenuScreensCustom.cpp
2021-02-10 09:01:53 +02:00
Sergeanur
12330e38cb
Controller menu
2021-02-10 08:57:51 +02:00
Nikolay Korolev
9b9ffc4b13
ferries
2021-02-07 23:29:49 +03:00
erorcun
675aef29cf
Detect joystick menu for XInput
2021-02-07 19:50:17 +03:00
withmorten
8553120fdb
add missing ASCII_STRCMP stuff
2021-02-04 19:47:47 +01:00
withmorten
1b293a3cfb
no advanced script log when log level is 0
2021-02-02 11:32:20 +01:00
