4586 Commits

Author SHA1 Message Date
erorcun
53a4b6936b Revert "Use PS2-y global names on SampMan"
We know that they changed all those names on PC.

This reverts commit 091a65996ef9eba0dfeb49508927ebb521c0f15b.
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
Nikolay Korolev
73e112a217 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-27 14:53:43 +03:00
Sergeanur
879761af2c Merge fixes 2021-06-27 14:51:48 +03:00
Sergeanur
c7243aa2e9 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:49:14 +03:00
erorcun
3587cb029e Remove waiting for stream closure in multi-thread audio 2021-06-27 14:42:52 +03:00
Sergeanur
883d8172b0 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:33:39 +03:00
erorcun
a923728877 Fix map texture leak 2021-06-27 00:34:46 +03:00
erorcun
05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03:00
withmorten
4819d195d8 fix WriteSaveHeader 2021-06-26 19:19:45 +02:00
withmorten
f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
2021-06-26 19:14:46 +02:00
erorcun
9c8ef3cca0
Merge pull request #1151 from erorcun/miami
Multi-threaded audio streams on OAL
2021-06-26 16:28:43 +03:00
erorcun
107c4df69c Multi-threaded audio streams
Under MULTITHREADED_AUDIO define.
2021-06-26 16:24:23 +03:00
Nikolay Korolev
636f67ca3f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-26 14:34:52 +03:00
Sergeanur
d4ba7c387b Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	README.md
#	premake5.lua
#	src/render/Particle.cpp
2021-06-26 14:27:54 +03:00
Sergeanur
831737ecc8 Fixes 2021-06-26 14:25:40 +03:00
withmorten
9ab4f1a2d9 fix screenshot name space 2021-06-26 13:13:43 +02:00
withmorten
171d9fd036 fix screenshot name space 2021-06-26 13:13:07 +02:00
Sergeanur
225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
Sergeanur
6cb8c11285 Fix premature CTimer calls 2021-06-26 04:09:45 +03:00
Sergeanur
3092b9a46e Small timer fix 2021-06-26 01:56:29 +03:00
erorcun
9b5caa190e Pool fixes
Mostly for Linux
2021-06-26 00:27:20 +03:00
erorcun
af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup"
This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
2021-06-26 00:25:59 +03:00
kusst
ebd980bf14
Make colors in texture conversion dialog more LCSy. 2021-06-25 22:45:21 +02:00
withmorten
c869602b6d
Merge pull request #1148 from withmorten/miami-githash
miami: add no-git-hash option to premake
2021-06-25 19:51:52 +02:00
withmorten
4bab6d5356
Merge pull request #1147 from withmorten/githash
add no-git-hash option to premake
2021-06-25 19:51:45 +02:00
Sergeanur
2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +03:00
erorcun
9382e86d38 Fix Particle FPE 2021-06-25 18:29:38 +03:00
Nikolay Korolev
8a5afd0db2 sync 2021-06-25 10:15:19 +03:00
withmorten
4e3fc35401 add no-git-hash option to premake 2021-06-25 02:41:40 +02:00
withmorten
84fb48825d add no-git-hash option to premake 2021-06-25 02:40:42 +02:00
Sergeanur
a3ae267e83 Merge branch 'miami' into lcs 2021-06-25 02:41:33 +03:00
Sergeanur
f46461331c Refactor CTimer::Update 2021-06-25 02:40:56 +03:00
Sergeanur
1f082a85cb Refactor CTimer::Update 2021-06-25 02:33:40 +03:00
Sergeanur
4660491243 Timer fix 2021-06-25 02:22:07 +03:00
Sergeanur
7e7a2b74cd Fixes 2021-06-25 01:16:03 +03:00
Sergeanur
e671fe682d Merge remote-tracking branch 'GitHub/miami' into lcs 2021-06-25 00:47:06 +03:00
Sergeanur
e5aa150557 Frontend fix 2021-06-25 00:40:00 +03:00
Sergeanur
14c71f39ff High FPS Fixes 2021-06-25 00:39:47 +03:00
Sergeanur
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur
3ebc475494 Don't restart OAL device when switching EAX 2021-06-24 21:46:46 +03:00
Sergeanur
27df328ec2 Make sampman stream functions default to stream 0 + type fixes 2021-06-24 21:46:21 +03:00
majestic
4351198bf5 forgotten field in CBaseModelInfo::Shutdown 2021-06-24 21:46:21 +03:00
Sergeanur
7c3457257b Small fix 2021-06-24 21:46:21 +03:00
Sergeanur
ba23408007 Fix use of enum in ped comment banks switch 2021-06-24 21:46:21 +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
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
7a351f18ba fix 2021-06-24 21:45:48 +03:00