Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge pull request #1 from GTAmodding/miami
Miami
  • Loading branch information
Fire-Head committed Aug 27, 2020
2 parents 210c7b8 + 24e74f7 commit a8999bbf38cae233e39b5995118fa03bca7894ef
Showing with 9,304 additions and 71,098 deletions.
  1. +67 −0 .github/workflows/reVC_msvc_amd64.yml
  2. +68 −0 .github/workflows/reVC_msvc_x86.yml
  3. +4 −0 .gitignore
  4. +11 −10 .gitmodules
  5. BIN gamefiles/TEXT/JAPANESE.gxt
  6. BIN gamefiles/TEXT/american.gxt
  7. BIN gamefiles/TEXT/french.gxt
  8. BIN gamefiles/TEXT/german.gxt
  9. BIN gamefiles/TEXT/italian.gxt
  10. BIN gamefiles/TEXT/polish.gxt
  11. BIN gamefiles/TEXT/russian.gxt
  12. BIN gamefiles/TEXT/spanish.gxt
  13. BIN gamefiles/models/fonts_j.txd
  14. BIN gamefiles/models/fonts_p.txd
  15. BIN gamefiles/models/fonts_r.txd
  16. BIN gamefiles/models/menu.txd
  17. +0 −1 librw
  18. +0 −9,764 libsndfile.64/ChangeLog
  19. +0 −199 libsndfile.64/NEWS
  20. +0 −857 libsndfile.64/include/sndfile.h
  21. +0 −446 libsndfile.64/include/sndfile.hh
  22. +0 −159 mpg123.64/include/fmt123.h
  23. +0 −1,697 mpg123.64/include/mpg123.h
  24. +0 −1 ogg
  25. +0 −1 opus
  26. +0 −1 opusfile
  27. +45 −25 premake5.lua
  28. +1 −0 src/animation/AnimBlendClumpData.h
  29. +1 −0 src/animation/AnimBlendHierarchy.h
  30. +256 −36 src/animation/CutsceneMgr.cpp
  31. +6 −3 src/animation/CutsceneMgr.h
  32. +0 −1 src/audio/AudioLogic.cpp
  33. +10 −0 src/audio/AudioScriptObject.cpp
  34. +3 −0 src/audio/AudioScriptObject.h
  35. +2 −2 src/audio/DMAudio.cpp
  36. +2 −1 src/audio/audio_enums.h
  37. +3 −3 src/audio/sampman_oal.cpp
  38. +3 −3 src/audio/soundlist.h
  39. +61 −6 src/control/CarCtrl.cpp
  40. +1 −0 src/control/CarCtrl.h
  41. +3 −3 src/control/Darkel.cpp
  42. +3 −3 src/control/Darkel.h
  43. +6 −2 src/control/GameLogic.cpp
  44. +3 −2 src/control/Garages.cpp
  45. +15 −6 src/control/Remote.cpp
  46. +1 −1 src/control/Remote.h
  47. +4 −1 src/control/Replay.cpp
  48. +228 −170 src/control/Script.cpp
  49. +1 −1 src/control/Script.h
  50. +6 −16 src/core/Cam.cpp
  51. +5 −0 src/core/Camera.cpp
  52. +8 −3 src/core/CdStreamPosix.cpp
  53. +0 −1 src/core/ColStore.cpp
  54. +12 −0 src/core/Collision.cpp
  55. +2 −1 src/core/Collision.h
  56. +101 −84 src/core/ControllerConfig.cpp
  57. +3 −0 src/core/ControllerConfig.h
  58. +1 −0 src/core/FileMgr.h
  59. +486 −797 src/core/Frontend.cpp
  60. +49 −4 src/core/Frontend.h
  61. +5 −22 src/core/Frontend_PS2.cpp
  62. +16 −8 src/core/Game.cpp
  63. +51 −15 src/core/MenuScreens.cpp
  64. +56 −7 src/core/Pad.cpp
  65. +5 −0 src/core/Pad.h
  66. +297 −68 src/core/PlayerInfo.cpp
  67. +19 −6 src/core/PlayerInfo.h
  68. +15 −9 src/core/Pools.cpp
  69. +3 −0 src/core/Pools.h
  70. +1 −1 src/core/Radar.h
  71. +413 −121 src/core/Stats.cpp
  72. +63 −18 src/core/Stats.h
  73. +368 −159 src/core/Streaming.cpp
  74. +7 −3 src/core/Streaming.h
  75. +8 −0 src/core/SurfaceTable.cpp
  76. +1 −0 src/core/SurfaceTable.h
  77. +10 −3 src/core/Wanted.cpp
  78. +25 −0 src/core/ZoneCull.cpp
  79. +7 −5 src/core/ZoneCull.h
  80. +24 −36 src/core/Zones.cpp
  81. +2 −2 src/core/Zones.h
  82. +18 −7 src/core/config.h
  83. +74 −27 src/core/main.cpp
  84. +3 −0 src/core/main.h
  85. +78 −111 src/core/re3.cpp
  86. +1 −3 src/core/templates.h
  87. +1 −1 src/entities/Entity.cpp
  88. +536 −0 src/extras/custompipes.cpp
  89. +133 −0 src/extras/custompipes.h
  90. +527 −0 src/extras/custompipes_d3d9.cpp
  91. +623 −0 src/extras/custompipes_gl.cpp
  92. +492 −0 src/extras/postfx.cpp
  93. +45 −0 src/extras/postfx.h
  94. +67 −0 src/extras/shaders/Makefile
  95. +26 −0 src/extras/shaders/colourfilterVC.frag
  96. BIN src/extras/shaders/colourfilterVC_PS.cso
  97. +23 −0 src/extras/shaders/colourfilterVC_PS.hlsl
  98. +56 −0 src/extras/shaders/colourfilterVC_PS.inc
  99. +28 −0 src/extras/shaders/colourfilterVC_fs_gl3.inc
  100. +18 −0 src/extras/shaders/contrast.frag
  101. BIN src/extras/shaders/contrastPS.cso
  102. +21 −0 src/extras/shaders/contrastPS.hlsl
  103. +31 −0 src/extras/shaders/contrastPS.inc
  104. +20 −0 src/extras/shaders/contrast_fs_gl3.inc
  105. +29 −0 src/extras/shaders/default_UV2.vert
  106. BIN src/extras/shaders/default_UV2_VS.cso
  107. +54 −0 src/extras/shaders/default_UV2_VS.hlsl
  108. +55 −0 src/extras/shaders/default_UV2_VS.inc
  109. +31 −0 src/extras/shaders/default_UV2_gl3.inc
  110. +21 −0 src/extras/shaders/im2d.vert
  111. +23 −0 src/extras/shaders/im2d_gl3.inc
  112. +44 −0 src/extras/shaders/lighting.h
  113. +3 −0 src/extras/shaders/make.cmd
  114. +5 −0 src/extras/shaders/makeinc.sh
  115. +26 −0 src/extras/shaders/neoGloss.frag
  116. +29 −0 src/extras/shaders/neoGloss.vert
  117. BIN src/extras/shaders/neoGloss_PS.cso
  118. +20 −0 src/extras/shaders/neoGloss_PS.hlsl
  119. +39 −0 src/extras/shaders/neoGloss_PS.inc
  120. BIN src/extras/shaders/neoGloss_VS.cso
  121. +35 −0 src/extras/shaders/neoGloss_VS.hlsl
  122. +66 −0 src/extras/shaders/neoGloss_VS.inc
  123. +28 −0 src/extras/shaders/neoGloss_fs_gl3.inc
  124. +31 −0 src/extras/shaders/neoGloss_vs_gl3.inc
  125. +37 −0 src/extras/shaders/neoRim.vert
  126. +48 −0 src/extras/shaders/neoRimSkin.vert
  127. BIN src/extras/shaders/neoRimSkin_VS.cso
  128. +73 −0 src/extras/shaders/neoRimSkin_VS.hlsl
  129. +203 −0 src/extras/shaders/neoRimSkin_VS.inc
  130. +50 −0 src/extras/shaders/neoRimSkin_gl3.inc
  131. BIN src/extras/shaders/neoRim_VS.cso
  132. +61 −0 src/extras/shaders/neoRim_VS.hlsl
  133. +118 −0 src/extras/shaders/neoRim_VS.inc
  134. +39 −0 src/extras/shaders/neoRim_gl3.inc
  135. +28 −0 src/extras/shaders/neoVehicle.frag
  136. +54 −0 src/extras/shaders/neoVehicle.vert
  137. BIN src/extras/shaders/neoVehicle_PS.cso
  138. +34 −0 src/extras/shaders/neoVehicle_PS.hlsl
  139. +42 −0 src/extras/shaders/neoVehicle_PS.inc
  140. BIN src/extras/shaders/neoVehicle_VS.cso
  141. +64 −0 src/extras/shaders/neoVehicle_VS.hlsl
  142. +160 −0 src/extras/shaders/neoVehicle_VS.inc
  143. +30 −0 src/extras/shaders/neoVehicle_fs_gl3.inc
  144. +56 −0 src/extras/shaders/neoVehicle_vs_gl3.inc
  145. +25 −0 src/extras/shaders/neoWorldVC.frag
  146. BIN src/extras/shaders/neoWorldVC_PS.cso
  147. +25 −0 src/extras/shaders/neoWorldVC_PS.hlsl
  148. +46 −0 src/extras/shaders/neoWorldVC_PS.inc
  149. +27 −0 src/extras/shaders/neoWorldVC_fs_gl3.inc
  150. +16 −0 src/extras/shaders/simple.frag
  151. +18 −0 src/extras/shaders/simple_fs_gl3.inc
  152. +28 −0 src/extras/shaders/standardConstants.h
  153. +4 −0 src/modelinfo/PedModelInfo.cpp
  154. +8 −0 src/modelinfo/SimpleModelInfo.cpp
  155. +7 −2 src/modelinfo/VehicleModelInfo.cpp
  156. +0 −2 src/objects/ParticleObject.cpp
  157. +108 −11 src/peds/Ped.cpp
  158. +2 −1 src/peds/Ped.h
  159. +3 −3 src/peds/PedChat.cpp
  160. +1 −1 src/peds/PlayerPed.cpp
  161. +1 −1 src/peds/PlayerPed.h
  162. +1 −2 src/peds/Population.cpp
  163. +2 −0 src/render/Antennas.cpp
  164. +43 −41 src/render/Clouds.cpp
  165. +162 −26 src/render/Coronas.cpp
  166. +14 −12 src/render/Coronas.h
  167. +197 −1 src/render/Fluff.cpp
  168. +30 −2 src/render/Fluff.h
  169. +35 −27 src/render/Hud.cpp
  170. +57 −11 src/render/MBlur.cpp
  171. +5 −7 src/render/PlayerSkin.cpp
  172. +55 −13 src/render/PointLights.cpp
  173. +5 −0 src/render/PointLights.h
  174. +50 −38 src/render/Renderer.cpp
  175. +28 −39 src/render/Rubbish.cpp
  176. +2 −2 src/render/ShadowCamera.cpp
  177. +1 −1 src/render/Shadows.cpp
  178. +1 −1 src/render/Shadows.h
  179. +6 −7 src/render/Skidmarks.cpp
  180. +34 −6 src/render/SpecialFX.cpp
  181. +1 −0 src/render/SpecialFX.h
  182. +3 −3 src/render/Sprite.cpp
  183. +100 −134 src/render/Sprite2d.cpp
  184. +2 −1 src/render/Sprite2d.h
  185. +227 −98 src/render/Timecycle.cpp
  186. +123 −115 src/render/Timecycle.h
  187. +186 −122 src/render/Weather.cpp
  188. +6 −1 src/render/Weather.h
  189. +41 −3 src/render/WindModifiers.cpp
  190. +5 −2 src/render/WindModifiers.h
  191. +1 −0 src/rw/ClumpRead.cpp
  192. +19 −3 src/rw/Lights.cpp
  193. +6 −0 src/rw/Lights.h
  194. +2 −2 src/rw/NodeName.cpp
  195. +6 −31 src/rw/RwHelper.cpp
  196. +2 −4 src/rw/RwHelper.h
  197. +36 −2 src/rw/TexRead.cpp
  198. +6 −10 src/rw/TxdStore.cpp
  199. +5 −0 src/rw/VisibilityPlugins.cpp
  200. +23 −2 src/save/GenericGameStorage.cpp
  201. +1 −1 src/save/GenericGameStorage.h
  202. +4 −4 src/save/PCSave.cpp
  203. +21 −1 src/skel/glfw/glfw.cpp
  204. +1 −0 src/skel/platform.h
  205. +9 −0 src/skel/skeleton.cpp
  206. +3 −0 src/skel/skeleton.h
  207. +28 −2 src/skel/win/win.cpp
  208. +6 −7 src/vehicles/Automobile.cpp
  209. +1 −1 src/vehicles/Automobile.h
  210. +8 −12 src/vehicles/Bike.cpp
  211. +1 −1 src/vehicles/Boat.cpp
  212. +36 −42 src/vehicles/Transmission.cpp
  213. +0 −7,979 utils/gxt/american.txt
  214. +0 −7,026 utils/gxt/english.txt
  215. +0 −8,211 utils/gxt/french.txt
  216. +0 −8,028 utils/gxt/german.txt
  217. BIN utils/gxt/gxt.exe
  218. +0 −8,040 utils/gxt/italian.txt
  219. +0 −7,979 utils/gxt/russian.txt
  220. +0 −8,031 utils/gxt/spanish.txt
  221. +1 −0 vendor/librw
  222. 0 {libsndfile.32 → vendor/libsndfile}/ChangeLog
  223. 0 {libsndfile.32 → vendor/libsndfile}/NEWS
  224. BIN {libsndfile.32/dist → vendor/libsndfile/dist/Win32}/libsndfile-1.dll
  225. BIN {libsndfile.64/dist → vendor/libsndfile/dist/Win64}/libsndfile-1.dll
  226. 0 {libsndfile.32 → vendor/libsndfile}/include/sndfile.h
  227. 0 {libsndfile.32 → vendor/libsndfile}/include/sndfile.hh
  228. 0 {libsndfile.32/lib → vendor/libsndfile/lib/Win32}/libsndfile-1.def
  229. BIN {libsndfile.32/lib → vendor/libsndfile/lib/Win32}/libsndfile-1.lib
  230. 0 {libsndfile.32/lib → vendor/libsndfile/lib/Win32}/pkgconfig/sndfile.pc
  231. 0 {libsndfile.64/lib → vendor/libsndfile/lib/Win64}/libsndfile-1.def
  232. BIN {libsndfile.64/lib → vendor/libsndfile/lib/Win64}/libsndfile-1.lib
  233. 0 {libsndfile.64/lib → vendor/libsndfile/lib/Win64}/pkgconfig/sndfile.pc
  234. BIN {mpg123.32/dist → vendor/mpg123/dist/Win32}/libmpg123-0.dll
  235. BIN {mpg123.64/dist → vendor/mpg123/dist/Win64}/libmpg123-0.dll
  236. 0 {mpg123.32 → vendor/mpg123}/include/fmt123.h
  237. 0 {mpg123.32 → vendor/mpg123}/include/mpg123.h
  238. BIN {mpg123.32/lib → vendor/mpg123/lib/Win32}/libmpg123-0.lib
  239. BIN {mpg123.64/lib → vendor/mpg123/lib/Win64}/libmpg123-0.lib
  240. +1 −0 vendor/ogg
  241. 0 { → vendor}/openal-soft/COPYING
  242. BIN { → vendor}/openal-soft/dist/Win32/OpenAL32.dll
  243. BIN { → vendor}/openal-soft/dist/Win64/OpenAL32.dll
  244. 0 { → vendor}/openal-soft/include/AL/al.h
  245. 0 { → vendor}/openal-soft/include/AL/alc.h
  246. 0 { → vendor}/openal-soft/include/AL/alext.h
  247. 0 { → vendor}/openal-soft/include/AL/efx-creative.h
  248. 0 { → vendor}/openal-soft/include/AL/efx-presets.h
  249. 0 { → vendor}/openal-soft/include/AL/efx.h
  250. 0 { → vendor}/openal-soft/libs/Win32/OpenAL32.def
  251. BIN { → vendor}/openal-soft/libs/Win32/OpenAL32.lib
  252. BIN { → vendor}/openal-soft/libs/Win32/libOpenAL32.dll.a
  253. 0 { → vendor}/openal-soft/libs/Win64/OpenAL32.def
  254. BIN { → vendor}/openal-soft/libs/Win64/OpenAL32.lib
  255. BIN { → vendor}/openal-soft/libs/Win64/libOpenAL32.dll.a
  256. 0 { → vendor}/openal-soft/readme.txt
  257. +1 −0 vendor/opus
  258. +1 −0 vendor/opusfile
@@ -0,0 +1,67 @@
name: reVC_msvc_amd64

on:
pull_request:
push:
release:
types: published
env:
GLEW_VER: "2.1.0"
GLFW_VER: "3.3.2"
GLEW_BASE: "glew-2.1.0"
GLFW_BASE: "glfw-3.3.2.bin.WIN64"
GLEW_FILE: "glew-2.1.0-win32.zip"
GLFW_FILE: "glfw-3.3.2.bin.WIN64.zip"
GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
jobs:
build:
runs-on: windows-2019
strategy:
matrix:
platform: [win-amd64-librw_d3d9-oal, win-amd64-librw_gl3_glfw-oal]
buildtype: [Debug, Release]
steps:
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.1
- uses: actions/checkout@v2
with:
submodules: 'true'
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
name: Download glew
uses: carlosperate/download-file-action@v1.0.3
with:
file-url: ${{env.GLEW_URL}}
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
name: Download glfw
uses: carlosperate/download-file-action@v1.0.3
with:
file-url: ${{env.GLFW_URL}}
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
name: Unpack archives
run: |
7z x ${{env.GLEW_FILE}}
7z x ${{env.GLFW_FILE}}
- name: Configure build
run: |
./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir64=${{env.GLFW_BASE}}
- name: Build
run: |
msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
- name: Pack artifacts
run: |
7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
- name: Upload artifact to actions
uses: actions/upload-artifact@v2
with:
name: reVC_${{matrix.buildtype}}_${{matrix.platform}}
path: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
# - name: Upload artifact to Bintray
# uses: hpcsc/upload-bintray-docker-action@v1
# with:
# repository: reVC
# package: ${{matrix.buildtype}}_${{matrix.platform}}
# version: 1.0-$(echo ${GITHUB_SHA}
# sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
# username: gtamodding
# apiKey: ${{secrets.BINTRAY_API_KEY}}
@@ -0,0 +1,68 @@
name: reVC_msvc_x86

on:
pull_request:
push:
release:
types: published
env:
GLEW_VER: "2.1.0"
GLFW_VER: "3.3.2"
GLEW_BASE: "glew-2.1.0"
GLFW_BASE: "glfw-3.3.2.bin.WIN32"
GLEW_FILE: "glew-2.1.0-win32.zip"
GLFW_FILE: "glfw-3.3.2.bin.WIN32.zip"
GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
jobs:
build:
runs-on: windows-2019
strategy:
matrix:
platform: [win-x86-librw_d3d9-mss, win-x86-librw_gl3_glfw-mss, win-x86-librw_d3d9-oal, win-x86-librw_gl3_glfw-oal]
buildtype: [Debug, Release]
steps:
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.1
- uses: actions/checkout@v2
with:
submodules: 'true'
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
name: Download glew
uses: carlosperate/download-file-action@v1.0.3
with:
file-url: ${{env.GLEW_URL}}
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
name: Download glfw
uses: carlosperate/download-file-action@v1.0.3
with:
file-url: ${{env.GLFW_URL}}
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
name: Unpack archives
run: |
7z x ${{env.GLEW_FILE}}
7z x ${{env.GLFW_FILE}}
- name: Configure build
run: |
./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir32=${{env.GLFW_BASE}}
- name: Build
run: |
msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
- name: Pack artifacts
run: |
7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
- name: Upload artifact to actions
uses: actions/upload-artifact@v2
with:
name: reVC_${{matrix.buildtype}}_${{matrix.platform}}
path: reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip
# - name: Upload artifact to Bintray
# uses: hpcsc/upload-bintray-docker-action@v1
# with:
# repository: reVC
# package: ${{matrix.buildtype}}_${{matrix.platform}}
# version: 1.0-$(echo ${GITHUB_SHA}
# sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
# username: gtamodding
# apiKey: ${{secrets.BINTRAY_API_KEY}}

@@ -348,3 +348,7 @@ healthchecksdb

# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

vendor/glew-2.1.0/
vendor/glfw-3.3.2.bin.WIN32/
vendor/glfw-3.3.2.bin.WIN64/
@@ -1,15 +1,16 @@
[submodule "librw"]
path = librw
url = https://github.com/aap/librw
[submodule "opus"]
path = opus
[submodule "vendor/ogg"]
path = vendor/ogg
url = https://github.com/xiph/ogg.git
branch = master
[submodule "vendor/opus"]
path = vendor/opus
url = https://github.com/xiph/opus.git
branch = master
[submodule "opusfile"]
path = opusfile
[submodule "vendor/opusfile"]
path = vendor/opusfile
url = https://github.com/xiph/opusfile.git
branch = master
[submodule "ogg"]
path = ogg
url = https://github.com/xiph/ogg.git
[submodule "vendor/librw"]
path = vendor/librw
url = https://github.com/aap/librw.git
branch = master
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 librw
Submodule librw deleted from 99c15d

0 comments on commit a8999bb

Please sign in to comment.