crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
5,613 Commits 3 Branches 0 Tags 79 MiB
29383a6a11
Commit Graph

281 Commits

Author SHA1 Message Date
withmorten
4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Sergeanur
43d5831394 cAudioManager::ProcessPedOneShots + fixes 2020-12-01 23:38:36 +02:00
Sergeanur
103b8fb426 More audio fix 2020-11-22 23:24:38 +02:00
Sergeanur
f010777e58 Audio fixes 2020-11-22 23:10:41 +02:00
Nikolay Korolev
be92957328 fixed top gear 2020-11-11 12:21:30 +03:00
Roman Masanin
c91d5a90a1 easy way to safe few petaseconds 2020-11-08 23:29:57 +03:00
Roman Masanin
fb2173c396 to make Serge and _R4K_ happy 2020-11-08 22:33:30 +03:00
Roman Masanin
363a2c6098 marked stupied code(dotProduct and AudioEvents) 2020-11-08 22:26:14 +03:00
Roman Masanin
612bd98039 return bad code, becouse no one knows what to do with it 2020-11-08 21:30:03 +03:00
Roman Masanin
0853a47a3f returned bad code, becouse no one knows what to do with it 2020-11-08 21:23:29 +03:00
Roman Masanin
279acfae59 pointers to referencies too 2020-11-08 20:50:46 +03:00
Roman Masanin
e269809bfd Merge branch 'master' of https://github.com/GTAmodding/re3 2020-11-08 20:32:31 +03:00
Roman Masanin
95bd5b073a pointers into referencies! 2020-11-08 20:31:24 +03:00
Roman Masanin
a553ac8716 fix for merge fix 2020-11-08 17:49:10 +03:00
Roman Masanin
23d23f6462 merge upstream 2020-11-08 16:23:05 +03:00
Sergeanur
a2e0373d22 Pickups fix 2020-11-08 15:00:54 +02:00
Sergeanur
7ede8685ec Ped comments fixes 2020-11-07 14:39:53 +02:00
Sergeanur
3b81eaa2d7 Fix cAudioManager::GetPhrase 2020-11-07 13:55:55 +02:00
Filip Gawin
e24513d2ad Sfx audio logic 2020-11-06 18:42:52 +01:00
Roman Masanin
89b622eea8 FORMAT 2020-11-04 11:37:17 +03:00
Roman Masanin
174424c520 fix serviceSoundEffects an cleanup 2020-11-02 12:05:23 +03:00
Roman Masanin
fad0a9507d some "optimizations". same like I did in VC 2020-11-01 23:48:03 +03:00
Roman Masanin
cebf32c46c mark code 2020-11-01 23:38:45 +03:00
Roman Masanin
5ea9285c5b changes in switch, and mark code 2020-11-01 22:42:45 +03:00
Roman Masanin
c3cbf4353d Fix build and use enum in ProcessPlayerMood 2020-10-26 14:02:11 +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
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
a520243563 cAudioManager::ProcessFrontEnd done 2020-10-25 12:00:57 +02:00
Sergeanur
93b318cfdf DMAudio fixes 2020-10-25 09:42:24 +02: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
Roman Masanin
39b7075502 merge Upstream 2020-10-24 14:20:08 +03:00
Sergeanur
ca497e2cbd ScriptSounds 2020-10-23 16:56:34 +03:00
Roman Masanin
0594ed5b46 peds 2020-10-18 23:03:03 +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
Roman Masanin
e34261d3ef mark some audio stuff and fix frameCounter 2020-10-12 18:09:58 +03:00
Roman Masanin
4fd93fea51 fix mistakes 2020-10-05 17:24:57 +03:00
Roman Masanin
4867d9949d some audio and part of CExplosion 2020-10-05 03:04:35 +03:00
Sergeanur
2129cc2906 Fix arg types 2020-09-30 02:18:11 +03: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
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
4c220b1f95 return bridge, crane and fix structures in fluff.h 2020-09-26 21:07: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
Roman Masanin
6e3523d594 flat tyre and minimal refractoring 2020-09-25 23:27:28 +03:00
Roman Masanin
4d1023ca30 safe before clean up 2020-09-25 04:57:11 +03:00
Roman Masanin
f097b9c972 fix deaddodo 2020-09-25 03:10:11 +03:00
Roman Masanin
4414288b86 remove anther goto 2020-09-25 02:30:51 +03:00
Roman Masanin
b3cbe3d338 removed some goto 2020-09-25 02:17:58 +03:00
Roman Masanin
1d22c78f9f processCarHeli half done 2020-09-25 01:43:19 +03:00
Roman Masanin
b2e3d90734 ProcessEscalators + some fixes 2020-09-22 19:32:05 +03:00
Roman Masanin
a9c3fdd63f rewisited: 
ProcessReverseGear
ProcessWeather
ProcessScriptObject
ProcessExtraSounds
ProcessEntity
and so, more info in my repo
 2020-09-22 03:28:14 +03:00
Roman Masanin
579d96534d fix enum edditing effects for oal target and small improvements 2020-09-21 03:21:17 +03:00
Roman Masanin
0f119ed371 cleanup processVehicleEngine and some fixes 2020-09-21 02:49:35 +03:00
Roman Masanin
5b9e4c4780 some style and bug fixes, updated sfx enum, and implemented processVehicleEngine 2020-09-21 01:55:22 +03:00
Sergeanur
7efc153dc9 Renaming audio enum entries to something more like original 2020-09-19 15:55:27 +03:00
Roman Masanin
223cd11835 just more cleanup... 2020-09-18 20:32:25 +03:00
Roman Masanin
5f810ff21c cleanup processVehicle 2020-09-18 19:14:36 +03:00
Roman Masanin
7f77e8a441 cleanup processPlayerVehicleEngine 2020-09-18 19:11:28 +03:00
Roman Masanin
3ab01fa6a3 fix conditions for processPlayerVehicleEngine 2020-09-18 18:11:49 +03:00
Roman Masanin
2d3d5d67ee revisit processVehicle 2020-09-15 22:06:18 +03:00
Roman Masanin
16dab00bec finish work on ProcessPlayerVehicleEngine and cleanup 2020-09-14 21:47:00 +03:00
Roman Masanin
8f948228d5 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-13 21:45:53 +03:00
Roman Masanin
aa2f1b6b29 vehicle audio(first part) and temp fix for openAL 2020-09-13 21:45:42 +03:00
Sergeanur
7aca08a954 player mood enum 2020-09-10 00:32:51 +03:00
Sergeanur
4f4b1f9145 cMusicManager, cDMAudio, radio position save/load, a few commands implemented 2020-09-09 19:37:44 +03:00
aap
a9a1bf5056 changed a sound enum 2020-08-20 13:21:08 +02:00
eray orçunus
b54bb62c94 Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Sergeanur
f882586eb8 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	README.md
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/render/Renderer.cpp
#	src/vehicles/Plane.cpp
 2020-07-22 18:29:17 +03:00
Sergeanur
7d51995640 Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher 2020-07-22 03:32:46 +03:00
Sergeanur
f760696a9f Fix another float 2020-07-18 19:37:28 +03:00
Sergeanur
28d7d6b2f1 Fix some audio floats 2020-07-18 19:18:58 +03:00
Sergeanur
ebdc5cca7f Merge branch 'master' into miami 2020-07-16 23:03:31 +03:00
Sergeanur
81c03f8e6d Audio fixes 2020-07-16 22:30:55 +03:00
eray orçunus
67a3c7d2ee VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
Sergeanur
8045bec6a5 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2020-06-30 19:12:06 +03:00
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
0cd2ac7e5e
Update AudioLogic.cpp 2020-06-29 09:41:56 +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
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
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
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
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
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
eray orçunus
5b953228b4 Pickup and audio fix 2020-05-20 21:22:40 +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
Sergeanur
e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
Sergeanur
37480fb617 Fix compilation errors 2020-05-17 00:33:52 +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