mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-01-09 20:35:27 +00:00
Code Issues Projects Releases Wiki Activity
4840 commits 3 branches 0 tags 56 MiB
Commit graph

49 commits

Author SHA1 Message Date
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 780cd225e9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:12 +03:00
Sergeanur d781db6c0f Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
 2021-07-09 00:05:26 +03:00
withmorten 79c010f082 fix macro redefinition warnings on win-glfw build 2021-07-08 01:44:55 +02: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
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
Sergeanur 74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur 27df328ec2 Make sampman stream functions default to stream 0 + type fixes 2021-06-24 21:46:21 +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 499b16678f Fix engine sounds, player and male01 ped comments 2021-06-24 21:42:10 +03:00
Sergeanur 0682cdedbd Fall back to mp3 if vb is not found 2021-06-24 21:42:10 +03:00
Sergeanur 1471c82a20 LCS sfx + mission audio 2021-06-24 21:42:08 +03:00
Sergeanur 5156626582 Make sampman stream functions default to stream 0 + type fixes 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 f6910d35f7 Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/render/Font.cpp
 2021-02-26 11:07:32 +02:00
erorcun 14dcd8f04c Fix MP3 player 2021-02-19 22:32:11 +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 904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
 2021-01-23 15:14: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 feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Filip Gawin 7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
Filip Gawin 1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
Filip Gawin c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01: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
Nikolay Korolev bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
erorcun 0eb4aca1d6 Fix build 2020-10-18 20:09:55 +03:00
erorcun a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +03:00
erorcun 4e07297503
Update sampman_miles.cpp 2020-10-12 20:51:52 +03:00
eray orçunus d18a55f429 SampleManager 2020-10-12 20:22:39 +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
Sergeanur 4f4b1f9145 cMusicManager, cDMAudio, radio position save/load, a few commands implemented 2020-09-09 19:37:44 +03:00
Sergeanur de8759eabd Merge branch 'master' into miami 
# Conflicts:
#	src/control/Record.cpp
#	src/vehicles/Automobile.cpp
 2020-07-17 13:53:11 +03:00
Sergeanur 949d0c8853 Add audio cache for faster initialization 2020-07-17 13:48:25 +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 408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
Nikolay Korolev 3405cfffb7 fixed dumb 2020-05-20 23:52:17 +03:00
Nikolay Korolev c0c8278c63 fixed ped comment 2020-05-20 20:45:07 +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
Fire-Head 8aac6060d3 oal upd 2020-05-04 20:33:48 +03:00
Renamed from src/audio/miles/sampman_mss.cpp (Browse further)