withmorten
|
011aafa043
|
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
|
2021-07-10 17:30:27 +02:00 |
|
withmorten
|
6f103a3b82
|
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
|
2021-07-10 02:06:43 +02:00 |
|
Sergeanur
|
71d1b46417
|
Merge branch 'miami' into lcs
# Conflicts:
# utils/gxt/german.txt
|
2021-07-10 02:07:14 +03:00 |
|
withmorten
|
0b269571d7
|
add librw defines to vanilla defines undefs
|
2021-07-09 18:05:26 +02:00 |
|
withmorten
|
e2ae17d994
|
add librw defines to vanilla defines undefs
|
2021-07-09 18:02:36 +02:00 |
|
Sergeanur
|
d781db6c0f
|
Merge branch 'miami' into lcs
# Conflicts:
# README.md
# premake5.lua
|
2021-07-09 00:05:26 +03:00 |
|
Sergeanur
|
72f6780905
|
Use CPad functions to check key states in script loader
|
2021-07-08 03:37:14 +03:00 |
|
Sergeanur
|
47f153fe76
|
Use CPad functions to check key states in script loader
|
2021-07-08 03:24:47 +03:00 |
|
mssx86
|
c5e896c420
|
fix: add missing limits.h includes to enable bulding on musl.
|
2021-07-05 22:40:21 +02:00 |
|
erorcun
|
386b113603
|
Merge pull request #1187 from mssx86/musl_fix
fix: add missing limits.h includes to enable bulding on musl.
|
2021-07-05 20:50:18 +03:00 |
|
Nikolay Korolev
|
62425b5866
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-07-04 15:24:54 +03:00 |
|
withmorten
|
70876d3cde
|
fix screenshot name
|
2021-07-03 16:43:35 +02:00 |
|
Sergeanur
|
5d5e0f62e8
|
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
|
2021-07-03 16:39:22 +03:00 |
|
withmorten
|
060c1181bc
|
fix previous PED_SKIN commit, add comments
|
2021-07-03 02:52:54 +02:00 |
|
erorcun
|
1c0878f65b
|
Sanitizer fixes 2
|
2021-07-03 02:57:32 +03:00 |
|
withmorten
|
63d9d9c148
|
disable PED_SKIN and PEDS_REPORT_CRIMES_ON_PHONE when COMPATIBLE_SAVES is disabled
|
2021-07-03 01:32:04 +02:00 |
|
erorcun
|
a8549e86a7
|
Sanitizer fixes 2
|
2021-07-03 01:42:24 +03:00 |
|
Nikolay Korolev
|
10cc444482
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-07-02 11:28:46 +03:00 |
|
Sergeanur
|
3988fec6e7
|
Fix sound of water when changing MSAA or windowed/fullscreen mode
|
2021-07-01 21:39:15 +03:00 |
|
mssx86
|
b8e80a67ea
|
fix: add missing limits.h includes to enable bulding on musl.
|
2021-07-01 20:12:28 +03:00 |
|
Sergeanur
|
a3964dfd4a
|
Pause radio when game is paused
|
2021-06-30 21:36:11 +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 |
|
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 |
|
withmorten
|
cb3b3855b8
|
rename clamp macro to Clamp to fix compilation with g++11
|
2021-06-28 13:31:35 +02: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 |
|
erorcun
|
cc235be3aa
|
Less invasive red tint on Delete Game page
|
2021-06-27 18:14:34 +03:00 |
|
Nikolay Korolev
|
73e112a217
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-06-27 14:53:43 +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
|
f3a931e1c9
|
Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe.
|
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 |
|
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 2b67aba94c.
|
2021-06-26 00:25:59 +03: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 |
|
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 |
|