Commit graph

5412 commits

Author SHA1 Message Date
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
erorcun
cc235be3aa Less invasive red tint on Delete Game page 2021-06-27 18:14:34 +03:00
erorcun
53a4b6936b Revert "Use PS2-y global names on SampMan"
We know that they changed all those names on PC.

This reverts commit 091a65996e.
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
Leandro Guedes
ab38b0089e reVC: Update Linux 64bit build download link 2021-06-26 19:24:50 +02: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 af7573ddbe.
2021-06-26 19:14:46 +02:00
Sergeanur
090fa619b4
Merge pull request #1155 from leanndroguedes/master
re3: Update Linux 64bit build download link
2021-06-26 18:22:31 +03:00
Leandro Guedes
2c92accb8e
re3: Update Linux 64bit build download link 2021-06-26 12:11:29 -03: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
withmorten
d8f5e86ede swap out codewarrior reVC.mcp with xml export 2021-06-26 03:43:40 +02:00
withmorten
036eff2c48 swap out codewarrior re3.mcp with xml export 2021-06-26 03:32:08 +02:00
withmorten
85d60b36da fix tabs in premake 2021-06-26 03:20:18 +02:00
withmorten
fff899ec16 fix tabs in premake 2021-06-26 03:19:52 +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 2b67aba94c.
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
erorcun
0b057f34c9
Update invite link 2021-06-25 16:24:26 +03:00
erorcun
6152f02333
Update invite link 2021-06-25 16:22:20 +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
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
withmorten
a83ecc123d fix cmake build? 2021-06-25 02:32:41 +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