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 |
|
shfil
|
49c8292e48
|
Fix target's name
|
2021-01-13 14:00:34 +01:00 |
|
Filip Gawin
|
4741afd2cf
|
Port cmake improvements to miami
|
2021-01-13 12:45:10 +01:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +03:00 |
|
Filip Gawin
|
1df6dda546
|
Add basic support for cmake on linux
|
2020-11-02 17:07:04 +01:00 |
|
Filip Gawin
|
d6314f9564
|
Revert "Part one"
This reverts commit 63951d9b95.
|
2020-04-18 12:29:28 +02:00 |
|
Filip Gawin
|
63951d9b95
|
Part one
|
2020-04-17 19:30:57 +02:00 |
|