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
Sergeanur
7bacf3b6f4 Reverse unused audio functions 2021-07-29 01:52:49 +03:00
Sergeanur
92679555b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/MusicManager.cpp
 2021-07-28 09:42:24 +03:00
Sergeanur
8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur
7adc85995f Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2021-07-28 09:24:23 +03:00
Sergeanur
61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur
98003d0d41 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:56:42 +03:00
Sergeanur
49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur
029e315f0a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:42:18 +03:00
Sergeanur
16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur
6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
Sergeanur
1180f32d9c Fix bike kick sound 2021-07-26 11:33:56 +03:00
Sergeanur
a064b3a687 Audio changes: 
- Reorder AudioCollision.cpp functions into original order
- Add missing cAudioCollision::Reset()
- Move cAudioCollision ctor into .h (like original)
- Fix argument types for ped comment functions and more
- Fix wrong names of ped comment functions
- Fix incorrect ped comments
- Remove getters
- Reorder declarations of cAudioManager
- Wrap PC only functions around ifdef
- Add cAudioManager methods from PS2 and mobile
 2021-07-26 04:34:55 +03:00
Sergeanur
a510a03b8a Small fix 2021-07-25 22:27:00 +03:00
Sergeanur
c234cb4663 Law enforcers and generic female ped comments 2021-07-25 22:16:02 +03:00
Sergeanur
cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
Sergeanur
a1444b992f Fix Predator shooting sound 2021-07-22 07:01:04 +03:00
Sergeanur
4981fe3091 Remove redundant SampleManager.InitialiseChannel call 2021-07-10 02:06:35 +03:00
Sergeanur
7a1ff3b2ad Mission audio cleanup + sound pause 2021-07-09 00:02:35 +03:00
Sergeanur
138abb91f6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script4.cpp
#	src/core/Frontend.cpp
 2021-06-30 21:26:36 +03:00
Sergeanur
b1c9340fd3 Fix unused code 2021-06-30 21:16:48 +03:00
withmorten
d17d437de3 rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake) 2021-06-28 13:57:05 +02:00
withmorten
cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +02:00
erorcun
53a4b6936b Revert "Use PS2-y global names on SampMan" 
We know that they changed all those names on PC.

This reverts commit 091a65996e.
 2021-06-27 17:59:50 +03:00
erorcun
091a65996e Use PS2-y global names on SampMan 2021-06-27 17:53:14 +03:00
Sergeanur
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur
ba23408007 Fix use of enum in ped comment banks switch 2021-06-24 21:46:21 +03:00
Sergeanur
0910188058 Add macros to set sample loop offsets 2021-06-24 21:46:18 +03:00
Sergeanur
3cc9eb1c1c Fix cAudioManager::ProcessCarHeli 2021-06-24 21:45:49 +03:00
Sergeanur
db1c7de125 Fix bullet trace sound offset 2021-06-24 21:45:49 +03:00
Sergeanur
60bb16d26c Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:45:18 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
008f8a1e19 Fix mod 0 crash 2021-06-24 21:42:10 +03:00
Sergeanur
499b16678f Fix engine sounds, player and male01 ped comments 2021-06-24 21:42:10 +03:00
Sergeanur
1471c82a20 LCS sfx + mission audio 2021-06-24 21:42:08 +03:00
Sergeanur
0f0cb40151 Fix use of enum in ped comment banks switch 2021-06-24 21:34:33 +03:00
Sergeanur
1b5dbc4b41 Add macros to set sample loop offsets 2021-06-24 21:34:33 +03:00
Sergeanur
6426963807 Fix cAudioManager::ProcessCarHeli 2021-06-24 21:34:33 +03:00
Sergeanur
23755fdfb4 Fix bullet trace sound offset 2021-06-24 21:34:33 +03:00
Sergeanur
02655313e9 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:34:33 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur
8fc99387f5 Fix use of enum in ped comment banks switch 2021-06-24 21:32:44 +03:00
Sergeanur
939d0c59a3 Add macros to set sample loop offsets 2021-06-24 21:32:44 +03:00
Sergeanur
7a2dbd9112 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:32:43 +03:00
Sergeanur
c9804510d1 This means sound should be panned right, not volume 2021-06-24 21:32:43 +03:00
Sergeanur
c37f4c3c1a Fix cAudioManager::SetupJumboFlySound 2021-06-24 21:32:43 +03:00
Sergeanur
786e101acf Use bool8 in audio code 2021-06-24 21:32:43 +03:00
Sergeanur
fdb6428c6b Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-05-12 03:29:36 +03:00
Sergeanur
2fc431d1bb Complete sfx enum, rename some sounds + fixes of missing ped comments 2021-05-12 03:26:54 +03:00
Sergeanur
8f54093de1 Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/World.cpp
 2021-05-10 02:48:56 +03:00
Sergeanur
4da733145e fix 2021-05-10 02:45:29 +03:00
Sergeanur
e38467ef3a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	premake5.lua
#	src/animation/AnimManager.cpp
#	src/animation/AnimationId.h
#	src/audio/MusicManager.cpp
#	src/audio/audio_enums.h
#	src/control/Script7.cpp
#	src/core/FileLoader.cpp
#	src/core/re3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/postfx.cpp
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_PS.hlsl
#	src/extras/shaders/make_hlsl.cmd
#	src/extras/shaders/obj/colourfilterVC_PS.cso
#	src/extras/shaders/obj/colourfilterVC_PS.inc
#	src/extras/shaders/obj/colourfilterVC_frag.inc
#	src/peds/PedFight.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Particle.cpp
#	src/render/WaterCannon.cpp
#	src/skel/win/gtavc.ico
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt
 2021-02-16 18:08:19 +02:00
Sergeanur
28f9160bca Fix crash when falling from bike while shooting 2021-02-11 12:13:03 +02:00
erorcun
1667ffdd8f MusicManager fixes 2021-02-03 14:08:28 +03:00
erorcun
902e539c0d Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text 2021-02-01 14:18:17 +03:00
Sergeanur
9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Sergeanur
defbb01aaa Merge remote-tracking branch 'origin/lcs' into lcs 
* origin/lcs:
  Remove size assert
  Add TXD mid field
  Enable GTA_BRIDGE
  LCS model indices
 2021-01-23 15:14:24 +02:00
Sergeanur
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
 2021-01-23 15:14:15 +02:00
Sergeanur
b35b0c598d Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
 2021-01-22 15:04:09 +02:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Sergeanur
4bd7bafd7c Merge branch 'miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
 2021-01-15 17:57:35 +02:00
Sergeanur
19749effce Fix Jumbo Sound reseting when walking 2021-01-15 17:54:21 +02:00
Sergeanur
a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
aap
49d5c02d69 anims done. ped fight hacked to compile 2021-01-08 23:43:52 +01:00
Sergeanur
8eed6ae179 Use original names 2021-01-08 21:50:59 +02:00
aap
ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01:00
Sergeanur
f639aae2ae Fix chainsaw sound 2021-01-05 13:04:42 +02:00
Sergeanur
042e21115e More audio fix 2021-01-05 00:50:51 +02:00
Sergeanur
63e9f6d826 Audio fixes 2021-01-05 00:32:03 +02:00
Sergeanur
32d3ea0a2d Audio fixes 2021-01-05 00:31:31 +02:00
TheOfficialFloW
0c2ea268d1
Fix typo in ProcessMissionAudioSlot. 2021-01-03 16:56:12 +01:00
TheOfficialFloW
e46b06491c Fix nFramesForPretendPlaying. 2021-01-03 14:59:16 +01:00
Sergeanur
c3f49386ca Fix wrong sound when bumping peds 2021-01-01 15:11:12 +02:00
Sergeanur
759f91ce91 Fix drive-by machine gun sound 2020-12-27 10:58:33 +02:00
Sergeanur
18bea3cfa5 Fix weapon pickup sound 2020-12-26 07:31:53 +02:00
Sergeanur
2b96be0418 cVehicleParams ctor 2020-12-25 20:22:43 +02:00
Sergeanur
7a7061ea92 Use intensity in ProcessBoatEngine 2020-12-25 20:00:12 +02:00
Sergeanur
90ef1d2d31 cAudioManager::ProcessBoatEngine 2020-12-25 19:59:45 +02:00
Sergeanur
03c3eeb937 cAudioManager::ProcessBoatEngine fixes 2020-12-25 19:57:09 +02:00
Sergeanur
9345efbafb cPedParams fixes 2020-12-25 17:42:40 +02:00
Sergeanur
b8bf3cb790 cPedParams fixes 2020-12-25 17:39:49 +02:00
Sergeanur
fa6eb3a64f cAudioManager::ProcessOneShotScriptObject 2020-12-25 17:22:18 +02:00
Sergeanur
356f101078 Fix cAudioManager::ProcessPedOneShots crash 2020-12-25 16:24:20 +02:00
shfil
dc72729a40
Merge pull request #895 from ShFil119/miami_audio 
More audio
 2020-12-25 14:02:47 +01:00
Filip Gawin
cf8799d116 More audio enums 2020-12-25 13:51:09 +01:00
Sergeanur
74276ae878 More type fix 2020-12-25 09:29:23 +02:00
Sergeanur
1cc8a1d247 Small audio code fix 2020-12-25 09:13:01 +02:00
Sergeanur
6d75374c41 Fix cAudioManager::ProcessSpecial 2020-12-25 09:06:49 +02:00
Sergeanur
6a2edcea46 Small type use fixes 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/vehicles/Cranes.cpp
 2020-12-25 09:03:13 +02:00
Sergeanur
de31bdc89f Small type use fixes 2020-12-25 08:59:32 +02:00
Sergeanur
0768026938 Fix chainsaw sounds lol 2020-12-25 08:33:43 +02:00
Filip Gawin
19cc1d7854 fixes 2020-12-25 01:29:18 +01:00
Filip Gawin
35473e653d More audio 2020-12-22 14:53:45 +01:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
withmorten
4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten
912e71be53 int8 enums fixed 2020-12-07 01:30:38 +01:00
withmorten
afdf8c25a0 int8 enums fixed 2020-12-07 00:56:12 +01:00