joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,619 Commits 3 Branches 0 Tags 63 MiB
Commit Graph

119 Commits

Author SHA1 Message Date
Sergeanur 33abd1b4e7 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp
 2021-09-02 21:00:15 +03:00
Sergeanur a16fcd8d6a Fixes from master 2021-09-02 19:22:50 +03:00
Sergeanur 232a45c9ac Audio: separate buffers for mission audio 2021-09-01 17:59:20 +03:00
Sergeanur 29383a6a11 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/sampman_miles.cpp
 2021-09-01 17:09:12 +03:00
Sergeanur 669c8c8988 Audio: add separate buffer for player comments like on PS2 to fix overflow, add ped comments debug to debug menu 2021-09-01 16:36:34 +03:00
Sergeanur eeacbfeb6a Merge branch 'miami' into lcs 2021-08-29 10:31:13 +03:00
Sergeanur 9a7b469f4e Audio: fixing bugs, fixing types, making code more accurate to original 2021-08-29 09:42:32 +03:00
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
Sergeanur 71e0895dc6 Add AUDIO_REVERB define 2021-08-19 10:53:14 +03:00
Sergeanur a13089cd2e Port audio changes from master 2021-08-18 15:49:06 +03:00
Nikolay Korolev 74f00c3c63 merge 2021-08-08 15:46:47 +03:00
Nikolay Korolev 88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Sergeanur 92679555b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/MusicManager.cpp
 2021-07-28 09:42:24 +03:00
Sergeanur 8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur 6a94299eac Fix 2021-07-26 04:42:15 +03:00
Sergeanur a064b3a687 Audio changes: 
- Reorder AudioCollision.cpp functions into original order
- Add missing cAudioCollision::Reset()
- Move cAudioCollision ctor into .h (like original)
- Fix argument types for ped comment functions and more
- Fix wrong names of ped comment functions
- Fix incorrect ped comments
- Remove getters
- Reorder declarations of cAudioManager
- Wrap PC only functions around ifdef
- Add cAudioManager methods from PS2 and mobile
 2021-07-26 04:34:55 +03:00
Sergeanur 780cd225e9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:12 +03:00
Sergeanur 2ce36a48b9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:02 +03:00
erorcun d82dbf91ef Merge/sync fixes after threaded audio 2021-07-10 23:14:13 +03:00
erorcun db4ae18e5d Remove waiting for stream closure in multi-thread audio 2021-07-10 23:14:08 +03:00
erorcun 5458632c40 Multi-threaded audio fixes 2021-07-10 23:13:51 +03:00
erorcun ab73c2f539 Multi-threaded audio streams 
Under MULTITHREADED_AUDIO define.
 2021-07-10 23:13:42 +03:00
erorcun 70fa7fc239 Sanitizer fixes 2021-07-03 01:28:32 +03:00
Sergeanur 138abb91f6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script4.cpp
#	src/core/Frontend.cpp
 2021-06-30 21:26:36 +03:00
erorcun 9f0daee186 Sanitizer fixes 2021-06-30 03:31:10 +03:00
erorcun fdbd414299 Fix MP3 finding stack crash 2021-06-28 17:44:48 +03:00
erorcun 22e8e0eff8 Fix MP3 finding stack crash 2021-06-28 17:35:25 +03:00
withmorten d17d437de3 rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake) 2021-06-28 13:57:05 +02:00
withmorten cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +02:00
erorcun 53a4b6936b Revert "Use PS2-y global names on SampMan" 
We know that they changed all those names on PC.

This reverts commit 091a65996e.
 2021-06-27 17:59:50 +03:00
erorcun 091a65996e Use PS2-y global names on SampMan 2021-06-27 17:53:14 +03:00
Sergeanur 879761af2c Merge fixes 2021-06-27 14:51:48 +03:00
Sergeanur 883d8172b0 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:33:39 +03:00
erorcun 05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03:00
erorcun 107c4df69c Multi-threaded audio streams 
Under MULTITHREADED_AUDIO define.
 2021-06-26 16:24:23 +03:00
Sergeanur 74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur 3ebc475494 Don't restart OAL device when switching EAX 2021-06-24 21:46:46 +03:00
Sergeanur 27df328ec2 Make sampman stream functions default to stream 0 + type fixes 2021-06-24 21:46:21 +03:00
Sergeanur 60bb16d26c Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:45:18 +03:00
Sergeanur 1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur 499b16678f Fix engine sounds, player and male01 ped comments 2021-06-24 21:42:10 +03:00
Sergeanur 0682cdedbd Fall back to mp3 if vb is not found 2021-06-24 21:42:10 +03:00
Sergeanur 1471c82a20 LCS sfx + mission audio 2021-06-24 21:42:08 +03:00
Sergeanur b8cf8c53e7 Don't restart OAL device when switching EAX 2021-06-24 21:34:33 +03:00
Sergeanur 5156626582 Make sampman stream functions default to stream 0 + type fixes 2021-06-24 21:34:33 +03:00
Sergeanur 02655313e9 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:34:33 +03:00
Sergeanur 5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur 5c1af537af Don't restart OAL device when switching EAX 2021-06-24 21:32:44 +03:00
Sergeanur edc25a689f Fix typo 2021-06-24 21:32:44 +03:00
Sergeanur 1e084dfab7 Set number of stereo sources 2021-06-24 21:32:43 +03:00