re3 - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp # src/audio/sampman.h # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp origin/lcs	Sergeanur	2021-09-02	6	-58/+81
\|\
\| *	Fixes from masterorigin/miami	Sergeanur	2021-09-02	6	-57/+80
* \|	Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioManager.cpp	Sergeanur	2021-09-02	2	-32/+32
\|\\|
\| *	Audio: small refactoring	Sergeanur	2021-09-02	1	-29/+30
\| *	Fix heli sound	Sergeanur	2021-09-02	1	-3/+2
* \|	Audio: separate buffers for mission audio	Sergeanur	2021-09-01	4	-47/+110
* \|	Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/sampman_miles.cpp	Sergeanur	2021-09-01	8	-64/+244
\|\\|
\| *	Audio: add separate buffer for player comments like on PS2 to fix overflow, a...	Sergeanur	2021-09-01	7	-8/+197
\| *	replace ugly else if with switch	Fire-Head	2021-08-30	1	-53/+48
* \|	Merge pull request #1327 from Nick007J/lcs•••some lcs stuff	Nikolay	2021-08-31	29	-238/+487
\|\ \
\| * \|	fix compile	Nikolay Korolev	2021-08-30	2	-19/+22
\| * \|	Merge remote-tracking branch 'upstream/lcs' into lcs	Nikolay Korolev	2021-08-30	3	-6/+108
\| \|\ \
\| * \| \|	script revision p2	Nikolay Korolev	2021-08-30	8	-24/+30
\| * \| \|	merge	Nikolay Korolev	2021-08-29	19	-3368/+3549
\| \|\ \ \
\| * \| \| \|	script revision p1	Nikolay Korolev	2021-08-29	25	-226/+462
\| * \| \| \|	fix	Nikolay	2021-08-28	1	-1/+1
* \| \| \| \|	Bridge sound done	Sergeanur	2021-08-30	3	-122/+47
* \| \| \| \|	Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioManager.h	Sergeanur	2021-08-30	2	-7/+11
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Audio: ps2 code ifdef•••# Conflicts: # src/audio/AudioManager.h	Sergeanur	2021-08-30	2	-7/+11
* \| \| \|	Fix yet another DirectlyEnqueueSample	Sergeanur	2021-08-30	1	-0/+4
* \| \| \|	Ferry sounds done	Sergeanur	2021-08-30	2	-4/+100
* \| \| \|	Add new tSound field	Sergeanur	2021-08-30	2	-2/+4
\| \|_\|/ \|/\| \|
* \| \|	Fix bugs in cAudioManager::DirectlyEnqueueSample	Sergeanur	2021-08-29	1	-5/+18
* \| \|	cAudioManager::DirectlyEnqueueSample	Sergeanur	2021-08-29	4	-4/+28
* \| \|	Fix tabs after merge	Sergeanur	2021-08-29	1	-52/+52
* \| \|	Merge branch 'miami' into lcs	Sergeanur	2021-08-29	1	-2/+2
\|\\| \|
\| * \|	Fix Squalo render out poly	Sergeanur	2021-08-29	1	-2/+2
* \| \|	More original indices	Sergeanur	2021-08-29	1	-9/+7
* \| \|	Get original MI_SKIMMER	Sergeanur	2021-08-29	1	-1/+1
* \| \|	Merge branch 'miami' into lcs	Sergeanur	2021-08-29	12	-3253/+3376
\|\\| \|
\| * \|	Audio: fixing bugs, fixing types, making code more accurate to original	Sergeanur	2021-08-29	12	-3255/+3376
* \| \|	Merge remote-tracking branch 'origin/miami' into lcs•••# Conflicts: # src/audio/AudioManager.cpp # src/core/Radar.cpp	Sergeanur	2021-08-29	8	-60/+79
\|\\| \| \| \|/ \|/\|
\| *	fix	Nikolay	2021-08-28	1	-1/+1
\| *	fix debug teleport	Nikolay Korolev	2021-08-26	1	-8/+9
\| *	Merge remote-tracking branch 'upstream/miami' into miami	Nikolay Korolev	2021-08-26	2	-3/+17
\| \|\
\| \| *	Fix acceleration sound on exiting the vehicle	Sergeanur	2021-08-26	1	-0/+4
\| \| *	Fix reflections with audio time scale	Sergeanur	2021-08-26	1	-3/+13
\| * \|	fixed debug teleport	Nikolay Korolev	2021-08-26	2	-3/+5
\| \|/
\| *	keep noinline only for broken vs versions	Nikolay Korolev	2021-08-26	1	-0/+2
\| *	Refactor cPedComments	Sergeanur	2021-08-25	4	-49/+49
* \|	fix	Nikolay	2021-08-27	1	-1/+1
* \|	Merge pull request #1318 from Nick007J/lcs•••Onscreen Timer	Nikolay	2021-08-27	9	-81/+226
\|\ \
\| * \|	cleanup	Nikolay Korolev	2021-08-26	2	-2/+2
\| * \|	Onscreen timer	Nikolay Korolev	2021-08-26	9	-81/+226
\|/ /
* \|	fix	Nikolay Korolev	2021-08-25	1	-3/+2
* \|	Fix clock	Sergeanur	2021-08-25	2	-3/+3
* \|	Merge branch 'miami' into lcs•••# Conflicts: # premake5.lua # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp	Sergeanur	2021-08-25	13	-269/+426
\|\\|
\| *	Audio: refactoring, type fixes, renaming cAudioManager fields	Sergeanur	2021-08-25	8	-192/+189
\| *	Audio: fix PS2 ifdefs	Sergeanur	2021-08-24	2	-1/+3
\| *	Merge branch 'master' into miami•••# Conflicts: # .github/workflows/build-switch.yml # .vscode/settings.json # CMakeLists.txt # README.md # cmake/nx/NXFunctions.cmake # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/polish.gxt # gamefiles/TEXT/russian.gxt # gamefiles/TEXT/spanish.gxt # gamefiles/models/frontend_nsw.txd # gamefiles/models/nswbtns.txd # res/images/logo.svg # res/images/logo_1024.png # res/images/logo_256.jpg # src/CMakeLists.txt # src/audio/AudioCollision.cpp # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp # src/audio/AudioManager.h # src/audio/MusicManager.cpp # src/audio/PolRadio.cpp # src/audio/PolRadio.h # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp # src/control/CarCtrl.cpp # src/core/ControllerConfig.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/MenuScreensCustom.cpp # src/core/common.h # src/core/config.h # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/peds/PedFight.cpp # src/peds/PlayerPed.cpp # src/peds/PlayerPed.h # src/skel/crossplatform.cpp # src/skel/glfw/glfw.cpp # src/weapons/Weapon.cpp # utils/gxt/polish.txt # utils/gxt/russian.txt	Sergeanur	2021-08-24	1	-1/+1
\| \|\