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

/ re3 Archived

more audio for god of audio #771

Merged
merged 32 commits into from Nov 10, 2020
Merged

more audio for god of audio #771

merged 32 commits into from Nov 10, 2020
+1,120 −728

Conversation

@theR4K
Copy link
Contributor

@theR4K theR4K commented Oct 17, 2020

No description provided.

theR4K added 5 commits Oct 12, 2020
@theR4K
mark some audio stuff and fix frameCounter
e34261d
@theR4K
sirenes and more marks for audio. also fix cAudioMrg size
a4fd1a9
@theR4K
siren and horn
894a1ae
@theR4K
road noise
97fc522
@theR4K
model cars and other audio stuff
eeee501
@theR4K theR4K marked this pull request as draft Oct 17, 2020
@theR4K
theR4K reviewed Oct 17, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
@jte
jte reviewed Oct 17, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
theR4K added 14 commits Oct 17, 2020
@theR4K
fix bugs
1e3aabf
@theR4K
peds
0594ed5
@theR4K
merge Upstream
39b7075
@theR4K
model heli
19ffb9c
@theR4K
fires
beae41b
@theR4K
jumbo
a9db60a
@theR4K
fix merging errors
c4707fe
@theR4K
mark reflections done
63c7df9
@theR4K
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
a12789c
@theR4K
skiding
211ab16
@theR4K
processVehicleOneShots
04b841c
@theR4K
cleanup processVehicleOneShots, processVehicleX done
96ccb13
@theR4K
merge upstream
44bbcbd
@theR4K
fix merge
4bcd176
@theR4K theR4K marked this pull request as ready for review Oct 25, 2020
@Nick007J
Nick007J reviewed Oct 25, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
@theR4K
Fix build and use enum in ProcessPlayerMood
c3cbf43
@theR4K theR4K requested review from Nick007J and erorcun Oct 31, 2020
@Nick007J
Nick007J reviewed Nov 1, 2020
View changes
src/audio/AudioLogic.cpp Show resolved Hide resolved
@Nick007J
Nick007J reviewed Nov 1, 2020
View changes
src/audio/AudioLogic.cpp Show resolved Hide resolved
@Nick007J
Nick007J reviewed Nov 1, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
@Nick007J
Nick007J approved these changes Nov 1, 2020
View changes
theR4K added 3 commits Nov 1, 2020
@theR4K
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
55c4346
@theR4K
changes in switch, and mark code
5ea9285
@theR4K
mark code
cebf32c
@ghost
ghost approved these changes Nov 1, 2020
View changes
Copy link

@ghost ghost left a comment

nice work
@Sergeanur
Sergeanur reviewed Nov 2, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
@Sergeanur
Sergeanur reviewed Nov 2, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
@Sergeanur
Sergeanur reviewed Nov 2, 2020
View changes
src/audio/AudioLogic.cpp Show resolved Hide resolved
@Sergeanur
Sergeanur reviewed Nov 2, 2020
View changes
src/audio/AudioManager.cpp Outdated Show resolved Hide resolved
@theR4K
fix serviceSoundEffects an cleanup
174424c
@Sergeanur
Sergeanur suggested changes Nov 3, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
theR4K added 3 commits Nov 4, 2020
@theR4K
FORMAT
89b622e
@theR4K
merge upstream
23d23f6
@theR4K
fix merge
f8cc86c
@erorcun
erorcun reviewed Nov 8, 2020
View changes
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Show resolved Hide resolved
src/audio/AudioLogic.cpp Outdated Show resolved Hide resolved
src/control/Script.h Outdated Show resolved Hide resolved
src/audio/AudioLogic.cpp Show resolved Hide resolved
theR4K added 5 commits Nov 8, 2020
@theR4K
fix for merge fix
a553ac8
@theR4K
pointers into referencies!
95bd5b0
@theR4K
returned bad code, becouse no one knows what to do with it
0853a47
@theR4K
marked stupied code(dotProduct and AudioEvents)
363a2c6
@theR4K
to make Serge and _R4K_ happy
fb2173c
@Sergeanur Sergeanur merged commit 5c64dba into GTAmodding:miami Nov 10, 2020
14 checks passed
14 checks passed
@github-actions
build (win-amd64-librw_d3d9-oal, Debug) build (win-amd64-librw_d3d9-oal, Debug)
Details
@github-actions
build (win-x86-librw_d3d9-mss, Debug) build (win-x86-librw_d3d9-mss, Debug)
Details
@github-actions
build (win-amd64-librw_d3d9-oal, Release) build (win-amd64-librw_d3d9-oal, Release)
Details
@github-actions
build (win-x86-librw_d3d9-mss, Release) build (win-x86-librw_d3d9-mss, Release)
Details
@github-actions
build (win-amd64-librw_gl3_glfw-oal, Debug) build (win-amd64-librw_gl3_glfw-oal, Debug)
Details
@github-actions
build (win-x86-librw_gl3_glfw-mss, Debug) build (win-x86-librw_gl3_glfw-mss, Debug)
Details
@github-actions
build (win-amd64-librw_gl3_glfw-oal, Release) build (win-amd64-librw_gl3_glfw-oal, Release)
Details
@github-actions
build (win-x86-librw_gl3_glfw-mss, Release) build (win-x86-librw_gl3_glfw-mss, Release)
Details
@github-actions
build (win-x86-librw_d3d9-oal, Debug) build (win-x86-librw_d3d9-oal, Debug)
Details
@github-actions
build (win-x86-librw_d3d9-oal, Release) build (win-x86-librw_d3d9-oal, Release)
Details
@github-actions
build (win-x86-librw_gl3_glfw-oal, Debug) build (win-x86-librw_gl3_glfw-oal, Debug)
Details
@github-actions
build (win-x86-librw_gl3_glfw-oal, Release) build (win-x86-librw_gl3_glfw-oal, Release)
Details
@appveyor
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@theR4K theR4K deleted the theR4K:miamiDev branch Sep 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jte jte

@Sergeanur Sergeanur

@erorcun erorcun

@Nick007J Nick007J

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@theR4K @jte @Sergeanur @erorcun @Nick007J