Sergeanur
|
136b25133d
|
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/sampman_miles.cpp
# src/audio/sampman_oal.cpp
|
2021-08-19 11:47:03 +03:00 |
|
erorcun
|
4e40c6f2ed
|
Auto-detect X11 dependency
|
2021-08-16 15:20:40 +03:00 |
|
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 |
|
Adrian Graber
|
6665b16ba2
|
Nintendo Switch support
|
2021-07-13 01:18:49 +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 |
|
withmorten
|
4e3fc35401
|
add no-git-hash option to premake
|
2021-06-25 02:41:40 +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 |
|
withmorten
|
ef28d12d85
|
fix gcc/clang build by adding -fpermssive and -Wno-address-of-temporary
|
2021-02-02 14:27:21 +01:00 |
|
shfil
|
1ab96abb91
|
Add cmake option for sanitizers
|
2021-01-24 21:36:13 +01:00 |
|
shfil
|
513d418771
|
Add cmake option for sanitizers
|
2021-01-24 21:35:53 +01:00 |
|
Filip Gawin
|
1082b13830
|
RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK
|
2021-01-14 22:15:36 +01:00 |
|
Filip Gawin
|
4741afd2cf
|
Port cmake improvements to miami
|
2021-01-13 12:45:10 +01:00 |
|
Nikolay Korolev
|
b6298915dd
|
fixed cmakelists
|
2020-12-19 16:21:33 +03:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +03:00 |
|
Sergeanur
|
a6f5f4634c
|
Make collision code placement more like original (+ small fixes)
|
2020-11-15 19:51:35 +02:00 |
|
Filip Gawin
|
1df6dda546
|
Add basic support for cmake on linux
|
2020-11-02 17:07:04 +01:00 |
|