Nikolay Korolev
74f00c3c63
merge
2021-08-08 15:46:47 +03:00
Nikolay Korolev
88b4c7b50b
merge
2021-08-08 15:34:02 +03:00
Sergeanur
b77d93ba4a
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
2021-07-29 01:59:20 +03:00
Sergeanur
7bacf3b6f4
Reverse unused audio functions
2021-07-29 01:52:49 +03:00
Sergeanur
cce97588fe
Reverse unused audio functions from mobile
...
# Conflicts:
# src/audio/AudioManager.h
2021-07-29 00:43:04 +03:00
Sergeanur
6cea1de9e6
Reverse unused audio functions from mobile
2021-07-29 00:40:32 +03:00
Sergeanur
81673ab304
Fix comments
2021-07-28 10:36:18 +03:00
Sergeanur
04126cd18a
Merge branch 'miami' into lcs
2021-07-28 10:32:58 +03:00
Sergeanur
2aa37813d2
cAudioManager declaration reordering
2021-07-28 10:32:43 +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
f82c3c8ea7
Merge branch 'miami' into lcs
2021-07-27 22:39:14 +03:00
Sergeanur
9dbaa7a77f
PolRadio type fixes
2021-07-27 22:38:57 +03:00
Sergeanur
16e2e3d091
Type fix
2021-07-27 22:32:47 +03:00
Sergeanur
fbb42085bd
Merge branch 'miami' into lcs
2021-07-27 22:30:45 +03:00
Sergeanur
7aa8d7c073
AudioManager.cpp reordering
2021-07-27 22:29:40 +03:00
Sergeanur
ad2ccdb44a
Merge branch 'miami' into lcs
2021-07-27 22:02:45 +03:00
Sergeanur
782d38c6b7
Sort AudioCollision functions into original order
2021-07-27 22:02:25 +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
c234cb4663
Law enforcers and generic female ped comments
2021-07-25 22:16:02 +03:00
Sergeanur
55d30a11ec
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# src/audio/AudioManager.h
# src/control/Garages.cpp
# src/control/Garages.h
# src/control/Script5.cpp
# src/core/config.h
# utils/gxt/american.txt
# utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
withmorten
f686065769
get rid of // done comments in audiomanager.h
2021-07-11 03:59:37 +02:00
Sergeanur
7e7a2b74cd
Fixes
2021-06-25 01:16:03 +03:00
Sergeanur
74867af2e7
Fixes
2021-06-24 21:50:09 +03:00
Sergeanur
eaaba8646b
forgot
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
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
1471c82a20
LCS sfx + mission audio
2021-06-24 21:42:08 +03:00
Sergeanur
2b8ae07ec6
forgot
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
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
f741101e44
Fix redone + add hud fix
2021-06-24 21:32:44 +03:00
Sergeanur
cacec36dd1
Fix cut off sfx on high framerates
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
319bf9d8d2
Fix return type
2021-06-24 21:32:43 +03:00
Sergeanur
786e101acf
Use bool8 in audio code
2021-06-24 21:32:43 +03:00
Sergeanur
478f6e07d4
Uhh, right
...
# Conflicts:
# src/audio/AudioManager.h
2021-02-26 11:08:32 +02: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
Sergeanur
5bdbb5f802
Uhh, right
2021-02-26 11:05:37 +02: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
