a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-18 06:17:45 +00:00
Code Issues Projects Releases Wiki Activity
2868 commits 4 branches 2 tags 50 MiB
Commit graph

352 commits

Author SHA1 Message Date
Sergeanur da93b0a078 Audio fixes 2020-06-30 19:06:58 +03:00
Sergeanur b26eec5daf Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp
 2020-06-29 12:56:50 +03:00
Fire-Head 63fdcf7e64 menu fixes 2020-06-29 10:29:02 +03:00
Fire_Head 0cd2ac7e5e
Update AudioLogic.cpp 2020-06-29 09:41:56 +03:00
Fire_Head 860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Fire-Head 1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
eray orçunus e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
Sergeanur 95e9fe7693 fixes 2020-06-08 16:22:49 +03:00
Sergeanur 03f3b4fc5a remove numbers from enum 2020-06-08 14:33:10 +03:00
Sergeanur 8cd87236c9 miamification of some audio structs 2020-06-08 14:29:55 +03:00
Sergeanur 36a6d124aa Mission audio slots 2020-06-08 10:34:31 +03:00
Sergeanur be9954ecc6 IsMissionAudioSamplePlaying (from VC) 2020-06-08 10:33:32 +03:00
Sergeanur a44510d1df more font 2020-06-07 10:36:37 +03:00
Sergeanur afa4fa6510 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/soundlist.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/peds/Ped.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Vehicle.h
 2020-06-06 08:42:58 +03:00
Sergeanur 2016cd54b0 ps2 audio banks 2020-06-06 03:45:24 +03:00
Sergeanur 147dca44fa ProcessTrainAnnouncements 2020-06-05 11:27:33 +03:00
eray orçunus 016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
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 e259bb6609 fixes 2020-05-24 18:43:50 +03:00
Sergeanur 13a9441d5e Merge branch 'master' into opus 2020-05-24 01:45:10 +03:00
Sergeanur f92770f74a Optimize ALDeviceList 2020-05-24 01:44:10 +03:00
Sergeanur 0c4ce002f1 Merge branch 'master' into opus 2020-05-24 01:07:03 +03:00
Sergeanur 7d30878418 Fix OAL crash 2020-05-24 01:06:19 +03:00
Sergeanur 3a7651e7ab Cleanup 2020-05-24 00:56:20 +03:00
Sergeanur bd67db523a Merge branch 'master' into opus 
# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp
 2020-05-24 00:45:45 +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
Sergeanur ab161d12d8 Merge remote-tracking branch 'origin/master' into opus 2020-05-22 17:41:03 +03:00
Sergeanur 0af4d57408 opus support 2020-05-22 17:40:19 +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
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