mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-25 10:33:45 +00:00
Code Issues Projects Releases Wiki Activity
5619 commits 3 branches 0 tags 63 MiB
Commit graph

5619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur
33abd1b4e7 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp
 2021-09-02 21:00:15 +03:00
Sergeanur
a16fcd8d6a Fixes from master 2021-09-02 19:22:50 +03:00
Sergeanur
6a12033942 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.cpp
 2021-09-02 18:52:32 +03:00
Sergeanur
a04a84e00b Audio: small refactoring 2021-09-02 18:50:46 +03:00
Sergeanur
abe6c22f56 Fix heli sound 2021-09-02 12:25:52 +03:00
Sergeanur
232a45c9ac Audio: separate buffers for mission audio 2021-09-01 17:59:20 +03:00
Sergeanur
29383a6a11 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/sampman_miles.cpp
 2021-09-01 17:09:12 +03:00
Sergeanur
669c8c8988 Audio: add separate buffer for player comments like on PS2 to fix overflow, add ped comments debug to debug menu 2021-09-01 16:36:34 +03:00
Nikolay
9bd80324d1
Merge pull request #1327 from Nick007J/lcs 
some lcs stuff
 2021-08-31 23:16:52 +03:00
Fire-Head
4b747e567a replace ugly else if with switch 2021-08-30 23:34:06 +03:00
Sergeanur
27ddca26c2 Bridge sound done 2021-08-30 12:08:34 +03:00
Nikolay Korolev
b67a087448 fix compile 2021-08-30 11:44:11 +03:00
Sergeanur
6df0cb1ddb Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.h
 2021-08-30 11:27:18 +03:00
Sergeanur
320624edc8 Audio: ps2 code ifdef 
# Conflicts:
#	src/audio/AudioManager.h
 2021-08-30 11:26:19 +03:00
Nikolay Korolev
8cbdf27228 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-08-30 10:58:51 +03:00
Sergeanur
145af411ab Fix yet another DirectlyEnqueueSample 2021-08-30 09:33:19 +03:00
Sergeanur
07a1339704 Ferry sounds done 2021-08-30 09:01:10 +03:00
Sergeanur
0df6fbb30a Add new tSound field 2021-08-30 08:23:10 +03:00
Nikolay Korolev
a1c241af37 script revision p2 2021-08-30 02:46:28 +03:00
Nikolay Korolev
c5c887cc11 merge 2021-08-29 19:40:10 +03:00
Nikolay Korolev
453f8c05a4 script revision p1 2021-08-29 19:32:22 +03:00
Sergeanur
47c23ba917 Fix bugs in cAudioManager::DirectlyEnqueueSample 2021-08-29 18:57:01 +03:00
Sergeanur
a404689e50 cAudioManager::DirectlyEnqueueSample 2021-08-29 17:32:36 +03:00
Sergeanur
c6f9bbce8e Fix tabs after merge 2021-08-29 13:52:14 +03:00
Sergeanur
07778c81bc Merge branch 'miami' into lcs 2021-08-29 13:49:21 +03:00
Sergeanur
5b0c8fb3e2 More original indices 2021-08-29 13:36:42 +03:00
Sergeanur
355c260bf2 Fix Squalo render out poly 2021-08-29 13:29:06 +03:00
Sergeanur
764762f236 Get original MI_SKIMMER 2021-08-29 13:11:52 +03:00
Sergeanur
eeacbfeb6a Merge branch 'miami' into lcs 2021-08-29 10:31:13 +03:00
Sergeanur
9a7b469f4e Audio: fixing bugs, fixing types, making code more accurate to original 2021-08-29 09:42:32 +03:00
Sergeanur
2be8fcfa64 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.cpp
#	src/core/Radar.cpp
 2021-08-29 08:58:54 +03:00
Nikolay
e865e65955 fix 2021-08-28 14:22:52 +03:00
Nikolay
8ef1e29a5c
fix 2021-08-28 14:19:51 +03:00
Nikolay
2a69f34f93
fix 2021-08-27 19:53:51 +03:00
Nikolay
6d1d60f699
Merge pull request #1318 from Nick007J/lcs 
Onscreen Timer
 2021-08-27 17:11:56 +03:00
Nikolay Korolev
7a80acf6a1 fix debug teleport 2021-08-26 21:56:31 +03:00
Nikolay Korolev
b2daa0e502 Merge remote-tracking branch 'upstream/miami' into miami 2021-08-26 21:14:38 +03:00
Nikolay Korolev
915888d275 fixed debug teleport 2021-08-26 21:14:26 +03:00
Sergeanur
a94812b28d Fix acceleration sound on exiting the vehicle 2021-08-26 08:15:18 +03:00
Sergeanur
8de1ffb84d Fix reflections with audio time scale 2021-08-26 07:53:07 +03:00
Nikolay Korolev
b7db2a12d4 keep noinline only for broken vs versions 2021-08-26 01:47:17 +03:00
Nikolay Korolev
cc9398df14 cleanup 2021-08-26 00:38:00 +03:00
Nikolay Korolev
9187873396 Onscreen timer 2021-08-26 00:34:31 +03:00
Nikolay Korolev
d750a1101b fix 2021-08-25 14:44:47 +03:00
Sergeanur
f87f14b432 Refactor cPedComments 2021-08-25 13:41:53 +03:00
Sergeanur
e1286fcb04 Fix clock 2021-08-25 09:18:24 +03:00
Sergeanur
800ab92960 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
 2021-08-25 09:07:41 +03:00
Sergeanur
c8492ab5e0 Audio: refactoring, type fixes, renaming cAudioManager fields 2021-08-25 08:49:58 +03:00
aap
5f7de20cde modelinfo bits 2021-08-24 19:16:17 +02:00
Sergeanur
d4a2113a8a Audio: fix PS2 ifdefs 2021-08-24 15:25:51 +03:00