1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-07-01 16:03:46 +00:00
Commit graph

277 commits

Author SHA1 Message Date
Nikolay Korolev 0631bd9d89 fix 2020-05-31 23:16:24 +03:00
Nikolay Korolev 815d3e0f61 fix 2020-05-31 22:50:32 +03:00
Nikolay Korolev f945dbc0fb dumb 2020-05-31 21:01:36 +03:00
Nikolay Korolev c1c163d78c game logic 2020-05-31 20:59:01 +03:00
Sergeanur 53ac163a3e Merge branch 'master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/vehicles/Automobile.h
2020-05-27 20:50:40 +03:00
Sergeanur 3a5a122887 Fix city sound playing on restarting a new game 2020-05-27 20:48:47 +03:00
Sergeanur 591c35d51b OpenAL support 2020-05-27 07:52:45 +03:00
Sergeanur 7a79b74778 Restore original logic 2020-05-27 03:33:27 +03:00
Sergeanur 408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
Sergeanur 1991aa388b Very basic compatibility with original sfx.raw/sdt 2020-05-26 18:25:34 +03:00
Sergeanur 0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
aap 7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
Sergeanur 52644192e3 Even more audio cleanups 2020-05-25 19:36:09 +03:00
Sergeanur ad896d5f81 Ped comments cleanup 2020-05-25 19:10:15 +03:00
Sergeanur cebc3bbd48 More audio cleanup and bugfixes 2020-05-25 18:39:16 +03:00
Sergeanur fd06ab4db8 Fix names of static variables 2020-05-25 03:56:17 +03:00
Sergeanur 80c2018b51 cAudioManager::ProcessPlayersVehicleEngine cleanup and fixes 2020-05-25 03:40:47 +03:00
Sergeanur 56683dbed3 Clean cAudioManager::ProcessGarages up a bit 2020-05-24 20:33:30 +03:00
Sergeanur f92770f74a Optimize ALDeviceList 2020-05-24 01:44:10 +03:00
Sergeanur 7d30878418 Fix OAL crash 2020-05-24 01:06:19 +03:00
Sergeanur ac208ce02c Even more small audio cleanup 2020-05-23 23:25:14 +03:00
Sergeanur f2790f610b More audio cleanup 2020-05-23 22:48:50 +03:00
Sergeanur 88b6168f1c Merge branch 'master' into miami
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
2020-05-23 21:14:16 +03:00
eray orçunus 5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
eray orçunus c993e99e00 Fix linux build 2020-05-22 22:49:54 +03:00
Sergeanur a9f332f2d9 Possibly fix travis 2020-05-22 21:26:31 +03:00
Sergeanur e858314a9f OpenAL configs 2020-05-22 18:01:09 +03:00
Nikolay Korolev 3405cfffb7 fixed dumb 2020-05-20 23:52:17 +03:00
eray orçunus 5b953228b4 Pickup and audio fix 2020-05-20 21:22:40 +03:00
Nikolay Korolev c0c8278c63 fixed ped comment 2020-05-20 20:45:07 +03:00
Sergeanur c53b23cff0 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
2020-05-20 14:39:36 +03:00
shfil 6bf79120dc
Fix string assignment (aldlist.cpp) 2020-05-18 21:08:01 +02:00
Sergeanur e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
aap b05e6632be
Merge pull request #556 from Fire-Head/master
nullsampman
2020-05-18 17:08:32 +02:00
Fire-Head 91fbfc1d23 nullsampman 2020-05-17 21:13:25 +03:00
Sergeanur 37480fb617 Fix compilation errors 2020-05-17 00:33:52 +03:00
Sergeanur 77f97ad2ad Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/audio/AudioManager.cpp
2020-05-16 23:58:44 +03:00
Sergeanur 4ff0697b4d More small audio fixes 2020-05-16 21:00:27 +03:00
Sergeanur 13a0bf1c43 Move sound processors to AudioLogic.cpp, plus small fixes 2020-05-16 20:29:13 +03:00
Sergeanur 1a42d62d3a Merge branch 'master' into miami
# Conflicts:
#	premake5.lua
#	src/peds/Ped.cpp
#	src/peds/PedIK.cpp
#	src/peds/PedIK.h
2020-05-16 17:09:13 +03:00
Sergeanur dc5ece8327 Fix audio use of number instead of enum for CAR_ACCEL 2020-05-16 16:55:37 +03:00
Sergeanur 76dd769085 Merge branch 'master' into miami 2020-05-16 05:07:39 +03:00
Sergeanur ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
2020-05-14 17:05:42 +03:00
Nikolay Korolev 8e0b132f43 it works differently 2020-05-14 14:03:56 +03:00
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