archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-05 21:49:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,619 Commits 3 Branches 0 Tags
lcs
Commit Graph
100 Commits
This Branch
This Branch
All Branches
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 6a12033942 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.cpp
 2021-09-02 18:52:32 +03:00
Sergeanur a04a84e00b Audio: small refactoring 2021-09-02 18:50:46 +03:00
Sergeanur abe6c22f56 Fix heli sound 2021-09-02 12:25:52 +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 27ddca26c2 Bridge sound done 2021-08-30 12:08:34 +03:00
Sergeanur 6df0cb1ddb Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.h
 2021-08-30 11:27:18 +03:00
Sergeanur 320624edc8 Audio: ps2 code ifdef 
# Conflicts:
#	src/audio/AudioManager.h
 2021-08-30 11:26:19 +03:00
Sergeanur 145af411ab Fix yet another DirectlyEnqueueSample 2021-08-30 09:33:19 +03:00
Sergeanur 07a1339704 Ferry sounds done 2021-08-30 09:01:10 +03:00
Sergeanur 0df6fbb30a Add new tSound field 2021-08-30 08:23:10 +03:00
Sergeanur 47c23ba917 Fix bugs in cAudioManager::DirectlyEnqueueSample 2021-08-29 18:57:01 +03:00
Sergeanur a404689e50 cAudioManager::DirectlyEnqueueSample 2021-08-29 17:32:36 +03:00
Sergeanur c6f9bbce8e Fix tabs after merge 2021-08-29 13:52:14 +03:00
Sergeanur 07778c81bc Merge branch 'miami' into lcs 2021-08-29 13:49:21 +03:00
Sergeanur 5b0c8fb3e2 More original indices 2021-08-29 13:36:42 +03:00
Sergeanur 355c260bf2 Fix Squalo render out poly 2021-08-29 13:29:06 +03:00
Sergeanur 764762f236 Get original MI_SKIMMER 2021-08-29 13:11:52 +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 2be8fcfa64 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.cpp
#	src/core/Radar.cpp
 2021-08-29 08:58:54 +03:00
Sergeanur a94812b28d Fix acceleration sound on exiting the vehicle 2021-08-26 08:15:18 +03:00
Sergeanur 8de1ffb84d Fix reflections with audio time scale 2021-08-26 07:53:07 +03:00
Sergeanur f87f14b432 Refactor cPedComments 2021-08-25 13:41:53 +03:00
Sergeanur e1286fcb04 Fix clock 2021-08-25 09:18:24 +03:00
Sergeanur 800ab92960 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
 2021-08-25 09:07:41 +03:00
Sergeanur c8492ab5e0 Audio: refactoring, type fixes, renaming cAudioManager fields 2021-08-25 08:49:58 +03:00
Sergeanur d4a2113a8a Audio: fix PS2 ifdefs 2021-08-24 15:25:51 +03:00
Sergeanur a5ec7a45db Merge branch 'master' into miami 
# Conflicts:
#	.github/workflows/build-switch.yml
#	.vscode/settings.json
#	CMakeLists.txt
#	README.md
#	cmake/nx/NXFunctions.cmake
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/polish.gxt
#	gamefiles/TEXT/russian.gxt
#	gamefiles/TEXT/spanish.gxt
#	gamefiles/models/frontend_nsw.txd
#	gamefiles/models/nswbtns.txd
#	res/images/logo.svg
#	res/images/logo_1024.png
#	res/images/logo_256.jpg
#	src/CMakeLists.txt
#	src/audio/AudioCollision.cpp
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
#	src/audio/AudioManager.h
#	src/audio/MusicManager.cpp
#	src/audio/PolRadio.cpp
#	src/audio/PolRadio.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp
#	src/control/CarCtrl.cpp
#	src/core/ControllerConfig.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/MenuScreensCustom.cpp
#	src/core/common.h
#	src/core/config.h
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/peds/PedFight.cpp
#	src/peds/PlayerPed.cpp
#	src/peds/PlayerPed.h
#	src/skel/crossplatform.cpp
#	src/skel/glfw/glfw.cpp
#	src/weapons/Weapon.cpp
#	utils/gxt/polish.txt
#	utils/gxt/russian.txt
 2021-08-24 15:19:35 +03:00
Sergeanur abbfb09a64 Audio enhancements: 
* redo high fps fix
* make releasing vehicle sounds attach to entities
* fix bug with reusing audio entity that is still being used
* use time scale to modify sound speed
 2021-08-24 14:58:41 +03:00
Sergeanur 38f4ea7aa3 Audio enhancements: 
* redo high fps fix
* make releasing vehicle sounds attach to entities
* fix bug with reusing audio entity that is still being used
* use time scale to modify sound speed
 2021-08-24 13:11:36 +03:00
Sergeanur ef0ba763b9 Make ped comments update position and volume + fix cPedComments::Process 2021-08-23 11:16:53 +03:00
Sergeanur ceb65eafa5 Make ped comments update position and volume 2021-08-23 11:15:03 +03:00
Sergeanur 3cbf84f98b Fix ClearMissionAudio crash 2021-08-22 13:40:57 +03:00
Sergeanur e500b77cd3 Audio: more LCS changes 2021-08-21 18:55:11 +03:00
Sergeanur 3779a39f1f Audio: a couple of LCS changes 2021-08-21 13:32:37 +03:00
Sergeanur e0be6beb18 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
#	src/audio/PolRadio.cpp
#	src/control/CarCtrl.cpp
 2021-08-21 13:25:42 +03:00
Sergeanur 7c80093efa Remove cMissionAudio, move cAMCrime array outside of cPoliceRadioQueue (R* vision) 2021-08-21 13:02:07 +03:00
Sergeanur b683c047dc Remove cMissionAudio, move cAMCrime array outside of cPoliceRadioQueue (R* vision) 2021-08-21 12:18:45 +03:00
Sergeanur fe51abd534 Audio: bits of PS2 code 2021-08-21 08:42:00 +03:00
Sergeanur 071dbc3086 Merge branch 'miami' into lcs 2021-08-20 15:45:58 +03:00
Sergeanur 6ad85725d9 Set TIME_SPENT to 30 2021-08-20 15:45:50 +03:00
Sergeanur 239367663b Rename unknown audio field 2021-08-20 15:45:18 +03:00
Sergeanur 9c40489589 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
 2021-08-20 14:34:11 +03:00
Sergeanur a401f926d3 Audio refactoring: 
* renamed tSound fields, added descriptions for each field
* getting rid of term 'intensity' in favour of 'max distance'
* renamed two cAudioManager fields
* fix volume not being reduced for stopping sounds that are looped
 2021-08-20 14:28:55 +03:00
Sergeanur ef0b5f857d A few small audio changes 2021-08-20 14:28:18 +03:00
Sergeanur c168786b42 Audio refactoring: 
* renamed tSound fields, added descriptions for each field
* getting rid of term 'intensity' in favour of 'max distance'
* renamed two cAudioManager fields
* fix volume not being reduced for stopping sounds that are looped
* reverse a few PS2 bits
 2021-08-20 13:02:58 +03:00
Sergeanur a9798d0645 Fix police yelling from empty or destroyed boats 2021-08-19 12:03:27 +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 51ba90dd52 Audio: ifdef more things that aren't on ps2 2021-08-19 08:45:56 +03:00
Sergeanur eda2c05448 Audio: ifdef more things that aren't on ps2 2021-08-18 21:07:33 +03:00
Sergeanur 2120d4d3ce Fix acceleration sound playing when exiting the vehicle, code fixes in ProcessPlayersVehicleEngine 2021-08-18 18:37:43 +03:00
Sergeanur 01c70dfb76 Fix acceleration sound playing when exiting the vehicle 2021-08-18 18:37:10 +03:00
Sergeanur 296e7ed9ad Possible fix of ProcessVehicleOneShots crash 2021-08-18 17:31:34 +03:00
Sergeanur a13089cd2e Port audio changes from master 2021-08-18 15:49:06 +03:00
Sergeanur 597802ff2e One more type fix 2021-08-18 15:37:31 +03:00
Sergeanur 5c562c3adc More type fixes in audio 2021-08-18 15:31:58 +03:00
Sergeanur 16ff379ebe Add AUDIO_REFLECTIONS define, fix a bunch of types, fix heli chatter intensity 2021-08-17 13:58:48 +03:00
Sergeanur 2526503743 Remove FIX_BUGS that wasn't needed 2021-08-17 10:50:53 +03:00
Sergeanur 0c55f331cf Merge branch 'miami' into lcs 2021-08-16 14:32:15 +03:00
Sergeanur 176cadff05 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-08-16 14:31:40 +03:00
Sergeanur 076b324539 Fix ped comments playing at full volume behind the wall 2021-08-16 14:21:51 +03:00
Sergeanur cd0a765f66 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioCollision.cpp
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
#	src/audio/AudioManager.h
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/core/Frontend.cpp
#	src/core/MenuScreens.cpp
#	src/core/MenuScreensCustom.cpp
#	src/core/common.h
#	src/core/config.h
#	src/vehicles/Automobile.cpp
 2021-08-16 14:13:31 +03:00
Sergeanur 2633295ada Merge branch 'miami' into lcs 2021-08-16 10:33:54 +03:00
Sergeanur dc28d52d08 LCS audio reflections values 2021-08-16 10:33:46 +03:00
Sergeanur 76f2191476 Remove not needed entry from config 2021-08-16 10:31:35 +03:00
Sergeanur bcb5b4f94d Remove not needed entry from config 2021-08-16 10:29:44 +03:00
Sergeanur d7e764d519 Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioLogic.cpp
#	src/core/config.h
#	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-08-16 10:09:39 +03:00
Sergeanur d6fbf9fbe7 PS2 audio reflections 2021-08-16 10:02:29 +03:00
Sergeanur c7e05c74b9 Fix cAudioManager::ProcessVehicleEngine return type, rename Sound Intensity 2021-08-16 10:00:10 +03:00
Sergeanur ab03fbb6c8 Make UpdateReflections a bit more binary exact + small code changes to sync with miami 2021-08-16 09:59:08 +03:00
Sergeanur 9ed94f310a Fix CW build 2021-08-16 09:57:40 +03:00
Sergeanur 854ee12d9d Fix ifdef for audio reflection members 2021-08-15 14:11:20 +03:00
Sergeanur 5ddd0649e3 Fix cAudioManager::ProcessVehicleEngine return type, document PS2 changes, rename Sound Intensity 2021-08-15 13:14:16 +03:00
Sergeanur 886650a887 Fix CW build 2021-08-15 13:12:10 +03:00
Sergeanur 4141caa4d6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/core/Radar.cpp
#	src/core/config.h
 2021-08-12 16:04:25 +03:00
Sergeanur 0a2df3ca4c Fix sampman_null 2021-08-12 15:03:38 +03:00
Sergeanur 8759c2edf0 Sync fixes from miami 2021-08-12 15:01:58 +03:00
Sergeanur 92c5cf1877 Sync audio changes from master 2021-08-12 14:57:16 +03:00
Sergeanur 43fbf297c8 Waypoint text fix 2021-08-12 14:15:49 +03:00
Sergeanur 033d89a9ab Refactor cAudioManager::ProcessActiveQueues, fix doppler effect 2021-08-12 13:01:07 +03:00
Sergeanur f1545daeae Rename unused audio member 2021-08-12 11:46:10 +03:00
Sergeanur ec22576e49 Merge remote-tracking branch 'aap/lcs' into lcs 
# Conflicts:
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
 2021-08-12 11:45:25 +03:00
Sergeanur 9a1b826021 Merge remote-tracking branch 'origin/miami' into lcs 2021-08-12 11:43:17 +03:00
Sergeanur 4f8993e19b Replace static_assert with #error 2021-08-12 11:39:34 +03:00
Sergeanur 2ef43e8d1a Fix sampman_null 2021-08-12 11:39:34 +03:00
Sergeanur ce78081a7f Put more things under ifdef 2021-08-12 11:39:34 +03:00
Sergeanur 6c2d179aad Add define to enable/disable external 3d audio simulation 2021-08-12 11:39:34 +03:00
Sergeanur 2eb0390dc9 Fix unset emitting volume for sawmill 2021-08-11 13:35:50 +03:00
Sergeanur f131f70761 Fix unset emitting volume for moan sound 2021-08-11 12:10:48 +03:00
Sergeanur 68c37d2d88 Reverse miami vice ped comments 2021-08-11 10:55:00 +03:00
Sergeanur 80dc23621e uncomment GetSpecialCharacterTalkSfx 2021-08-11 10:47:02 +03:00
Sergeanur b289bb4edb Reverse special characters' ped comments 2021-08-11 10:09:20 +03:00
Sergeanur 2c79080e1b Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/Radar.cpp
#	src/core/Radar.h
 2021-08-11 09:36:58 +03:00
Sergeanur 75f812cfcd Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/RoadBlocks.cpp
#	src/core/Radar.cpp
#	src/core/Radar.h
#	src/peds/Ped.cpp
#	src/peds/Population.cpp
#	src/renderer/Renderer.cpp
#	src/vehicles/CarGen.cpp
 2021-08-11 09:32:59 +03:00
Sergeanur 463fdab6a4 Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2 2021-08-11 08:42:26 +03:00