Skip to content
This repository has been archived by the owner. It is now read-only.

/ re3 Archived

Permalink
Browse files
Merge pull request #1 from GTAmodding/master 
upd
  • Loading branch information
@Fire-Head
Fire-Head committed Oct 27, 2019
2 parents 537aaca + 6a46cc6 commit c39cf2d960ce546c544872a732560b731d8c3897
Unified Split
Showing with 8,940 additions and 5,955 deletions.
  1. +1 −3 .appveyor.yml
  2. +2 −0 premake5.lua
  3. +3,077 −2,160 src/audio/AudioManager.cpp
  4. +222 −67 src/audio/AudioManager.h
  5. +3,059 −3,171 src/audio/AudioSamples.h
  6. +1 −1 src/audio/DMAudio.cpp
  7. +2 −2 src/audio/DMAudio.h
  8. +90 −92 src/audio/MusicManager.cpp
  9. +13 −234 src/audio/MusicManager.h
  10. +228 −0 src/audio/audio_enums.h
  11. +7 −7 src/control/GameLogic.cpp
  12. +3 −3 src/control/Replay.cpp
  13. +6 −6 src/control/Script.cpp
  14. +2 −0 src/core/ControllerConfig.h
  15. +2 −3 src/core/CutsceneMgr.cpp
  16. +1 −1 src/core/FileLoader.h
  17. +3 −4 src/core/Frontend.cpp
  18. +3 −0 src/core/Game.cpp
  19. +2 −0 src/core/Lists.h
  20. +0 −26 src/core/Messages.cpp
  21. +0 −56 src/core/Messages.h
  22. +16 −2 src/core/RwTexRead.cpp
  23. +0 −2 src/core/User.cpp
  24. +2 −6 src/core/User.h
  25. +10 −12 src/core/common.h
  26. +1 −0 src/core/config.h
  27. +2 −0 src/core/re3.cpp
  28. +17 −15 src/math/Matrix.h
  29. +0 −10 src/math/math.cpp
  30. +6 −0 src/modelinfo/ModelIndices.cpp
  31. +1 −1 src/modelinfo/ModelIndices.h
  32. +518 −13 src/peds/Ped.cpp
  33. +6 −3 src/peds/Ped.h
  34. +5 −5 src/peds/PedIK.cpp
  35. +5 −4 src/peds/PedIK.h
  36. +2 −1 src/render/Hud.cpp
  37. +12 −3 src/render/Particle.cpp
  38. +3 −0 src/render/Particle.h
  39. +297 −1 src/render/SpecialFX.cpp
  40. +47 −1 src/render/SpecialFX.h
  41. +17 −11 src/render/VisibilityPlugins.cpp
  42. +2 −0 src/render/WaterCannon.cpp
  43. +17 −1 src/render/WaterCannon.h
  44. +2 −2 src/skel/win/win.cpp
  45. +1 −0 src/skel/win/win.h
  46. +835 −0 src/text/Messages.cpp
  47. +69 −0 src/text/Messages.h
  48. +194 −0 src/text/Pager.cpp
  49. +28 −0 src/text/Pager.h
  50. +64 −21 src/{core → text}/Text.cpp
  51. +5 −2 src/{core → text}/Text.h
  52. +0 −1 src/vehicles/Vehicle.cpp
  53. +2 −2 src/vehicles/Vehicle.h
  54. +10 −0 src/weapons/CProjectileInfo.cpp
  55. +20 −0 src/weapons/CProjectileInfo.h
4 .appveyor.yml
View file
@@ -29,12 +29,10 @@ after_build:
$url = "$releases/download/$latestVersion/$name" $url = "$releases/download/$latestVersion/$name"
Start-FileDownload $url -FileName 'C:\Ultimate-ASI-Loader.zip' Start-FileDownload $url -FileName 'C:\Ultimate-ASI-Loader.zip'
7z e c:\Ultimate-ASI-Loader.zip -oc:\Projects\re3\bin\${env:CONFIGURATION} 7z e c:\Ultimate-ASI-Loader.zip -oc:\Projects\re3\bin\${env:CONFIGURATION}
cd "bin\${env:CONFIGURATION}" cd "bin\${env:CONFIGURATION}"
copy re3.dll re3.asi copy re3.dll re3.asi
@@ -44,4 +42,4 @@ after_build:
Get-ChildItem .\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } Get-ChildItem .\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
artifacts: artifacts:
- path: bin/%CONFIGURATION%/re3.dll - path: bin/%CONFIGURATION%/re3.dll
name: re3.dll name: re3.dll
2 premake5.lua
View file
@@ -15,6 +15,7 @@ workspace "re3"
files { "src/render/*.*" } files { "src/render/*.*" }
files { "src/skel/*.*" } files { "src/skel/*.*" }
files { "src/skel/win/*.*" } files { "src/skel/win/*.*" }
files { "src/text/*.*" }
files { "src/vehicles/*.*" } files { "src/vehicles/*.*" }
files { "src/weapons/*.*" } files { "src/weapons/*.*" }
files { "eax/*.*" } files { "eax/*.*" }
@@ -32,6 +33,7 @@ workspace "re3"
includedirs { "src/render" } includedirs { "src/render" }
includedirs { "src/skel/" } includedirs { "src/skel/" }
includedirs { "src/skel/win" } includedirs { "src/skel/win" }
includedirs { "src/text" }
includedirs { "src/vehicles" } includedirs { "src/vehicles" }
includedirs { "src/weapons" } includedirs { "src/weapons" }
includedirs { "eax" } includedirs { "eax" }

0 comments on commit c39cf2d

Please sign in to comment.