Nikolay Korolev
9d4d83db0d
some fixes
2020-05-14 14:01:24 +03:00
Sergeanur
7c2b9478d5
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Garages.cpp
# src/core/FileLoader.cpp
# src/core/Streaming.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
Sergeanur
33dfaf7da1
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
2020-05-13 00:27:15 +03:00
Filip Gawin
c2ac6b3759
Fix linux warnings
2020-05-12 23:18:54 +02:00
Sergeanur
0aa7f13c32
Merge branch 'master' into miami
...
# Conflicts:
# src/animation/AnimBlendAssociation.h
# src/animation/AnimBlendClumpData.h
# src/animation/AnimManager.h
# src/animation/FrameUpdate.cpp
# src/control/AutoPilot.h
# src/control/PathFind.h
# src/core/PlayerInfo.h
# src/entities/Building.h
# src/entities/Dummy.h
# src/entities/Entity.h
# src/entities/Physical.h
# src/entities/Treadable.h
# src/modelinfo/BaseModelInfo.h
# src/modelinfo/ClumpModelInfo.cpp
# src/modelinfo/ClumpModelInfo.h
# src/modelinfo/PedModelInfo.h
# src/modelinfo/SimpleModelInfo.h
# src/modelinfo/TimeModelInfo.h
# src/modelinfo/VehicleModelInfo.h
# src/objects/CutsceneHead.h
# src/objects/CutsceneObject.h
# src/objects/DummyObject.h
# src/objects/Object.h
# src/peds/DummyPed.h
# src/peds/PedIK.cpp
# src/rw/VisibilityPlugins.cpp
# src/vehicles/Automobile.h
# src/vehicles/Boat.h
# src/vehicles/Heli.h
# src/vehicles/Plane.h
# src/vehicles/Train.h
# src/vehicles/Vehicle.h
2020-05-11 21:07:12 +03:00
eray orçunus
8a4fa58cd4
Linux build support
2020-05-11 21:00:55 +03:00
erorcun
c66c45f4c8
Merge pull request #509 from Fire-Head/master
...
OpenAL update
2020-05-11 03:23:36 +03:00
bigbossbro08
c798e1bacd
Fixed typos and made all assert functions optional
2020-05-10 21:49:33 +06:00
bigbossbro08
af6e132b37
defined out asserts.
2020-05-10 19:54:37 +06:00
aap
97d5698e0c
peds starting to work
2020-05-09 17:05:26 +02:00
Sergeanur
f13c4e6aca
Merge branch 'master' into miami
2020-05-07 14:49:29 +03:00
Sergeanur
0b848bc147
Fix looping collision sound
2020-05-07 14:48:53 +03:00
Sergeanur
7dc649ede6
Merge branch 'master' into miami
2020-05-07 14:32:41 +03:00
Sergeanur
1ac6bea590
Fix GetDistanceSquared
2020-05-07 14:32:00 +03:00
Sergeanur
ed1bb7236f
Fixed arguments for sound collisions
2020-05-07 14:10:56 +03:00
aap
05a1d64fbb
VC vehicles just barely working now
2020-05-07 11:33:20 +02:00
aap
876e402d1e
dont hardcode first vehicle ID; little fix for roadblocks
2020-05-07 09:38:07 +02:00
Fire-Head
875c77e8b1
oal update
2020-05-07 10:13:59 +03:00
Fire-Head
12a3499ca3
oal wav/mp3 stream update
2020-05-07 09:26:16 +03:00
Sergeanur
d015e09c92
Merge branch 'master' into miami
2020-05-06 18:03:36 +03:00
Sergeanur
daa3b20477
Fix cAudioManager::ProcessActiveQueues loop
2020-05-06 18:01:52 +03:00
Nikolay Korolev
15520fe77d
fix memory corruption
2020-05-06 16:55:04 +03:00
aap
e0568a19d5
new zone stuff
2020-05-06 12:23:57 +02:00
aap
cbfc45b3f7
some work on zones
2020-05-06 12:23:26 +02:00
Sergeanur
dfe0642195
Merge pull request #512 from Nick007J/master
...
MIAMI CAutoPilot + CCarAI + multiple fixes
2020-05-05 17:14:13 +03:00
Sergeanur
e9b334d7bf
More use of GetModelIndex
2020-05-05 14:48:35 +03:00
Nikolay Korolev
ae0c83fa01
CAutoPilot + CCarAI + fixes
2020-05-05 14:40:35 +03:00
Fire-Head
73c809f616
bb std::string
2020-05-04 22:02:54 +03:00
Fire-Head
6382b6d2fc
fix typo
2020-05-04 21:32:42 +03:00
Fire-Head
0abd0c659b
openal-soft added
2020-05-04 21:06:14 +03:00
Fire-Head
8aac6060d3
oal upd
2020-05-04 20:33:48 +03:00
Sergeanur
c62d35fed0
Adding sound intensity consts
2020-05-02 23:31:45 +03:00
Sergeanur
271517915f
Cleanup cAudioManager::ProcessVehicleSkidding
2020-05-02 18:23:48 +03:00
Sergeanur
7ba5b3c353
A bit more audio cleanup
2020-05-02 17:10:51 +03:00
Sergeanur
853dab23f5
cleanup cAudioManager::UpdateReflections
2020-05-02 16:45:24 +03:00
Sergeanur
8d0b0051b4
AudioManager.cpp autoformat
2020-05-02 16:27:40 +03:00
Sergeanur
05b2ae10c6
Replacing >> and << to / and * in AudioManager
2020-05-02 15:56:59 +03:00
Sergeanur
d23b2c423e
SetPosition, part 1
2020-05-02 15:13:09 +03:00
Sergeanur
7d758f3a9f
Adding getters and setters for type and status
2020-04-30 16:45:45 +03:00
Sergeanur
299bbc47ec
Changing prefixes for some audio fields
2020-04-28 14:00:38 +03:00
Sergeanur
64e6af1db8
Fix tVehicleSampleData struct
2020-04-27 20:26:24 +03:00
Sergeanur
c94ccce6d6
Audio structs moved to their AudioManager.h
2020-04-27 20:06:54 +03:00
Sergeanur
7bf45124e6
Fix use of integers instead of enum/bool/nil
2020-04-27 12:41:34 +03:00
Sergeanur
81fce4edab
Audio fixes
2020-04-27 02:49:07 +03:00
Fire-Head
2925b7e0c3
fix #ifdef
2020-04-23 11:35:42 +03:00
Fire-Head
75acd78190
ps2 particles, sampman oal started
2020-04-23 11:24:03 +03:00
Filip Gawin
370c4e48cd
Try to build with mingw
2020-04-20 18:18:46 +02:00
eray orçunus
1ffc37735e
Struct cleanup, various fixes, enable PS2 rand
2020-04-19 16:44:35 +03:00
Nikolay Korolev
89688843ec
bug fixes
2020-04-18 13:56:21 +03:00
Filip Gawin
d6314f9564
Revert "Part one"
...
This reverts commit 63951d9b95
.
2020-04-18 12:29:28 +02:00
Filip Gawin
3f32b69a79
Fix crash in cAudioManager::ServicePoliceRadio
2020-04-18 12:20:20 +02:00
Filip Gawin
2b1570de70
Merge branch 'master' of https://github.com/GTAmodding/re3
2020-04-18 12:08:38 +02:00
Sergeanur
555f933780
Remove padding fields
2020-04-18 11:31:53 +03:00
Filip Gawin
63951d9b95
Part one
2020-04-17 19:30:57 +02:00
Sergeanur
599164006a
Remove patches
2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7
rem refs
2020-04-17 08:54:14 +03:00
eray orçunus
2c2da558ca
Some refs removed, little fixes and teleport
2020-04-16 22:19:56 +03:00
Sergeanur
b1fc7bc533
More refs removed
2020-04-16 11:50:45 +03:00
aap
89b7085353
Merge branch 'master' of github.com:gtamodding/re3
2020-04-16 09:23:31 +02:00
Fire-Head
c1fcb7bd43
Removed refs from sampman
2020-04-16 08:28:17 +03:00
eray orçunus
c22e59abab
Various fixes
2020-04-16 05:07:32 +03:00
aap
afce2e1bb3
Merge branch 'master' of github.com:gtamodding/re3
2020-04-15 22:36:21 +02:00
Nikolay Korolev
5cb7e2e42a
Merge pull request #440 from Fire-Head/master
...
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
aap
90be379bed
implemented most of librw wrapper
2020-04-15 14:05:40 +02:00
Fire-Head
daed13485e
CWeapon done, ps2 cheats fix
2020-04-15 08:03:53 +03:00
Sergeanur
9a7b833aa5
Added missing audio ctors
2020-04-14 17:13:38 +03:00
Filip Gawin
67055c1fbb
Cleanup cAudioManager::ProcessRainOnVehicle a bit
2020-04-13 21:13:07 +02:00
Filip Gawin
3b9f1255af
Finish audio code
2020-04-13 20:30:18 +02:00
Filip Gawin
7d137d8f2d
Cleanup audio code
2020-04-12 02:50:52 +02:00
aap
34349c4df2
normalized line endings to LF
2020-04-09 20:50:24 +02:00
Filip Gawin
95e4466846
Fix CI build
2020-04-07 15:53:51 +02:00
Filip Gawin
bf2316bd54
Cleanup audiocode and fix for ComputeDopplerEffectedFrequency
2020-04-07 15:44:31 +02:00
Nikolay Korolev
7f8a78e5de
Cranes done
2020-04-06 02:01:03 +03:00
Sergeanur
6e6912b613
fixes
2020-04-02 09:20:45 +03:00
Sergeanur
62ae7245ab
AudioScriptObject finished
2020-04-01 06:09:25 +03:00
Nikolay Korolev
92edf92570
Merge branch 'master' into garages_dev
2020-03-28 23:42:11 +03:00
Filip Gawin
d13afe5cc1
audio16 fixes for review
2020-03-28 20:18:54 +01:00
Filip Gawin
58ec4b2157
ProcessVehicleEngine and ProcessActiveQueues
...
Also some smaller fixes, thx erorcun for help.
2020-03-28 20:18:54 +01:00
Nikolay Korolev
101c21e064
merge with master
2020-03-28 20:55:15 +03:00
Nikolay Korolev
775bc3e666
garage update part 2
2020-03-28 20:52:25 +03:00
erorcun
c056871e07
Merge pull request #363 from erorcun/erorcun
...
CCopPed done and #include cleanup
2020-03-28 19:12:22 +03:00
eray orçunus
112685ebac
CCopPed done and #include cleanup
2020-03-28 18:52:25 +03:00
Fire-Head
3366cd0ff8
WaterCannon done, resource ico
2020-03-28 17:02:44 +03:00
Nikolay Korolev
268f92bfbe
garages part 1
2020-03-28 15:24:13 +03:00
Filip Gawin
da2d25c020
Fix order of math operations on integers (fires)
2020-03-22 19:32:01 +01:00
Filip Gawin
0e817230af
Remove all constexpr
2020-03-22 17:30:54 +01:00
Filip Gawin
b57e4febb0
fix include
2020-03-22 17:30:54 +01:00
Filip Gawin
39462a3865
Fixes for review
2020-03-22 17:30:54 +01:00
Filip Gawin
a097f225bc
Fixes for review
2020-03-22 17:30:54 +01:00
Filip Gawin
337924c794
Cleanup audio code + fixes for review
2020-03-22 17:30:54 +01:00
Filip Gawin
8f01eab5ab
Fixes for Serge's review
2020-03-22 17:30:54 +01:00
Filip Gawin
7c425ac4ac
Implement ProcessGarages + small cleanup
2020-03-22 17:30:54 +01:00
Filip Gawin
3b8a177470
Implement SetupJumboEngineSound
2020-03-22 17:30:54 +01:00
Filip Gawin
67398809a3
Implement ProcessFires
2020-03-22 17:30:54 +01:00
Filip Gawin
0d1f42add1
Implement ProcessCrane
2020-03-22 17:30:54 +01:00
Filip Gawin
31382bc22c
Implement ProcessCesna
2020-03-22 17:30:54 +01:00
Wes Hampson
c7f16879df
GenericSave complete, still needs some testing
2020-03-11 00:12:40 -07:00
Filip Gawin
c92dfb0064
Fix police radio condition
...
thx @Nick007J
2020-02-22 19:47:42 +01:00
Sergeanur
d1700b3257
Fixed random sound volume
2020-02-07 21:40:10 +02:00
Sergeanur
a3e5ccde47
cMusicManager
2020-02-07 02:30:00 +02:00
Sergeanur
72a4abd347
Audio, use of enums and true/false
2020-02-02 15:57:27 +02:00
Sergeanur
ff831a8956
Removed dup hook
2020-02-01 20:02:04 +02:00
Sergeanur
da253837d1
audio stuff
...
Collision audio and police radio stuff moved to a separate cpp's like in the original code
cPoliceRadioQueue added, code refactored correspondingly
cAudioManager::ServiceCollisions reversed
PlayOneShotScriptObject reversed
cAudioScriptObject moved to AudioScriptObject.cpp
Fixed use of numbers on non-integer types (bools, pointers)
enum is now used for ped audio calculation
Added fixes for vehicle description in the police radio (missing vehicles and wrong colors)
2020-01-25 12:48:27 +02:00
Sergeanur
045c638067
Two audio structs renamed to their original names
2020-01-13 20:01:23 +02:00
Sergeanur
f7e962beaa
Fixing Projectile code
2020-01-07 17:26:40 +02:00
eray orçunus
bb5e31470d
CPlayerPed & fixes
2019-12-28 23:05:49 +03:00
eray orçunus
dad7782ff0
CPhone, CPlayerInfo, CFire, CWorld
2019-12-06 00:55:23 +03:00
Filip Gawin
5289f398ea
Fix CalculateDistance
2019-12-01 20:44:57 +01:00
Filip Gawin
c7e9ddb566
Audio fixes for erorcun review
2019-12-01 20:44:57 +01:00
Filip Gawin
9afac431b0
Implement ProcessVehicleSirenOrAlarm
2019-12-01 20:44:57 +01:00
Filip Gawin
41c9e66382
Fix sound when "up" and "down" are pressed together
2019-12-01 20:44:43 +01:00
eray orçunus
be7d1d1a63
Frontend, Peds & logic and overflow fixes
2019-11-12 23:34:28 +01:00
Filip Gawin
de09fc0225
Fix max iterator value in InitialisePoliceRadio
2019-11-11 15:33:24 +01:00
erorcun
0df15bb73d
Merge pull request #263 from Sergeanur/strcmp
...
Implemented faststrcmp, faststricmp, strcasecmp
2019-11-09 18:06:20 +03:00
Filip Gawin
5e771f1737
RE cAudioManager::UpdateReflections
2019-11-05 12:29:42 +01:00
Sergeanur
c202fc3b55
Implemented faststrcmp, faststricmp, strcasecmp
2019-10-30 01:35:31 +02:00
Sergeanur
d9c96a76fb
Some fixes for cAudioManager::SetupSuspectLastSeenReport
2019-10-29 17:08:51 +02:00
Filip Gawin
a2e59564c8
Implement PreloadMissionAudio + small fixes
2019-10-27 22:46:37 +01:00
Sergeanur
cce3aac4c3
Audio fixes
2019-10-27 19:04:13 +02:00
Sergeanur
80b85a417c
Fix cAudioManager::AddReleasingSounds
2019-10-27 15:16:57 +02:00
Filip Gawin
f090708a90
ProcessFrontEnd fixes
2019-10-27 13:30:16 +01:00
Sergeanur
9d0757eebe
SfxEnum
2019-10-27 02:28:23 +03:00
Filip Gawin
405b83ca0f
Audio9 (fixes)
2019-10-27 01:07:01 +02:00
Sergeanur
fcfdaa9534
cAudioManager::TranslateEntity cleanup
2019-10-27 01:46:48 +03:00
Sergeanur
35bd3f514d
Fix hornPatternsArray
2019-10-26 17:08:13 +03:00
Sergeanur
fd8096aec8
Merge pull request #254 from Sergeanur/Audio
...
Audio stuff moved around
2019-10-26 16:23:04 +03:00
Sergeanur
28bb221f7e
Fix audio bug
2019-10-26 16:20:36 +03:00
Sergeanur
428b407ad5
A bit more enums for ChangeMusicMode
2019-10-26 16:02:59 +03:00
Sergeanur
8fb71e2555
audio.h -> audio_enums.h
2019-10-26 15:50:21 +03:00
Sergeanur
d5a72fa597
Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode
2019-10-26 15:20:12 +03:00
Filip Gawin
8808e6fdfe
Fixes for aap review (audio8)
2019-10-26 13:05:00 +02:00
Filip Gawin
fef3b5f978
Audio fixes from Serg
2019-10-26 13:05:00 +02:00
Filip Gawin
d822417cfc
Fixes for nitpicks
2019-10-26 13:05:00 +02:00
Filip Gawin
c27dbcfe6d
Cleanup audio
2019-10-26 13:05:00 +02:00
Filip Gawin
8c52cdbedd
Cleanup police radio
2019-10-26 13:05:00 +02:00
Filip Gawin
47d2cf6c0a
More audio windows
2019-10-26 13:05:00 +02:00
Filip Gawin
d2941b0368
More audio (to hook and test)
2019-10-26 13:05:00 +02:00
Filip Gawin
003ac856c6
More work
2019-10-26 13:05:00 +02:00
Filip Gawin
12ee71e4f7
audio7
2019-10-26 13:05:00 +02:00
Sergeanur
3ff7fc8355
Fixed nasty warnings
2019-10-17 17:28:24 +03:00
Sergeanur
17ffb99420
Fixed train sounds not working
2019-10-17 16:10:27 +03:00
Sergeanur
32c5723b91
Radio shadow fix, RAMPAGE!! message fix
2019-10-06 21:31:34 +03:00
eray orçunus
c03efd0aa1
Moar peds
2019-10-01 19:16:36 +03:00
Filip Gawin
5a36d46692
Audio fixes
2019-08-27 23:45:27 +02:00
Filip Gawin
01ac2929cd
Cleanup
2019-08-27 22:29:23 +02:00
Filip Gawin
2fabbc3b4c
More more more audio
2019-08-27 21:18:47 +02:00
Filip Gawin
458fc63f01
Cleanup
2019-08-27 21:14:28 +02:00
Filip Gawin
af5bd951ae
More audio ped
2019-08-27 21:13:17 +02:00
Fire_Head
6909fa283a
Merge branch 'master' into master
2019-08-15 05:06:52 +03:00
Fire-Head
6093d855b0
CParticleObject done, cDMAudio done
2019-08-15 04:43:00 +03:00