Commit graph

31 commits

Author SHA1 Message Date
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
Adrian Graber
ba07534d99
re3 -> reVC on Switch build workflow file 2021-08-18 02:00:44 +02: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
Adrian Graber
7f544f9049 Fix artifact path 2021-07-13 01:32:43 +02:00
Adrian Graber
6665b16ba2 Nintendo Switch support 2021-07-13 01:18:49 +02:00
Sergeanur
3f5fdc39a5 Reorganize config.h 2021-07-12 03:58:34 +03:00
Sergeanur
d781db6c0f Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	premake5.lua
2021-07-09 00:05:26 +03:00
withmorten
0b27a3dc23 fix cmake workflow 2021-07-05 19:08:52 +02:00
Adrian Graber
2029ac3d62 Update librw 2021-07-04 18:17:22 +02:00
Sergeanur
5d5e0f62e8 Merge branch 'miami' into lcs
# Conflicts:
#	premake5.lua
2021-07-03 16:39:22 +03:00
withmorten
a92dcaa0b1 premake: add no-full-paths option for CI builds, rename lto to with-lto 2021-07-03 03:03:25 +02:00
Sergeanur
940d6bf6d3 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-25 03:40:41 +03:00
withmorten
5341840943 fix cmake build. 2021-06-25 02:38:50 +02:00
withmorten
037c332158 Merge remote-tracking branch 'origin/miami' into lcs 2021-02-18 02:38:12 +01:00
withmorten
f603f4397d fix premake workflows 2021-02-17 13:40:42 +01:00
Sergeanur
184f12a214 Remove Vanilla from CI 2021-02-16 19:38:08 +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
withmorten
edc3c48e05 add gamefiles and dlls to premake workflows 2021-02-03 20:28:34 +01:00
withmorten
3948a1f726 add Vanilla config to premake and premake CI 2021-01-26 11:30:46 +01:00
Filip Gawin
405a75f26b Fixes for lcs conan 2021-01-16 01:53:21 +01:00
Sergeanur
4bd7bafd7c Merge branch 'miami' into lcs
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
2021-01-15 17:57:35 +02:00
shfil
42df203389
Fix(?) 2021-01-14 18:26:51 +01:00
Filip Gawin
40d3a900a0 Fix 2021-01-14 15:05:27 +01:00
Filip Gawin
7c8933f8c4 Port conan to miami 2021-01-14 15:03:54 +01:00
Sergeanur
8485dcdb03 Update readme and workflows 2021-01-08 16:38:27 +02:00
Filip Gawin
f043b6e095 Fix CI 2020-11-18 10:40:14 +01:00
Sergeanur
0328cb04d7 build fix 2020-08-07 20:07:57 +03:00
Sergeanur
2d9b898271 more rename for reVC 2020-08-07 19:59:32 +03:00
Sergeanur
b5cd52b9b3 rename for reVC 2020-08-07 19:58:21 +03:00
Filip Gawin
16ab30576a Rename files to avoid conflict with revc 2020-08-07 17:35:32 +02:00
Filip Gawin
9eaa7a0707 Create basic config for github actions (windows) 2020-08-07 17:14:11 +02:00