summaryrefslogtreecommitdiffstats
path: root/src/audio (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixSergeanur2021-06-301-1/+3
* Pause radio when game is pausedSergeanur2021-06-301-1/+16
* Fix unused codeSergeanur2021-06-301-1/+3
* Sanitizer fixeserorcun2021-06-301-6/+6
* Fix MP3 finding stack crasherorcun2021-06-281-94/+46
* rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-285-23/+23
* Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-3/+6
* Remove waiting for stream closure in multi-thread audioerorcun2021-06-272-20/+22
* Multi-threaded audio fixeserorcun2021-06-263-113/+105
* Multi-threaded audio streamserorcun2021-06-263-116/+591
* High FPS FixesSergeanur2021-06-243-2/+20
* Don't restart OAL device when switching EAXSergeanur2021-06-243-169/+174
* Make sampman stream functions default to stream 0 + type fixesSergeanur2021-06-245-78/+78
* Small fixSergeanur2021-06-241-1/+1
* Fix use of enum in ped comment banks switchSergeanur2021-06-241-5/+5
* forgotSergeanur2021-06-241-0/+2
* Add macros to set sample loop offsetsSergeanur2021-06-245-190/+115
* Fix cAudioManager::ProcessCarHeliSergeanur2021-06-241-6/+13
* Fix bullet trace sound offsetSergeanur2021-06-241-6/+7
* Increase the number of audio channels to PS2 count and some small audio fixesSergeanur2021-06-249-117/+144
* Fix MAX_DIGITAL_MIXER_CHANNELSSergeanur2021-06-241-1/+1
* Use bool8 in audio codeSergeanur2021-06-2413-1379/+1378
* Pool fixes + peds not forming circle fixerorcun2021-06-242-8/+8
* Fix quiet police scanner on OpenALSergeanur2021-05-172-1/+19
* Fix oneshot audio crashSergeanur2021-05-171-0/+2
* Fixes to sfx namesSergeanur2021-05-162-6/+6
* Complete sfx enum, rename some sounds + fixes of missing ped commentsSergeanur2021-05-123-1356/+10739
* fixSergeanur2021-05-101-1/+1
* Uhh, rightSergeanur2021-02-262-2/+2
* PoliceRadio -> PolRadio (original name)Sergeanur2021-02-262-0/+0
* Fix Radio Off text moreerorcun2021-02-211-11/+11
* Fix split second Radio Off texterorcun2021-02-191-0/+4
* Fix MP3 playererorcun2021-02-192-188/+175
* Fix fuzzy #ifdeferorcun2021-02-171-1/+5
* Show Radio Off on interiors that don't want radioerorcun2021-02-171-7/+11
* Try to fix streams stop after a while 2erorcun2021-02-151-1/+1
* (Test) Try to fix streams stop after a whileerorcun2021-02-142-4/+9
* Add english strings to translations as stubs, also translation noticeSergeanur2021-02-121-1/+1
* Fix crash when falling from bike while shootingSergeanur2021-02-111-0/+2
* MP3 player fixeserorcun2021-02-031-1/+18
* OAL Loops, fixeserorcun2021-02-025-65/+142
* Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off texterorcun2021-02-015-244/+320
* Fix some UBserorcun2021-01-282-2/+5
* make building with Codewarrior 7 possiblewithmorten2021-01-247-9/+10
* Includes overhaul, fix some compiler warningserorcun2021-01-236-26/+21
* get rid of most --MIAMI commentswithmorten2021-01-221-2/+0
* m_nWantedLevel -> GetWantedLevel()withmorten2021-01-222-5/+5
* Port debug messagess for audio cacheFilip Gawin2021-01-161-5/+12
* Fix Jumbo Sound reseting when walkingSergeanur2021-01-151-0/+1
* Revert extra checks before autolinkingFilip Gawin2021-01-141-2/+0
* RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINKFilip Gawin2021-01-143-3/+3
* More checks before autolinkingFilip Gawin2021-01-142-1/+3
* Backport fix from re3Filip Gawin2021-01-141-1/+1
* Fix gOneShotColSergeanur2021-01-071-1/+3
* Add MPG123_QUIET to mp3 filesSergeanur2021-01-071-1/+1
* Make opus available alongside other formatsSergeanur2021-01-073-75/+75
* Fix 16KHz trackSergeanur2021-01-071-1/+1
* Cleanup and fixes for new decodersSergeanur2021-01-061-118/+149
* Fixes for CVbFileFilip Gawin2021-01-061-4/+4
* Small fixes for new wav decoderFilip Gawin2021-01-061-3/+3
* Implementing our own WAV decoder to replace SndFileSergeanur2021-01-061-28/+329
* Add support of PS2 audio streams to OpenALSergeanur2021-01-053-11/+255
* Fix chainsaw soundSergeanur2021-01-051-2/+2
* Audio fixesSergeanur2021-01-043-104/+109
* Fix uninitialized filed in cAudioManagerSergeanur2021-01-041-0/+1
* Increase number of stream buffers, plus ALStreamSources fixSergeanur2021-01-042-22/+22
* Handle stereo panning in OAL manually for streamsSergeanur2021-01-043-70/+195
* Double the volume for mission audio in OAL + small fixSergeanur2021-01-041-5/+6
* Fix typo in ProcessMissionAudioSlot.TheOfficialFloW2021-01-031-2/+2
* Fix speed of soundSergeanur2021-01-032-3/+6
* Fix nFramesForPretendPlaying.TheOfficialFloW2021-01-031-1/+1
* Fix ServiceTrackSergeanur2021-01-021-0/+1
* Fix uninitialized RadioStaticCounterSergeanur2021-01-021-1/+1
* Fix wrong sound when bumping pedsSergeanur2021-01-011-2/+2
* Fix drive-by machine gun soundSergeanur2020-12-271-2/+39
* cPedParams ctorSergeanur2020-12-261-1/+8
* Fix weapon pickup soundSergeanur2020-12-261-0/+2
* cVehicleParams ctorSergeanur2020-12-251-2/+13
* cAudioManager::ProcessBoatEngineSergeanur2020-12-251-105/+117
* cPedParams fixesSergeanur2020-12-251-22/+13
* cAudioManager::ProcessOneShotScriptObjectSergeanur2020-12-252-78/+86
* Fix cAudioManager::ProcessPedOneShots crashSergeanur2020-12-251-1/+1
* Merge pull request #895 from ShFil119/miami_audioshfil2020-12-254-244/+314
|\
| * More audio enumsFilip Gawin2020-12-251-17/+17
| * fixesFilip Gawin2020-12-252-72/+69
| * More audioFilip Gawin2020-12-224-228/+301
* | Fix cMusicManager::SetRadioChannelByScriptSergeanur2020-12-251-4/+4
* | cMusicManager::ServiceGameMode fixSergeanur2020-12-251-1/+1
* | More type fixSergeanur2020-12-251-2/+2
* | Small audio code fixSergeanur2020-12-251-19/+3
* | Small type use fixesSergeanur2020-12-254-14/+14
* | Fix chainsaw sounds lolSergeanur2020-12-251-6/+2
|/
* fixesNikolay Korolev2020-12-191-1/+1
* merge attemptNikolay Korolev2020-12-196-13/+34
|\
| * Merge pull request #871 from withmorten/sized-enumserorcun2020-12-094-7/+7
| |\
| | * int32 enum fixedwithmorten2020-12-071-1/+1
| | * uint32 enums fixedwithmorten2020-12-071-1/+1
| | * uint16 enums fixedwithmorten2020-12-071-2/+2
| | * int8 enums fixedwithmorten2020-12-071-1/+1
| | * uint8 enums fixedwithmorten2020-12-071-2/+2
| * | audio: define openal extensions in re3 owned namespaceAnonymous Maarten2020-12-072-0/+18
| * | crossplatform is needed for casepath on non-Windows systemsAnonymous Maarten2020-12-061-2/+4
| |/
| * GTA_VERSION define and some config.h cleanupaap2020-11-291-8/+8
| * More audio fixSergeanur2020-11-221-27/+27
| * Audio fixesSergeanur2020-11-223-215/+40
| * Merge pull request #797 from theR4K/masterSergeanur2020-11-152-219/+229
| |\
| | * easy way to safe few petasecondsRoman Masanin2020-11-081-0/+8
| | * return bad code, becouse no one knows what to do with itRoman Masanin2020-11-081-2/+2
| | * pointers to referencies tooRoman Masanin2020-11-082-218/+218
| | * Merge branch 'master' of https://github.com/GTAmodding/re3Roman Masanin2020-11-082-399/+399
| | |\
| | * | some "optimizations". same like I did in VCRoman Masanin2020-11-011-3/+5
| * | | Revert "Font: Fix text dimensions"erorcun2020-11-081-1/+1
| | |/ | |/|
| * | Fix cAudioManager::GetPhraseSergeanur2020-11-072-399/+399
| |/
| * OpenAL channels now use their own sound buffersSergeanur2020-10-274-179/+96
| * Revert "(TEST) Try to fix OAL audio problems"erorcun2020-10-261-2/+2
| * Fixes to OpenALSergeanur2020-10-261-6/+19
| * (TEST) Try to fix OAL audio problemserorcun2020-10-261-2/+2
| * Font: Fix text dimensionserorcun2020-10-251-1/+1
| * Remove redundant includesSergeanur2020-10-251-2/+0
| * Possible fix of linux buildSergeanur2020-10-251-1/+0
| * DMAudio fixesSergeanur2020-10-252-31/+2
| * Fix playback of vanilla opusSergeanur2020-10-241-1/+1
| * Fix argument typeSergeanur2020-10-222-2/+2
| * Police Radio fixesSergeanur2020-10-223-11/+11
| * Fix builderorcun2020-10-181-3/+2
| * Fixes and style changes from miamierorcun2020-10-186-81/+707
* | uint8 enums fixedwithmorten2020-12-072-3/+3
* | int8 enums fixedwithmorten2020-12-071-1/+1
* | uint16 enums fixedwithmorten2020-12-071-2/+2
* | uint32 enums fixedwithmorten2020-12-071-1/+1
* | int32 enum fixedwithmorten2020-12-071-1/+1
* | cAudioManager::ProcessPedOneShots + fixesSergeanur2020-12-014-311/+599
* | fixed top gearNikolay Korolev2020-11-111-14/+13
* | to make Serge and _R4K_ happyRoman Masanin2020-11-081-0/+18
* | marked stupied code(dotProduct and AudioEvents)Roman Masanin2020-11-081-1/+16
* | returned bad code, becouse no one knows what to do with itRoman Masanin2020-11-081-3/+3
* | pointers into referencies!Roman Masanin2020-11-082-338/+338
* | fix for merge fixRoman Masanin2020-11-082-4/+4
* | fix mergeRoman Masanin2020-11-081-2/+2
* | merge upstreamRoman Masanin2020-11-084-381/+3172
|\ \
| * | Pickups fixSergeanur2020-11-081-1/+4
| * | Ped comments fixesSergeanur2020-11-073-1486/+1394
| * | Sfx audio logicFilip Gawin2020-11-064-373/+3253
* | | FORMATRoman Masanin2020-11-041-15/+15
* | | fix serviceSoundEffects an cleanupRoman Masanin2020-11-022-13/+2
* | | mark codeRoman Masanin2020-11-011-2/+2
* | | changes in switch, and mark codeRoman Masanin2020-11-011-2/+5
* | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDevRoman Masanin2020-11-014-167/+205
|\| |
| * | Add VB file listSergeanur2020-10-301-1/+109
| * | OpenAL channels now use their own sound buffersSergeanur2020-10-284-166/+96
* | | Fix build and use enum in ProcessPlayerMoodRoman Masanin2020-10-262-21/+17
* | | fix mergeRoman Masanin2020-10-251-1/+1
* | | merge upstreamRoman Masanin2020-10-256-120/+166
|\| |
| * | Finalize frontend sounds, player setup screenerorcun2020-10-253-13/+10
| * | Remove redundant includesSergeanur2020-10-251-3/+0
| * | cAudioManager::ProcessFrontEnd doneSergeanur2020-10-252-95/+147
| * | DMAudio fixesSergeanur2020-10-254-12/+12
* | | cleanup processVehicleOneShots, processVehicleX doneRoman Masanin2020-10-251-3/+3
* | | processVehicleOneShotsRoman Masanin2020-10-253-60/+181
* | | skidingRoman Masanin2020-10-252-20/+49
* | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDevRoman Masanin2020-10-241-1/+1
|\| |
| * | Fix playback of vanilla opusSergeanur2020-10-241-1/+1
* | | mark reflections doneRoman Masanin2020-10-242-5/+3
* | | fix merging errorsRoman Masanin2020-10-243-12/+13
* | | jumboRoman Masanin2020-10-242-41/+35
* | | firesRoman Masanin2020-10-242-7/+31
* | | model heliRoman Masanin2020-10-242-18/+67
* | | merge UpstreamRoman Masanin2020-10-2411-853/+1406
|\| |
| * | more ScriptSoundsSergeanur2020-10-231-1/+1
| * | ScriptSoundsSergeanur2020-10-233-117/+58
| * | Fix argument typeSergeanur2020-10-222-2/+2
| * | Police Radio + fixesSergeanur2020-10-225-281/+296
| * | EmergencyPed, PedDebug, message fixerorcun2020-10-211-1/+1
| * | Merge branch 'master' into miamiSergeanur2020-10-181-9/+21
| |\|
| | * Merge branch 'master' of github.com:GTAmodding/re3 into masterFilip Gawin2020-10-181-8/+20
| | |\
| | | * ProcessWaterCannon bug and refractoring (#773)Roman Masanin2020-10-171-8/+20
| | * | Add missing breaks in AudioLogic.cppFilip Gawin2020-10-181-52/+23
| | |/
| * | Update sampman_miles.cpperorcun2020-10-121-1/+1
| * | Merge branch 'miami' of https://github.com/GTAmodding/re3 into neweray orçunus2020-10-121-0/+1
| |\ \
| * | | SampleManagereray orçunus2020-10-126-458/+1050
* | | | pedsRoman Masanin2020-10-182-20/+70
* | | | fix bugsRoman Masanin2020-10-171-11/+23
* | | | model cars and other audio stuffRoman Masanin2020-10-172-101/+181
* | | | road noiseRoman Masanin2020-10-172-72/+102
* | | | siren and hornRoman Masanin2020-10-163-101/+120
* | | | sirenes and more marks for audio. also fix cAudioMrg sizeRoman Masanin2020-10-124-35/+21
* | | | mark some audio stuff and fix frameCounterRoman Masanin2020-10-123-52/+36
| |/ / |/| |
* | | Merge branch 'master' into VC/TextFinishSergeanur2020-10-111-0/+1
|\ \ \ | |/ / |/| / | |/
| * Some unicode funcs belong to Font.cpp + small fixSergeanur2020-10-111-0/+1
| * Fix Linux audio patheray orçunus2020-10-051-2/+3
| * Fix Audioeray orçunus2020-10-052-9/+9
| * Fixes, mouse AUX buttons, joystick detect menueray orçunus2020-09-301-1/+1
* | Merge pull request #748 from theR4K/miamiUpstreamerorcun2020-10-082-63/+62
|\ \
| * | fix mistakesRoman Masanin2020-10-051-1/+1
| * | some audio and part of CExplosionRoman Masanin2020-10-052-63/+62
* | | Fix Audioeray orçunus2020-10-053-12/+12
* | | Fix Linux audio patheray orçunus2020-10-051-2/+3
|/ /
* | Merge pull request #737 from theR4K/miamiDevshfil2020-10-024-118/+134
|\ \
| * | revert some changes and little fixRoman Masanin2020-10-023-14/+9
| * | fix build(bcs func CheckForAnAudioFileOnCD not used anymore)Roman Masanin2020-10-021-1/+1
| * | letter 'c' is doneRoman Masanin2020-10-022-23/+29
| * | merged from upstreamRoman Masanin2020-10-022-37/+33
| |\ \
| * | | rewieved some audio functionsRoman Masanin2020-10-024-15/+11
| * | | final processActiveQueuesRoman Masanin2020-10-011-67/+62
| * | | second pass processActiveQueuesRoman Masanin2020-10-011-61/+52
| * | | half done processActiveQueuesRoman Masanin2020-10-012-96/+129
* | | | Merge pull request #731 from erorcun/miamierorcun2020-10-021-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-09-304-10/+14
| |\| |
| * | | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-301-1/+1
* | | | Mark audio code which is the same in re3 as doneFilip Gawin2020-09-302-39/+35
| |/ / |/| |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-09-301-5/+5
|\ \ \ | | |/ | |/|
| * | Fix build (if -> ifdef)Filip Gawin2020-09-291-1/+1
| * | Make frequency more consistent with vanillaFilip Gawin2020-09-291-1/+5
| * | Fix arg typesSergeanur2020-09-282-4/+4
| * | change for better understandingRoman Masanin2020-09-281-1/+1
| * | Merge remote-tracking branch 'upstream/master'Roman Masanin2020-09-2811-553/+551
| |\ \
| | * | Fixes: PS2/PS2-like menu, Hud, new sliding text founderay orçunus2020-09-271-1/+1
| | * | Fixes to MusicManagerSergeanur2020-09-192-34/+32
| | * | Renaming audio enum entries to something more like originalSergeanur2020-09-1910-518/+518
| * | | fix for frequency misscalculationRoman Masanin2020-09-281-1/+1
| |/ /
| * | Fixes from miamieray orçunus2020-09-101-1/+1
* | | Fix build (if -> ifdef)Filip Gawin2020-09-301-1/+1
* | | Make frequency more consistent with vanillaFilip Gawin2020-09-301-1/+5
* | | Fix arg typesSergeanur2020-09-302-4/+4
* | | Merge pull request #722 from theR4K/mastershfil2020-09-301-1/+1
| |/ |/|
* | Merge pull request #717 from theR4K/miamierorcun2020-09-292-154/+668
|\ \
| * | reverse compareRoman Masanin2020-09-281-3/+3
| * | tiny style fixRoman Masanin2020-09-281-13/+11
| * | another clampRoman Masanin2020-09-271-6/+6
| * | correction of defects and another two audio functionsRoman Masanin2020-09-272-49/+66
| * | processEngineDamageRoman Masanin2020-09-272-17/+18
| * | Merge remote-tracking branch 'upstream/miami' into miamiRoman Masanin2020-09-262-49/+44
| |\ \
| * | | return bridge, crane and fix structures in fluff.hRoman Masanin2020-09-261-2/+16
| * | | mark completed functions in audioManager.hRoman Masanin2020-09-261-25/+25
| * | | small fixes and cleanupRoman Masanin2020-09-261-51/+45
| * | | complete cleanup heli and flatTyreRoman Masanin2020-09-262-232/+154
| * | | cleanup carHeliRoman Masanin2020-09-261-143/+92
| * | | processVehicleOneShots for heli, and heli blade fixRoman Masanin2020-09-261-1/+22
| * | | flat tyre and minimal refractoringRoman Masanin2020-09-252-50/+138
| * | | safe before clean upRoman Masanin2020-09-251-171/+176
| * | | fix deaddodoRoman Masanin2020-09-251-9/+8
| * | | remove anther gotoRoman Masanin2020-09-251-99/+105
| * | | removed some gotoRoman Masanin2020-09-251-305/+304
| * | | processCarHeli half doneRoman Masanin2020-09-252-14/+394
| * | | ProcessEscalators + some fixesRoman Masanin2020-09-221-7/+53
| * | | rewisited:Roman Masanin2020-09-222-42/+117
* | | | Use enums in aVehicleSettingsSergeanur2020-09-271-122/+128
| |/ / |/| |
* | | Merge pull request #706 from theR4K/miamiSergeanur2020-09-218-708/+1041
|\| |
| * | fix enum edditing effects for oal target and small improvementsRoman Masanin2020-09-213-27/+28
| * | cleanup processVehicleEngine and some fixesRoman Masanin2020-09-212-210/+57
| * | some style and bug fixes, updated sfx enum, and implemented processVehicleEngineRoman Masanin2020-09-218-297/+541
| * | just more cleanup...Roman Masanin2020-09-182-55/+52
| * | cleanup processVehicleRoman Masanin2020-09-182-15/+7
| * | cleanup processPlayerVehicleEngineRoman Masanin2020-09-181-74/+46
| * | fix conditions for processPlayerVehicleEngineRoman Masanin2020-09-181-8/+7
| * | revisit processVehicleRoman Masanin2020-09-152-124/+141
| * | finish work on ProcessPlayerVehicleEngine and cleanupRoman Masanin2020-09-142-248/+349
| * | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiRoman Masanin2020-09-1313-715/+1355
| |\ \
| * | | vehicle audio(first part) and temp fix for openALRoman Masanin2020-09-132-110/+273
* | | | Fix build (renamed var name in definiton file)shfil2020-09-191-2/+2
* | | | Fixes to MusicManagerSergeanur2020-09-191-47/+42
| |/ / |/| |
* | | Add missing fileSergeanur2020-09-101-1/+1
* | | Fix getter typesSergeanur2020-09-091-2/+2
* | | player mood enumSergeanur2020-09-093-5/+14
* | | cMusicManager, cDMAudio, radio position save/load, a few commands implementedSergeanur2020-09-0913-712/+1343
|/ /
* | CGame done, Peds, fixeseray orçunus2020-08-301-1/+1
* | Merge branch 'master' into miamiSergeanur2020-08-243-2/+15
|\|
| * Fix cAudioScriptObjectSergeanur2020-08-203-2/+15
| * changed a sound enumaap2020-08-202-57/+57
* | fixed sound enumaap2020-08-201-3/+3
* | Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-142-2/+2
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-101-3/+3
|\|
| * clang throws an error if fixed comparisons are against NULLblingu2020-08-051-3/+3
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-071-6/+1
|\|
| * Update mpg123.32Sergeanur2020-08-031-6/+1
* | Merge branch 'master' into miamiSergeanur2020-08-026-7/+2201
|\|
| * Move sdk and eaxSergeanur2020-08-023-0/+2007
| * Merge pull request #587 from Sergeanur/opusSergeanur2020-07-293-7/+194
| |\
| | * fixesSergeanur2020-05-241-2/+2
| | * Merge branch 'master' into opusSergeanur2020-05-243-85/+70
| | |\
| | * \ Merge branch 'master' into opusSergeanur2020-05-243-6/+10
| | |\ \
| | * | | CleanupSergeanur2020-05-231-31/+17
| | * | | Merge branch 'master' into opusSergeanur2020-05-239-327/+329
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into opusSergeanur2020-05-223-5/+13
| | |\ \ \ \
| | * | | | | opus supportSergeanur2020-05-223-5/+206
| * | | | | | Fix casepath chaoseray orçunus2020-07-281-8/+4
| * | | | | | Provide more memory for casepath's argFilip Gawin2020-07-261-1/+1
| * | | | | | Add ps2 audio pathsSergeanur2020-07-231-0/+98
| * | | | | | 64-bit on Windowseray orçunus2020-07-222-2/+10
* | | | | | | Fix casepath chaoseray orçunus2020-07-281-8/+4
* | | | | | | 64-bit on Windowseray orçunus2020-07-242-2/+10
* | | | | | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-221-7/+7
|\| | | | | |
| * | | | | | Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcherSergeanur2020-07-221-1/+1
| * | | | | | Fix another floatSergeanur2020-07-181-1/+1
| * | | | | | Fix some audio floatsSergeanur2020-07-181-6/+6
* | | | | | | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-221-1/+1
* | | | | | | Fix OneShotPriority overflowSergeanur2020-07-181-5/+5
* | | | | | | Merge branch 'master' into miamiSergeanur2020-07-172-2/+28
|\| | | | | |
| * | | | | | Add audio cache for faster initializationSergeanur2020-07-172-2/+28
* | | | | | | Merge branch 'master' into miamiSergeanur2020-07-162-44/+41
|\| | | | | |
| * | | | | | Audio fixesSergeanur2020-07-162-44/+41
* | | | | | | VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-092-5/+9
* | | | | | | Noskillx's PR + fix .set loadingeray orçunus2020-07-062-11/+58
* | | | | | | Peds & fixeseray orçunus2020-07-041-1/+1
* | | | | | | Merge branch 'master' into miamiSergeanur2020-06-303-24/+18
|\| | | | | |
| * | | | | | Audio fixesSergeanur2020-06-303-24/+18
* | | | | | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-295-8/+21
|\| | | | | |
| * | | | | | menu fixesFire-Head2020-06-291-2/+2
| * | | | | | Update AudioLogic.cppFire_Head2020-06-291-3/+3
| * | | | | | Merge branch 'master' into ps2menuFire_Head2020-06-2924-9938/+10013
| |\ \ \ \ \ \
| | * | | | | | remove numbers from enumSergeanur2020-06-081-14/+14
| | * | | | | | IsMissionAudioSamplePlaying (from VC)Sergeanur2020-06-085-10/+10
| * | | | | | | mips overdoseFire-Head2020-06-275-8/+21
* | | | | | | | Ped, Weapon and fixeseray orçunus2020-06-172-25/+25
* | | | | | | | fixesSergeanur2020-06-081-2/+2
* | | | | | | | miamification of some audio structsSergeanur2020-06-084-19/+55
* | | | | | | | Mission audio slotsSergeanur2020-06-087-150/+247
* | | | | | | | more fontSergeanur2020-06-071-1/+1
* | | | | | | | Merge branch 'master' into miamiSergeanur2020-06-064-42/+190
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | ps2 audio banksSergeanur2020-06-064-162/+402
| * | | | | | | ProcessTrainAnnouncementsSergeanur2020-06-052-5/+5
| * | | | | | | fixes, mostly from miamieray orçunus2020-06-043-39/+38
* | | | | | | | Peds, eSound and PedState enum, fixeseray orçunus2020-06-033-77/+116
* | | | | | | | fixNikolay Korolev2020-05-311-1/+1
* | | | | | | | fixNikolay Korolev2020-05-311-1/+1
* | | | | | | | dumbNikolay Korolev2020-05-312-2/+2
* | | | | | | | game logicNikolay Korolev2020-05-314-11/+20
* | | | | | | | Merge branch 'master' into miamiSergeanur2020-05-271-2/+2
|\| | | | | | |
| * | | | | | | Fix city sound playing on restarting a new gameSergeanur2020-05-271-2/+2
| * | | | | | | Restore original logicSergeanur2020-05-271-2/+2
* | | | | | | | OpenAL supportSergeanur2020-05-272-7/+57
* | | | | | | | Support of original mp3/wav/adfSergeanur2020-05-276-484/+2914
* | | | | | | | Very basic compatibility with original sfx.raw/sdtSergeanur2020-05-264-4168/+605
* | | | | | | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-267-751/+674
|\| | | | | | |
| * | | | | | | eSurfaceTypeaap2020-05-262-65/+65
| * | | | | | | Even more audio cleanupsSergeanur2020-05-251-107/+104
| * | | | | | | Ped comments cleanupSergeanur2020-05-251-43/+53
| * | | | | | | More audio cleanup and bugfixesSergeanur2020-05-251-55/+44
| * | | | | | | Fix names of static variablesSergeanur2020-05-251-19/+19
| * | | | | | | cAudioManager::ProcessPlayersVehicleEngine cleanup and fixesSergeanur2020-05-251-149/+108
| * | | | | | | Clean cAudioManager::ProcessGarages up a bitSergeanur2020-05-241-89/+79
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Optimize ALDeviceListSergeanur2020-05-243-85/+70
| | |_|_|_|/ | |/| | | |
| * | | | | Fix OAL crashSergeanur2020-05-243-6/+10
| | |_|_|/ | |/| | |
| * | | | Even more small audio cleanupSergeanur2020-05-232-5/+5
| * | | | More audio cleanupSergeanur2020-05-232-315/+319
* | | | | eSurfaceTypeaap2020-05-262-65/+65
* | | | | Merge branch 'master' into miamiSergeanur2020-05-238-13/+11
|\| | | |
| * | | | Fix linux builderay orçunus2020-05-221-3/+2
| * | | | Possibly fix travisSergeanur2020-05-221-2/+3
| * | | | OpenAL configsSergeanur2020-05-226-9/+7
| | |_|/ | |/| |
| * | | fixed dumbNikolay Korolev2020-05-202-4/+4
| * | | fixed ped commentNikolay Korolev2020-05-202-0/+8
* | | | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-231-4/+4
* | | | Pickup and audio fixeray orçunus2020-05-203-2/+10
* | | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-206-77/+440
|\| | |
| * | | Fix string assignment (aldlist.cpp)shfil2020-05-181-1/+1
| | |/ | |/|
| * | Remove MAX_VOLUME dupsSergeanur2020-05-184-76/+71
| * | Merge pull request #556 from Fire-Head/masteraap2020-05-181-0/+368
| |\|
| | * nullsampmanFire-Head2020-05-171-0/+368
* | | Fix compilation errorsSergeanur2020-05-162-2598/+187
* | | Merge branch 'master' into miamiSergeanur2020-05-165-9422/+9358
|\| |
| * | More small audio fixesSergeanur2020-05-162-14/+13
| * | Move sound processors to AudioLogic.cpp, plus small fixesSergeanur2020-05-165-9330/+9358
* | | Merge branch 'master' into miamiSergeanur2020-05-161-2/+2
|\| |
| * | Fix audio use of number instead of enum for CAR_ACCELSergeanur2020-05-161-2/+2
* | | Merge branch 'master' into miamiSergeanur2020-05-165-429/+299
|\| |
| * | Remove unused audio enumSergeanur2020-05-165-429/+299
| |/
* | Merge branch 'master' into miamiSergeanur2020-05-142-0/+8
|\|
| * it works differentlyNikolay Korolev2020-05-142-6/+6
| * some fixesNikolay Korolev2020-05-142-0/+8
* | Merge branch 'master' into miamiSergeanur2020-05-122-4/+4
|\|
| * Fix linux warningsFilip Gawin2020-05-122-4/+4
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-125-17/+49
|\|
| * Linux build supporteray orçunus2020-05-115-17/+49
* | Merge branch 'master' into miamiSergeanur2020-05-1123-2119/+3339
|\|
| * Merge pull request #509 from Fire-Head/mastererorcun2020-05-1119-2106/+3327
| |\
| | * oal updateFire-Head2020-05-071-27/+32
| | * oal wav/mp3 stream updateFire-Head2020-05-075-107/+592
| | * bb std::stringFire-Head2020-05-041-5/+5
| | * fix typoFire-Head2020-05-041-1/+1
| | * openal-soft addedFire-Head2020-05-042-62/+55
| | * oal updFire-Head2020-05-0419-2106/+2844
| * | Fixed typos and made all assert functions optionalbigbossbro082020-05-105-21/+12
| * | defined out asserts.bigbossbro082020-05-102-1/+9
* | | peds starting to workaap2020-05-091-15/+24
* | | Merge branch 'master' into miamiSergeanur2020-05-071-8/+8
|\| |
| * | Fix looping collision soundSergeanur2020-05-071-8/+8
* | | Merge branch 'master' into miamiSergeanur2020-05-073-89/+108
|\| |
| * | Fix GetDistanceSquaredSergeanur2020-05-073-30/+32
| * | Fixed arguments for sound collisionsSergeanur2020-05-073-59/+76
| * | dont hardcode first vehicle ID; little fix for roadblocksaap2020-05-071-1/+1
* | | VC vehicles just barely working nowaap2020-05-073-63/+146
* | | Merge branch 'master' into miamiSergeanur2020-05-061-5/+3
|\| |
| * | Fix cAudioManager::ProcessActiveQueues loopSergeanur2020-05-061-5/+3
| * | some work on zonesaap2020-05-061-2/+2
* | | fix memory corruptionNikolay Korolev2020-05-061-0/+2
* | | new zone stuffaap2020-05-061-2/+2
|/ /
* | Merge pull request #512 from Nick007J/masterSergeanur2020-05-051-2/+2
|\ \
| * | CAutoPilot + CCarAI + fixesNikolay Korolev2020-05-051-2/+2
* | | More use of GetModelIndexSergeanur2020-05-053-14/+14
|/ /
* | Adding sound intensity constsSergeanur2020-05-021-154/+203
* | Cleanup cAudioManager::ProcessVehicleSkiddingSergeanur2020-05-021-37/+23
* | A bit more audio cleanupSergeanur2020-05-023-118/+88
* | cleanup cAudioManager::UpdateReflectionsSergeanur2020-05-021-44/+31
* | AudioManager.cpp autoformatSergeanur2020-05-021-2493/+2334
* | Replacing >> and << to / and * in AudioManagerSergeanur2020-05-021-51/+45
* | SetPosition, part 1Sergeanur2020-05-022-2/+2
* | Adding getters and setters for type and statusSergeanur2020-04-302-11/+11
* | Changing prefixes for some audio fieldsSergeanur2020-04-288-905/+907
|/
* Fix tVehicleSampleData structSergeanur2020-04-271-75/+73
* Audio structs moved to their AudioManager.hSergeanur2020-04-271-3/+22
* Fix use of integers instead of enum/bool/nilSergeanur2020-04-271-120/+109
* Audio fixesSergeanur2020-04-271-234/+60
* fix #ifdefFire-Head2020-04-231-1/+1
* ps2 particles, sampman oal startedFire-Head2020-04-238-2595/+4359
* Try to build with mingwFilip Gawin2020-04-205-85/+104
* Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-1/+1
* bug fixesNikolay Korolev2020-04-181-0/+6
* Revert "Part one"Filip Gawin2020-04-183-71/+51
* Fix crash in cAudioManager::ServicePoliceRadioFilip Gawin2020-04-181-4/+8
* Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-181-37/+0
|\
| * Remove padding fieldsSergeanur2020-04-181-37/+0
* | Part oneFilip Gawin2020-04-173-51/+71
|/
* Remove patchesSergeanur2020-04-177-403/+7
* rem refsFire-Head2020-04-174-22/+22
* Some refs removed, little fixes and teleporteray orçunus2020-04-161-0/+3
* More refs removedSergeanur2020-04-162-5/+5
* Merge branch 'master' of github.com:gtamodding/re3aap2020-04-163-69/+36
|\
| * Removed refs from sampmanFire-Head2020-04-162-69/+33
| * Various fixeseray orçunus2020-04-161-0/+3
* | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-151-1/+1
|\|
| * Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-151-1/+1
| |\
| | * CWeapon done, ps2 cheats fixFire-Head2020-04-151-1/+1
* | | implemented most of librw wrapperaap2020-04-151-2/+2
|/ /
* | Added missing audio ctorsSergeanur2020-04-144-28/+65
* | Cleanup cAudioManager::ProcessRainOnVehicle a bitFilip Gawin2020-04-131-7/+3
* | Finish audio codeFilip Gawin2020-04-132-1639/+2965
* | Cleanup audio codeFilip Gawin2020-04-124-242/+270
|/
* normalized line endings to LFaap2020-04-095-1273/+1273
* Fix CI buildFilip Gawin2020-04-071-5/+5
* Cleanup audiocode and fix for ComputeDopplerEffectedFrequencyFilip Gawin2020-04-074-630/+637
* Cranes doneNikolay Korolev2020-04-062-4/+4
* fixesSergeanur2020-04-021-2/+2
* AudioScriptObject finishedSergeanur2020-04-012-127/+174
* Merge branch 'master' into garages_devNikolay Korolev2020-03-282-40/+453
|\
| * audio16 fixes for reviewFilip Gawin2020-03-281-9/+5
| * ProcessVehicleEngine and ProcessActiveQueuesFilip Gawin2020-03-282-40/+457
* | merge with masterNikolay Korolev2020-03-285-3/+7
|\|
| * Merge pull request #363 from erorcun/erorcunerorcun2020-03-285-1/+5
| |\
| | * CCopPed done and #include cleanuperay orçunus2020-03-285-1/+5
| * | WaterCannon done, resource icoFire-Head2020-03-281-2/+2
| |/
* | garage update part 2Nikolay Korolev2020-03-282-2/+2
* | garages part 1Nikolay Korolev2020-03-282-7/+7
|/
* Fix order of math operations on integers (fires)Filip Gawin2020-03-221-1/+1
* Remove all constexprFilip Gawin2020-03-224-16/+17
* fix includeFilip Gawin2020-03-221-1/+1
* Fixes for reviewFilip Gawin2020-03-221-1/+1
* Fixes for reviewFilip Gawin2020-03-224-38/+42
* Cleanup audio code + fixes for reviewFilip Gawin2020-03-223-313/+178
* Fixes for Serge's reviewFilip Gawin2020-03-221-272/+106
* Implement ProcessGarages + small cleanupFilip Gawin2020-03-224-3084/+3384
* Implement SetupJumboEngineSoundFilip Gawin2020-03-222-13/+39
* Implement ProcessFiresFilip Gawin2020-03-222-6/+78
* Implement ProcessCraneFilip Gawin2020-03-221-2/+50
* Implement ProcessCesnaFilip Gawin2020-03-222-4/+67
* GenericSave complete, still needs some testingWes Hampson2020-03-112-0/+4
* Fix police radio conditionFilip Gawin2020-02-221-1/+1
* Fixed random sound volumeSergeanur2020-02-071-1/+1
* cMusicManagerSergeanur2020-02-076-300/+1000
* Audio, use of enums and true/falseSergeanur2020-02-025-550/+551
* Removed dup hookSergeanur2020-02-011-1/+0
* audio stuffSergeanur2020-01-2510-1448/+1392
* Two audio structs renamed to their original namesSergeanur2020-01-132-10/+10
* Fixing Projectile codeSergeanur2020-01-071-2/+3
* CPlayerPed & fixeseray orçunus2019-12-281-1/+5
* CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-051-3/+3
* Fix CalculateDistanceFilip Gawin2019-12-011-3/+3
* Audio fixes for erorcun reviewFilip Gawin2019-12-012-38/+38
* Implement ProcessVehicleSirenOrAlarmFilip Gawin2019-12-012-4/+49
* Fix sound when "up" and "down" are pressed togetherFilip Gawin2019-12-011-10/+6
* Frontend, Peds & logic and overflow fixeseray orçunus2019-11-121-3/+3
* Fix max iterator value in `InitialisePoliceRadio`Filip Gawin2019-11-111-1/+1
* Merge pull request #263 from Sergeanur/strcmperorcun2019-11-092-12/+13
|\
| * Implemented faststrcmp, faststricmp, strcasecmpSergeanur2019-10-302-12/+13
* | RE cAudioManager::UpdateReflectionsFilip Gawin2019-11-052-3/+68
|/
* Some fixes for cAudioManager::SetupSuspectLastSeenReportSergeanur2019-10-291-25/+102
* Implement PreloadMissionAudio + small fixesFilip Gawin2019-10-274-48/+131
* Audio fixesSergeanur2019-10-272-48/+54
* Fix cAudioManager::AddReleasingSoundsSergeanur2019-10-271-36/+36
* ProcessFrontEnd fixesFilip Gawin2019-10-271-24/+36
* SfxEnumSergeanur2019-10-272-3899/+3913
* Audio9 (fixes)Filip Gawin2019-10-272-81/+63
* cAudioManager::TranslateEntity cleanupSergeanur2019-10-271-11/+2
* Fix hornPatternsArraySergeanur2019-10-261-1/+10
* Merge pull request #254 from Sergeanur/AudioSergeanur2019-10-267-379/+376
|\
| * A bit more enums for ChangeMusicModeSergeanur2019-10-261-2/+3
| * audio.h -> audio_enums.hSergeanur2019-10-263-2/+2
| * Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-267-377/+373
* | Fix audio bugSergeanur2019-10-261-1/+1
|/
* Fixes for aap review (audio8)Filip Gawin2019-10-262-2303/+1228
* Audio fixes from SergFilip Gawin2019-10-262-27/+41
* Fixes for nitpicksFilip Gawin2019-10-261-79/+82
* Cleanup audioFilip Gawin2019-10-262-63/+44
* Cleanup police radioFilip Gawin2019-10-262-962/+717
* More audio windowsFilip Gawin2019-10-262-50/+986
* More audio (to hook and test)Filip Gawin2019-10-262-56/+509
* More workFilip Gawin2019-10-264-147/+264
* audio7Filip Gawin2019-10-266-136/+924
* Fixed nasty warningsSergeanur2019-10-171-2/+1
* Fixed train sounds not workingSergeanur2019-10-171-7/+4
* Radio shadow fix, RAMPAGE!! message fixSergeanur2019-10-061-1/+1
* Moar pedseray orçunus2019-10-011-9/+9
* Audio fixesFilip Gawin2019-08-276-576/+70
* CleanupFilip Gawin2019-08-274-898/+1366
* More more more audioFilip Gawin2019-08-273-620/+1322
* CleanupFilip Gawin2019-08-273-527/+1251
* More audio pedFilip Gawin2019-08-273-71/+1327
* Merge branch 'master' into masterFire_Head2019-08-152-3/+2
|\
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-039-406/+2872
| |\
| * | RunningScript, part 4, plus some fixesNikolay Korolev2019-08-033-1/+7
* | | CParticleObject done, cDMAudio doneFire-Head2019-08-158-204/+705
* | | sampman cosmetic fixFire-Head2019-08-032-44/+47
| |/ |/|
* | Merge pull request #178 from Fire-Head/masteraap2019-08-029-406/+2872
|\ \ | |/ |/|
| * Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-08-022-16/+16
| |\
| * | sampman doneFire-Head2019-08-029-406/+2872
* | | implemented CPlaneaap2019-07-311-11/+8
| |/ |/|
* | Peds, mainly audioeray orçunus2019-07-281-12/+12
* | fixed bridgeNikolay Korolev2019-07-261-1/+1
* | CAutomobile::FireTruckControl and HydraulicControlaap2019-07-261-3/+3
|/
* Try to fix rpg bugFilip Gawin2019-07-211-3/+1
* Fix setting sampleIndexFilip Gawin2019-07-211-2/+2
* added CPool<cAudioScriptObject, cAudioScriptObject>Nikolay Korolev2019-07-202-0/+11
* fixes for #142Filip Gawin2019-07-194-5/+5
* More audio scriptFilip Gawin2019-07-192-45/+548
* more audio processFilip Gawin2019-07-194-103/+1125
* ProcessActiveQueuesFilip Gawin2019-07-194-121/+510
* ComputeDopplerEffectedFrequencyFilip Gawin2019-07-196-268/+1355
* started making frontend accurate to gameaap2019-07-142-6/+6
* more CWanted; added CEventListaap2019-07-122-1/+4
* added wrappers around math functionsaap2019-07-101-1/+1
* more CVehicleaap2019-07-092-2/+2
* more CAutomobileaap2019-07-081-1/+1
* Fix reverse warn and air brakesFilip Gawin2019-07-072-11/+165
* cAudioManager::InitialiseFilip Gawin2019-07-076-6/+167
* cleanup AudioManagerFilip Gawin2019-07-071-7/+3
* some work on vehiclesaap2019-07-061-7/+80
* More AudioManagerFilip Gawin2019-07-044-972/+1006
* RandomDisplacementFilip Gawin2019-07-042-0/+21
* RequireDigitalHandleFilip Gawin2019-07-044-5/+30
* ReleaseDigitalHandleFilip Gawin2019-07-044-45/+65
* PlayerJustGotInCarFilip Gawin2019-07-042-2/+12
* CreateEntityFilip Gawin2019-07-042-7/+33
* Introduce totalAudioEntitiesFilip Gawin2019-07-041-4/+8
* SetEntityStatusFilip Gawin2019-07-042-0/+10
* PreTerminateGameSpecificShutdownFilip Gawin2019-07-042-0/+35
* DestroyEntityFilip Gawin2019-07-042-0/+20
* PostTerminateGameSpecificShutdownFilip Gawin2019-07-042-2/+10
* SetDynamicAcousticModelingStatusFilip Gawin2019-07-042-3/+9
* IsAudioInitialisedFilip Gawin2019-07-042-0/+9
* GenerateIntegerRandomNumberTableFilip Gawin2019-07-042-0/+9
* Script stuff + bug fixesNikolay Korolev2019-07-042-0/+2
* Update Frontend._AG2019-07-032-3/+14
* Revert "Implemented frontend inputs."aap2019-07-022-14/+3
* Implemented frontend inputs._AG2019-07-022-3/+14
* Implement GetSpecialCharacterTalkSfxFilip Gawin2019-06-302-8/+212
* Merge pull request #78 from ShFil119/cleanupaap2019-06-301-2/+2
|\
| * Cleanup project a bitFilip Gawin2019-06-301-2/+2
* | PlayBackThisFrameInterpolation and all it required...Nikolay Korolev2019-06-302-1/+2
|/
* Implement the rest of GetXTalkSfxFilip Gawin2019-06-292-265/+2238
* Implement some GetXTalkSfx methodsFilip Gawin2019-06-294-220/+609
* fixes for AudioManager::GetPhraseFilip Gawin2019-06-293-15/+267
* AudioManager::GetPhraseFilip Gawin2019-06-293-3/+3268
* miscellaneous, mostly world relatedaap2019-06-292-3/+3
* Fixed merge errorsNikolay Korolev2019-06-261-0/+2
* Merge with upstreamNikolay Korolev2019-06-265-0/+31
|\
| * Better organization for Frontend.cpp_AG2019-06-254-1/+11
| * Initial commit for Frontend._AG2019-06-254-0/+7
| * CPed, CVehicle, mostly entering/exiting careray orçunus2019-06-242-0/+23
* | More replay stuffNikolay Korolev2019-06-252-0/+13
|/
* Merge pull request #32 from Nick007J/masteraap2019-06-221-1/+1
|\
| * First commit of replay systemNikolay Korolev2019-06-221-1/+1
* | Merge branch 'master' of git://github.com/GTAmodding/re3 into erayeray orçunus2019-06-201-2/+4
|\|
| * Code clean up._AG2019-06-201-2/+4
* | Big CPed updateeray orçunus2019-06-202-3/+5
|/
* Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG2019-06-202-87/+118
* Update HUD stuff, bug and format fixes._AG2019-06-172-16/+23
* got rid of upper case typesaap2019-06-175-20/+20
* some more cleanupaap2019-06-161-4/+4
* Delete duplicate enumeray orçunus2019-06-161-8/+8
* Updates Draw.cpp, MusicManager.cpp._AG2019-06-164-2/+414
* New updates for Hud.cpp and more._AG2019-06-151-0/+171
* RE more stuff from COnscreenTimerFilip Gawin2019-06-122-3/+7
* skeleton updated, windows specific stuff addedFire-Head2019-06-022-0/+10
* rw skeletonFire-Head2019-05-312-0/+5
* more high level functionsaap2019-05-312-6/+3
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-302-0/+15
* Updates, CTimer startedFire-Head2019-05-292-0/+7
* Particle, ParticleMgr doneFire-Head2019-05-292-0/+138
* CPhysical almost doneaap2019-05-192-2/+5
* more work on CPhysicalaap2019-05-182-0/+14