a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 02:30:01 +00:00
Code Issues Projects Releases Wiki Activity
3733 commits 4 branches 2 tags 50 MiB
Commit graph

514 commits

Author SHA1 Message Date
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
Roman Masanin 311cffa901 second pass processActiveQueues 2020-10-01 23:48:35 +03:00
Roman Masanin eb0e89d3ea half done processActiveQueues 2020-10-01 23:11:20 +03:00
eray orçunus 595421da39 Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
Filip Gawin 4ec5e44b68 Mark audio code which is the same in re3 as done 2020-09-30 18:14:50 +02:00
eray orçunus f740588780 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-30 02:44:02 +03:00
eray orçunus f71953077d Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes 2020-09-30 02:41:42 +03:00
Sergeanur fae4c73ad3 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
#	src/audio/MusicManager.cpp
#	src/audio/sampman.h
#	src/audio/sampman_oal.cpp
#	src/control/CarCtrl.cpp
#	src/control/Replay.cpp
#	src/control/Script.cpp
#	src/core/Camera.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/math/Matrix.cpp
#	src/math/Matrix.h
#	src/math/Vector2D.h
#	src/peds/Ped.cpp
#	src/render/Credits.cpp
#	src/render/Hud.cpp
#	src/render/Skidmarks.cpp
#	src/weapons/Weapon.cpp
 2020-09-30 02:25:30 +03:00
Filip Gawin 855c6a3c05 Fix build (if -> ifdef) 2020-09-30 02:18:46 +03:00
Filip Gawin ff2998bee3 Make frequency more consistent with vanilla 2020-09-30 02:18:38 +03:00
Sergeanur 2129cc2906 Fix arg types 2020-09-30 02:18:11 +03:00
shfil f35fd97c76 Merge pull request #722 from theR4K/master 
fix for frequency miscalculation
 2020-09-30 02:17:14 +03:00
Filip Gawin 8424eabf22 Fix build (if -> ifdef) 2020-09-29 17:02:47 +02:00
Filip Gawin a0b6410801 Make frequency more consistent with vanilla 2020-09-29 16:56:40 +02:00
erorcun e2314c7852
Merge pull request #717 from theR4K/miami 
Helicopters not ringing, and other audio stuff
 2020-09-29 01:48:11 +03:00
Sergeanur 5144b5051c Fix arg types 2020-09-28 21:37:59 +03:00
Roman Masanin a5269b998b reverse compare 2020-09-28 21:11:24 +03:00
Roman Masanin c317d3d9b1 tiny style fix 2020-09-28 21:09:06 +03:00
Roman Masanin 7576b003c6 change for better understanding 2020-09-28 20:48:28 +03:00
Roman Masanin 1ea89f5aed Merge remote-tracking branch 'upstream/master' 2020-09-28 03:40:58 +03:00
Roman Masanin 37e382c758 fix for frequency misscalculation 2020-09-28 03:29:45 +03:00
eray orçunus 70aac0f460 Fixes: PS2/PS2-like menu, Hud, new sliding text found 2020-09-27 19:22:21 +03:00
Roman Masanin b956be0f44 another clamp 2020-09-27 04:22:59 +03:00
Roman Masanin f67275be13 correction of defects and another two audio functions 2020-09-27 03:35:15 +03:00
Sergeanur 4cfc61da14 Use enums in aVehicleSettings 2020-09-27 02:26:35 +03:00
Roman Masanin c403df0861 processEngineDamage 2020-09-27 02:03:36 +03:00
Roman Masanin bb2e601e13 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-26 21:38:37 +03:00
Roman Masanin 4c220b1f95 return bridge, crane and fix structures in fluff.h 2020-09-26 21:07:51 +03:00
Roman Masanin 356c50ec1e mark completed functions in audioManager.h 2020-09-26 20:50:51 +03:00
Roman Masanin c61160fee3 small fixes and cleanup 2020-09-26 20:24:25 +03:00
Roman Masanin 1bd497effc complete cleanup heli and flatTyre 2020-09-26 14:32:14 +03:00
Roman Masanin e256eaf014 cleanup carHeli 2020-09-26 05:41:10 +03:00
Roman Masanin a75ddd0d0c processVehicleOneShots for heli, and heli blade fix 2020-09-26 04:10:00 +03:00