Commit graph

463 commits

Author SHA1 Message Date
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
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
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
Roman Masanin
c3cbf4353d Fix build and use enum in ProcessPlayerMood 2020-10-26 14:02:11 +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
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
a520243563 cAudioManager::ProcessFrontEnd done 2020-10-25 12:00:57 +02:00
Sergeanur
93b318cfdf DMAudio fixes 2020-10-25 09:42:24 +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
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
ee61f19253 Police Radio + fixes 2020-10-22 12:38:09 +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
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