archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-30 06:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,525 Commits 3 Branches 0 Tags
381d0b4e3ece226865a87498b77d644e0570331e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 2120d4d3ce Fix acceleration sound playing when exiting the vehicle, code fixes in ProcessPlayersVehicleEngine 2021-08-18 18:37:43 +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 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
Sergeanur d7a28c4d2b Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-11 08:35:01 +03:00
Sergeanur 0544beb00d Add sprite to the waypoint marker 2021-08-11 08:15:30 +03:00
Sergeanur 1f98f01dcb Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-09 18:14:19 +03:00
Sergeanur 8ea411e4c5 Add sprite to the waypoint marker 2021-08-09 18:07:42 +03:00
Sergeanur 26a9ac91ee Merge branch 'miami' into lcs 2021-08-08 18:02:45 +03:00
Sergeanur 76a22c0d13 Fix 2021-08-08 18:02:23 +03:00
Sergeanur f887d515fa Sync fix from miami 2021-08-08 17:53:01 +03:00
Sergeanur cb5586e658 Merge pull request #1268 from Nick007J/master 
move debug stuff to a separate file
 2021-08-02 15:06:40 +03:00
Sergeanur 865ce46fdb Fix waypoint disappearing after each save 2021-08-02 14:26:00 +03:00
Sergeanur a481b900b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/modelinfo/MloModelInfo.cpp
#	src/modelinfo/MloModelInfo.h
#	src/renderer/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-07-31 20:43:52 +03:00
Sergeanur 835fa4e74b Make cars and peds to not despawn when you look away 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/core/config.h
#	src/peds/Population.cpp
 2021-07-31 20:32:13 +03:00
Sergeanur 232b5a04ba Merge pull request #1251 from Sergeanur/HigherDrawDist 
Make cars and peds to not despawn when you look away
 2021-07-31 20:07:29 +03:00
Sergeanur 9d25e7f315 Merge pull request #1248 from davicr/radar-cutscene-bugfix 
Fix blip rendering during scripted sequences
 2021-07-31 20:06:20 +03:00
Sergeanur e8dcc8432d Possible crashfix with wanted level 2021-07-30 20:36:07 +03:00
Sergeanur b77d93ba4a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-29 01:59:20 +03:00
Sergeanur 7bacf3b6f4 Reverse unused audio functions 2021-07-29 01:52:49 +03:00
Sergeanur cce97588fe Reverse unused audio functions from mobile 
# Conflicts:
#	src/audio/AudioManager.h
 2021-07-29 00:43:04 +03:00
Sergeanur 6cea1de9e6 Reverse unused audio functions from mobile 2021-07-29 00:40:32 +03:00
Sergeanur 81673ab304 Fix comments 2021-07-28 10:36:18 +03:00
Sergeanur 04126cd18a Merge branch 'miami' into lcs 2021-07-28 10:32:58 +03:00
Sergeanur 2aa37813d2 cAudioManager declaration reordering 2021-07-28 10:32:43 +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 7adc85995f Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2021-07-28 09:24:23 +03:00
Sergeanur 61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur 98003d0d41 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:56:42 +03:00
Sergeanur 49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur 029e315f0a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:42:18 +03:00
Sergeanur 16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur f82c3c8ea7 Merge branch 'miami' into lcs 2021-07-27 22:39:14 +03:00
Sergeanur 9dbaa7a77f PolRadio type fixes 2021-07-27 22:38:57 +03:00
Sergeanur d0666a8702 One more type fix 2021-07-27 22:38:35 +03:00
Sergeanur 16e2e3d091 Type fix 2021-07-27 22:32:47 +03:00
Sergeanur fbb42085bd Merge branch 'miami' into lcs 2021-07-27 22:30:45 +03:00
Sergeanur 7aa8d7c073 AudioManager.cpp reordering 2021-07-27 22:29:40 +03:00
Sergeanur ad2ccdb44a Merge branch 'miami' into lcs 2021-07-27 22:02:45 +03:00
Sergeanur 782d38c6b7 Sort AudioCollision functions into original order 2021-07-27 22:02:25 +03:00
Sergeanur 5240dce018 cAudioManager::GetCollisionOneShotRatio cleanup 2021-07-27 22:01:17 +03:00
Sergeanur ec7d702185 Merge pull request #1255 from Nick007J/lcs 
low effort save support
 2021-07-27 20:59:08 +03:00
Sergeanur 6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
Sergeanur c0488b3190 Fix stuck looking flag when answering phone and idle weapon animation 2021-07-26 20:40:55 +03:00
Sergeanur 1180f32d9c Fix bike kick sound 2021-07-26 11:33:56 +03:00
Sergeanur 371f1be9b3 Fix smooth spray when using chainsaw or when you stop shooting while using free camera and PC controls 2021-07-26 09:54:04 +03:00
Sergeanur 250727c9ca Fix muzzleflash rotation 2021-07-26 09:52:39 +03:00
Sergeanur f7a2c265b3 Remove deceiving comment 2021-07-26 09:16:43 +03:00