Commit graph

4721 commits

Author SHA1 Message Date
Nikolay Korolev
10cc444482 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-02 11:28:46 +03:00
Sergeanur
dd790b00e5 Merge branch 'miami' into lcs
# Conflicts:
#	src/audio/MusicManager.cpp
2021-06-30 21:46:08 +03:00
Sergeanur
cb72fee941 fix 2021-06-30 21:45:19 +03: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
Sergeanur
a73a2c9179 Pause radio when game is paused 2021-06-30 21:21:45 +03:00
Sergeanur
b1c9340fd3 Fix unused code 2021-06-30 21:16:48 +03:00
withmorten
abe57fefa0 fix some string sizes to be MAX_PATH 2021-06-30 16:28:07 +02:00
Sergeanur
d31a7e24a8 Fix text in elevator cam 2021-06-30 13:53:10 +03:00
erorcun
cac1c5bd42 Saner loop 2021-06-30 04:12:59 +03:00
erorcun
9f0daee186 Sanitizer fixes 2021-06-30 03:31:10 +03:00
withmorten
de4699a97e fix no VALIDATE_SAVE_SIZE build 2021-06-28 18:14:15 +02:00
erorcun
fdbd414299 Fix MP3 finding stack crash 2021-06-28 17:44:48 +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
1c5a864598 Fix script load 2021-06-28 05:23:58 +03:00
Sergeanur
eaebaa6db3 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
2021-06-28 05:16:21 +03:00
Sergeanur
f8297df9c5 Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
Sergeanur
3e9c983f5c
Merge pull request #1153 from kusst/texread
Make colors in texture conversion dialog more LCSy.
2021-06-27 23:24:16 +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
05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03:00
Leandro Guedes
ab38b0089e reVC: Update Linux 64bit build download link 2021-06-26 19:24:50 +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
d8f5e86ede swap out codewarrior reVC.mcp with xml export 2021-06-26 03:43:40 +02:00
withmorten
85d60b36da fix tabs in premake 2021-06-26 03:20:18 +02:00
Sergeanur
225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +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
erorcun
9382e86d38 Fix Particle FPE 2021-06-25 18:29:38 +03:00
erorcun
0b057f34c9
Update invite link 2021-06-25 16:24:26 +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
Sergeanur
940d6bf6d3 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-25 03:40:41 +03:00
withmorten
5341840943 fix cmake build. 2021-06-25 02:38:50 +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
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
1254c1202a Merge branch miami into lcs 2021-06-24 21:52:24 +03:00
Sergeanur
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00