crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
5,080 Commits 3 Branches 0 Tags 79 MiB
9a7b469f4e
Commit Graph

746 Commits

Author SHA1 Message Date
erorcun
902e539c0d Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text 2021-02-01 14:18:17 +03:00
Sergeanur
4afa7b86ae Add radio off text 2021-01-31 23:44:30 +02:00
erorcun
810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
withmorten
3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
withmorten
497e0b801f m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:19:44 +01:00
withmorten
034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
erorcun
5a47379bf5 Includes overhaul, fix some compiler warnings 2021-01-17 21:32:54 +01:00
Filip Gawin
6bebde8279 Port debug messagess for audio cache 2021-01-16 01:38:18 +01:00
Sergeanur
19749effce Fix Jumbo Sound reseting when walking 2021-01-15 17:54:21 +02:00
Filip Gawin
7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
Filip Gawin
1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
Filip Gawin
c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01:00
Filip Gawin
70358d90b4 Backport fix from re3 2021-01-14 15:30:33 +01:00
Anonymous Maarten
8a157eee0a audio: only use #pragma comment(lib, xxx.lib) on MSVC 2021-01-11 01:12:44 +01:00
Sergeanur
8eed6ae179 Use original names 2021-01-08 21:50:59 +02:00
Sergeanur
556b9ae574 Fix gOneShotCol 2021-01-08 00:47:21 +02:00
Sergeanur
c423c59365 Add MPG123_QUIET to mp3 files 2021-01-07 22:15:55 +02:00
Sergeanur
d8a04c9e43 Add MPG123_QUIET to mp3 files 2021-01-07 22:15:30 +02:00
Sergeanur
ef13866af6 Make opus available alongside other formats 2021-01-07 22:13:46 +02:00
Sergeanur
6b0fa20b8b Make opus available alongside other formats 2021-01-07 22:01:44 +02:00
Sergeanur
0845abf640 Fix 16KHz track 2021-01-07 15:16:24 +02:00
Sergeanur
0b73b13b9a Cleanup and fixes for new decoders 2021-01-06 20:23:30 +02:00
Sergeanur
02a28996f4 Cleanup and fixes for new decoders 2021-01-06 20:22:09 +02:00
Filip Gawin
ff9d6e4fd6 Fixes for CVbFile 2021-01-06 18:15:32 +01:00
Filip Gawin
36996af82b Fixes for CVbFile 2021-01-06 18:14:44 +01:00
Filip Gawin
2bcb2a40e4 Small fixes for new wav decoder 2021-01-06 17:57:43 +01:00
Filip Gawin
145bd243e8 Small fixes for new wav decoder 2021-01-06 17:56:23 +01:00
Sergeanur
a51757429e Implementing our own WAV decoder to replace SndFile 2021-01-06 15:52:12 +02:00
Sergeanur
493f6cb578 Implementing our own WAV decoder to replace SndFile 2021-01-06 15:46:59 +02:00
Sergeanur
d94e8e8faf duh 2021-01-05 21:31:49 +02:00
Sergeanur
fd4c2172f5 Add support of PS2 audio streams to OpenAL 2021-01-05 21:23:27 +02:00
Sergeanur
bc363a74f5 Add support of PS2 audio streams to OpenAL 2021-01-05 21:06:17 +02:00
Sergeanur
f639aae2ae Fix chainsaw sound 2021-01-05 13:04:42 +02:00
Sergeanur
042e21115e More audio fix 2021-01-05 00:50:51 +02:00
Sergeanur
63e9f6d826 Audio fixes 2021-01-05 00:32:03 +02:00
Sergeanur
32d3ea0a2d Audio fixes 2021-01-05 00:31:31 +02:00
Sergeanur
6753d39dd0 Fix uninitialized filed in cAudioManager 2021-01-04 23:11:31 +02:00
Sergeanur
150f5302b7 Handle stereo panning in OAL manually for streams 2021-01-04 22:48:43 +02:00
Sergeanur
a346461ea8 Increase number of stream buffers, plus ALStreamSources fix 2021-01-04 22:27:32 +02:00
Sergeanur
7adac51152 Handle stereo panning in OAL manually for streams 2021-01-04 20:11:04 +02:00
Sergeanur
2db0d7cfa1 Double the volume for mission audio in OAL + small fix 2021-01-04 15:08:02 +02:00
TheOfficialFloW
0c2ea268d1
Fix typo in ProcessMissionAudioSlot. 2021-01-03 16:56:12 +01:00
Sergeanur
941e70a701 Sync miami things 2021-01-03 16:44:21 +02:00
Sergeanur
2e06e4b6b8 Fix speed of sound 2021-01-03 16:43:58 +02:00
TheOfficialFloW
e46b06491c Fix nFramesForPretendPlaying. 2021-01-03 14:59:16 +01:00
Sergeanur
9ae3fac08e Fix ServiceTrack 2021-01-03 00:52:30 +02:00
Sergeanur
1169437ec6 Fix uninitialized RadioStaticCounter 2021-01-03 00:15:33 +02:00
Filip Gawin
b3581bc0b4 Overhaul and enable cache for openal build 2021-01-01 16:43:26 +01:00
Sergeanur
c3f49386ca Fix wrong sound when bumping peds 2021-01-01 15:11:12 +02:00
Sergeanur
759f91ce91 Fix drive-by machine gun sound 2020-12-27 10:58:33 +02:00
Sergeanur
d459ef8820 Weapon flags changed from bit fields to bit mask (R* vision) 2020-12-26 14:21:45 +02:00
Sergeanur
441b3864f3 cPedParams ctor 2020-12-26 07:53:30 +02:00
Sergeanur
18bea3cfa5 Fix weapon pickup sound 2020-12-26 07:31:53 +02:00
Sergeanur
783d1edaf1 cVehicleParams ctor 2020-12-25 20:27:37 +02:00
Sergeanur
2b96be0418 cVehicleParams ctor 2020-12-25 20:22:43 +02:00
Sergeanur
7a7061ea92 Use intensity in ProcessBoatEngine 2020-12-25 20:00:12 +02:00
Sergeanur
90ef1d2d31 cAudioManager::ProcessBoatEngine 2020-12-25 19:59:45 +02:00
Sergeanur
03c3eeb937 cAudioManager::ProcessBoatEngine fixes 2020-12-25 19:57:09 +02:00
Sergeanur
9345efbafb cPedParams fixes 2020-12-25 17:42:40 +02:00
Sergeanur
b8bf3cb790 cPedParams fixes 2020-12-25 17:39:49 +02:00
Sergeanur
fa6eb3a64f cAudioManager::ProcessOneShotScriptObject 2020-12-25 17:22:18 +02:00
Sergeanur
356f101078 Fix cAudioManager::ProcessPedOneShots crash 2020-12-25 16:24:20 +02:00
shfil
dc72729a40
Merge pull request #895 from ShFil119/miami_audio 
More audio
 2020-12-25 14:02:47 +01:00
Filip Gawin
cf8799d116 More audio enums 2020-12-25 13:51:09 +01:00
Sergeanur
c0be4a3f7d Fix cMusicManager::SetRadioChannelByScript 2020-12-25 12:06:08 +02:00
Sergeanur
4846564c78 cMusicManager::ServiceGameMode fix 2020-12-25 11:11:37 +02:00
Sergeanur
74276ae878 More type fix 2020-12-25 09:29:23 +02:00
Sergeanur
1cc8a1d247 Small audio code fix 2020-12-25 09:13:01 +02:00
Sergeanur
6d75374c41 Fix cAudioManager::ProcessSpecial 2020-12-25 09:06:49 +02:00
Sergeanur
6a2edcea46 Small type use fixes 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/vehicles/Cranes.cpp
 2020-12-25 09:03:13 +02:00
Sergeanur
de31bdc89f Small type use fixes 2020-12-25 08:59:32 +02:00
Sergeanur
0768026938 Fix chainsaw sounds lol 2020-12-25 08:33:43 +02:00
Filip Gawin
19cc1d7854 fixes 2020-12-25 01:29:18 +01:00
erorcun
f9cbe29c50
Merge pull request #886 from erorcun/master 
Radio scroll to prev. station & radio off text
 2020-12-24 20:47:26 +03:00
Filip Gawin
35473e653d More audio 2020-12-22 14:53:45 +01:00
erorcun
ae7cb92437 fixes to last HUD commits 2020-12-20 05:49:55 +03:00
Fire-Head
0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
Fire-Head
140fa2a21c restore original code, fixes, ps2 font 2020-12-19 21:25:45 +03:00
erorcun
4c46d24983
style change 2020-12-19 20:39:42 +03:00
Nikolay Korolev
bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
erorcun
b834d92585 radio scroll fix 2020-12-15 18:37:21 +03:00
erorcun
984b8efccc Radio scroll to prev. station & radio off text 2020-12-15 05:51:53 +03:00
erorcun
6b654094a5
Merge pull request #871 from withmorten/sized-enums 
Get rid of sized enums
 2020-12-09 03:15:20 +03:00
Fire-Head
87bca997a4 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-07 21:50:18 +03:00
Fire-Head
c5fbb594a5 ps2 hud, restore original code 2020-12-07 21:12:13 +03:00
Anonymous Maarten
5a1ea7bcf5 audio: define openal extensions in re3 owned namespace 2020-12-07 19:05:58 +01:00
withmorten
4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten
912e71be53 int8 enums fixed 2020-12-07 01:30:38 +01:00
withmorten
16ed00aede uint16 enums fixed 2020-12-07 01:22:51 +01:00
withmorten
e6a7a9353c uint32 enums fixed 2020-12-07 01:20:14 +01:00
withmorten
7ad86595e4 int32 enum fixed 2020-12-07 01:19:10 +01:00
withmorten
5e9a433b79 int32 enum fixed 2020-12-07 01:05:45 +01:00
withmorten
9e2ac26a1d uint32 enums fixed 2020-12-07 01:04:23 +01:00
withmorten
b5ffea5c6e uint16 enums fixed 2020-12-07 00:57:34 +01:00
withmorten
afdf8c25a0 int8 enums fixed 2020-12-07 00:56:12 +01:00
withmorten
4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Anonymous Maarten
12d3893fe9 crossplatform is needed for casepath on non-Windows systems 2020-12-06 20:46:11 +01:00
Sergeanur
43d5831394 cAudioManager::ProcessPedOneShots + fixes 2020-12-01 23:38:36 +02:00
aap
d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
Sergeanur
103b8fb426 More audio fix 2020-11-22 23:24:38 +02:00
Sergeanur
f010777e58 Audio fixes 2020-11-22 23:10:41 +02:00
Sergeanur
be205d9602
Merge pull request #797 from theR4K/master 
Make code in master same like in audio PR for miami
 2020-11-15 14:55:40 +02:00
Nikolay Korolev
be92957328 fixed top gear 2020-11-11 12:21:30 +03:00
Roman Masanin
c91d5a90a1 easy way to safe few petaseconds 2020-11-08 23:29:57 +03:00
Roman Masanin
fb2173c396 to make Serge and _R4K_ happy 2020-11-08 22:33:30 +03:00
Roman Masanin
363a2c6098 marked stupied code(dotProduct and AudioEvents) 2020-11-08 22:26:14 +03:00
Roman Masanin
612bd98039 return bad code, becouse no one knows what to do with it 2020-11-08 21:30:03 +03:00
Roman Masanin
0853a47a3f returned bad code, becouse no one knows what to do with it 2020-11-08 21:23:29 +03:00
erorcun
f8367ebdef Revert "Font: Fix text dimensions" 
This reverts commit 6729de49b1.
 2020-11-08 21:11:55 +03:00
Roman Masanin
279acfae59 pointers to referencies too 2020-11-08 20:50:46 +03:00
Roman Masanin
e269809bfd Merge branch 'master' of https://github.com/GTAmodding/re3 2020-11-08 20:32:31 +03:00
Roman Masanin
95bd5b073a pointers into referencies! 2020-11-08 20:31:24 +03:00
Roman Masanin
a553ac8716 fix for merge fix 2020-11-08 17:49:10 +03:00
Roman Masanin
f8cc86c227 fix merge 2020-11-08 16:23:20 +03:00
Roman Masanin
23d23f6462 merge upstream 2020-11-08 16:23:05 +03:00
Sergeanur
a2e0373d22 Pickups fix 2020-11-08 15:00:54 +02:00
Sergeanur
7ede8685ec Ped comments fixes 2020-11-07 14:39:53 +02:00
Sergeanur
3b81eaa2d7 Fix cAudioManager::GetPhrase 2020-11-07 13:55:55 +02:00
Filip Gawin
e24513d2ad Sfx audio logic 2020-11-06 18:42:52 +01:00
Roman Masanin
89b622eea8 FORMAT 2020-11-04 11:37:17 +03:00
Roman Masanin
174424c520 fix serviceSoundEffects an cleanup 2020-11-02 12:05:23 +03:00
Roman Masanin
fad0a9507d some "optimizations". same like I did in VC 2020-11-01 23:48:03 +03:00
Roman Masanin
cebf32c46c mark code 2020-11-01 23:38:45 +03:00
Roman Masanin
5ea9285c5b changes in switch, and mark code 2020-11-01 22:42:45 +03:00
Roman Masanin
55c4346610 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev 2020-11-01 22:35:46 +03:00
Sergeanur
b8d2c4e452 Add VB file list 2020-10-30 10:34:13 +02:00
Sergeanur
86b1d9aea5 OpenAL channels now use their own sound buffers 
# Conflicts:
#	src/audio/sampman_oal.cpp
 2020-10-28 10:09:59 +02:00
Sergeanur
4cfb3b0984 OpenAL channels now use their own sound buffers 2020-10-27 09:35:09 +02:00
erorcun
ba0c96c39c Revert "(TEST) Try to fix OAL audio problems" 
This reverts commit 19cc6fafe0.
 2020-10-27 00:40:12 +03:00
Sergeanur
d94b36c202 Fixes to OpenAL 2020-10-26 20:13:50 +02:00
Roman Masanin
c3cbf4353d Fix build and use enum in ProcessPlayerMood 2020-10-26 14:02:11 +03:00
erorcun
19cc6fafe0 (TEST) Try to fix OAL audio problems 2020-10-26 12:35:24 +03:00
Roman Masanin
4bcd176944 fix merge 2020-10-26 00:17:21 +03:00
Roman Masanin
44bbcbd14a merge upstream 2020-10-26 00:16:46 +03:00
Roman Masanin
96ccb1333b cleanup processVehicleOneShots, processVehicleX done 2020-10-26 00:14:59 +03:00
Roman Masanin
04b841c719 processVehicleOneShots 2020-10-26 00:11:04 +03:00
erorcun
6729de49b1 Font: Fix text dimensions 2020-10-25 20:57:24 +03:00
erorcun
0a36629502 Finalize frontend sounds, player setup screen 2020-10-25 18:01:09 +03:00
Roman Masanin
211ab16ddb skiding 2020-10-25 16:14:29 +03:00
Sergeanur
6647dd043d Remove redundant includes 2020-10-25 13:08:28 +02:00
Sergeanur
83947e6958 Remove redundant includes 2020-10-25 13:07:44 +02:00
Sergeanur
e0394e6e69 Possible fix of linux build 2020-10-25 12:38:08 +02:00
Sergeanur
a520243563 cAudioManager::ProcessFrontEnd done 2020-10-25 12:00:57 +02:00
Sergeanur
93b318cfdf DMAudio fixes 2020-10-25 09:42:24 +02:00
Sergeanur
aac0c3fb67 DMAudio fixes 2020-10-25 09:40:11 +02:00
Roman Masanin
a12789c632 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev 2020-10-24 22:26:56 +03:00
Roman Masanin
63c7df9f09 mark reflections done 2020-10-24 22:26:45 +03:00
Roman Masanin
c4707fe887 fix merging errors 2020-10-24 22:06:45 +03:00
Roman Masanin
a9db60a1d9 jumbo 2020-10-24 20:47:03 +03:00
Roman Masanin
beae41b207 fires 2020-10-24 19:43:11 +03:00
Roman Masanin
19ffb9c8df model heli 2020-10-24 19:24:48 +03:00
Sergeanur
3d14097bf6 Fix playback of vanilla opus 2020-10-24 16:37:39 +03:00
Sergeanur
a492f8ba0d Fix playback of vanilla opus 2020-10-24 16:37:14 +03:00
Roman Masanin
39b7075502 merge Upstream 2020-10-24 14:20:08 +03:00
Sergeanur
a0efb89aa0 more ScriptSounds 2020-10-23 18:35:37 +03:00
Sergeanur
ca497e2cbd ScriptSounds 2020-10-23 16:56:34 +03:00
Sergeanur
1cdc647324 Fix argument type 2020-10-22 22:05:50 +03:00
Sergeanur
86a7d4415b Fix argument type 2020-10-22 22:04:12 +03:00
Sergeanur
ee61f19253 Police Radio + fixes 2020-10-22 12:38:09 +03:00
Sergeanur
94f0ecfa21 Police Radio fixes 2020-10-22 12:36:47 +03:00
erorcun
86002b093f EmergencyPed, PedDebug, message fix 2020-10-21 21:27:13 +03:00
Roman Masanin
0594ed5b46 peds 2020-10-18 23:03:03 +03:00
erorcun
0eb4aca1d6 Fix build 2020-10-18 20:09:55 +03:00
erorcun
a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +03:00
Sergeanur
0d20f1c364 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/RoadBlocks.cpp
#	src/entities/Entity.h
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/render/Renderer.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/CarGen.cpp
#	src/weapons/BulletInfo.cpp
#	src/weapons/Weapon.cpp
 2020-10-18 17:15:49 +03:00
Filip Gawin
747fe7ab67 Merge branch 'master' of github.com:GTAmodding/re3 into master 2020-10-18 15:14:03 +02:00
Filip Gawin
3594b35fbb Add missing breaks in AudioLogic.cpp 2020-10-18 15:13:43 +02:00
Roman Masanin
9cf38634b9
ProcessWaterCannon bug and refractoring (#773) 
* fix audio bug and some refractoring

* mark original bugs
 2020-10-17 20:56:42 +02:00
Roman Masanin
1e3aabf654 fix bugs 2020-10-17 21:30:48 +03:00
Roman Masanin
eeee5012b7 model cars and other audio stuff 2020-10-17 16:57:36 +03:00
Roman Masanin
97fc5224e7 road noise 2020-10-17 02:22:02 +03:00
Roman Masanin
894a1ae93a siren and horn 2020-10-17 00:27:28 +03:00
Roman Masanin
a4fd1a9f39 sirenes and more marks for audio. also fix cAudioMrg size 2020-10-12 20:55:19 +03:00
erorcun
4e07297503
Update sampman_miles.cpp 2020-10-12 20:51:52 +03:00
eray orçunus
342da2430b Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-12 20:47:34 +03:00
eray orçunus
d18a55f429 SampleManager 2020-10-12 20:22:39 +03:00
Roman Masanin
e34261d3ef mark some audio stuff and fix frameCounter 2020-10-12 18:09:58 +03:00
Sergeanur
9dba2386bb Merge branch 'master' into VC/TextFinish 
# Conflicts:
#	src/text/Text.cpp
 2020-10-11 10:34:47 +03:00
Sergeanur
e26e85deb8 Some unicode funcs belong to Font.cpp + small fix 2020-10-11 10:33:02 +03:00
erorcun
3435d6656c
Merge pull request #748 from theR4K/miamiUpstream 
CExplosion and some audio
 2020-10-08 16:15:18 +03:00
Roman Masanin
4fd93fea51 fix mistakes 2020-10-05 17:24:57 +03:00
eray orçunus
ee27cae732 Fix Linux audio path 2020-10-05 14:23:37 +03:00
eray orçunus
1a0b71bd47 Fix Audio 2020-10-05 14:23:12 +03:00
eray orçunus
6f3f581d8a Fix Audio 2020-10-05 13:59:40 +03:00
Roman Masanin
4867d9949d some audio and part of CExplosion 2020-10-05 03:04:35 +03:00
eray orçunus
49ae7da5ce Fix Linux audio path 2020-10-05 01:25:56 +03:00
shfil
9d53b738cc
Merge pull request #737 from theR4K/miamiDev 
just ProcessActiveQueues
 2020-10-02 20:11:00 +02:00
Roman Masanin
1991f9b362 revert some changes and little fix 2020-10-02 20:35:16 +03:00
erorcun
72f342245d
Merge pull request #731 from erorcun/miami 
Population done, mouse AUX buttons, Frontend, Hud, fixes
 2020-10-02 17:39:15 +03:00
Roman Masanin
6ff138ca76 fix build(bcs func CheckForAnAudioFileOnCD not used anymore) 2020-10-02 05:03:29 +03:00
Roman Masanin
064f2e66e1 letter 'c' is done 2020-10-02 04:59:06 +03:00
Roman Masanin
e5a48faf89 merged from upstream 2020-10-02 04:03:17 +03:00
Roman Masanin
63e5faef11 rewieved some audio functions 2020-10-02 03:55:26 +03:00
Roman Masanin
e54b540bd4 final processActiveQueues 2020-10-02 00:11:51 +03:00