aap
|
c707f92d0a
|
disable movies by default; update librw
|
2021-08-17 23:22:36 +02:00 |
|
Sergeanur
|
0c55f331cf
|
Merge branch 'miami' into lcs
|
2021-08-16 14:32:15 +03:00 |
|
Sergeanur
|
cd0a765f66
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioCollision.cpp
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
# src/audio/AudioManager.h
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/core/Frontend.cpp
# src/core/MenuScreens.cpp
# src/core/MenuScreensCustom.cpp
# src/core/common.h
# src/core/config.h
# src/vehicles/Automobile.cpp
|
2021-08-16 14:13:31 +03:00 |
|
Sergeanur
|
2633295ada
|
Merge branch 'miami' into lcs
|
2021-08-16 10:33:54 +03:00 |
|
Sergeanur
|
76f2191476
|
Remove not needed entry from config
|
2021-08-16 10:31:35 +03:00 |
|
Sergeanur
|
bcb5b4f94d
|
Remove not needed entry from config
|
2021-08-16 10:29:44 +03:00 |
|
Sergeanur
|
d7e764d519
|
Merge branch 'miami' into lcs
# Conflicts:
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# src/audio/AudioLogic.cpp
# src/core/config.h
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
|
2021-08-16 10:09:39 +03:00 |
|
aap
|
f4894952fc
|
Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs
|
2021-08-16 00:25:14 +02:00 |
|
aap
|
2f92ccecb1
|
work on CAutomobile
|
2021-08-16 00:19:09 +02:00 |
|
Nikolay Korolev
|
8e2ed40f66
|
small revision
|
2021-08-16 01:03:08 +03:00 |
|
erorcun
|
747ae04279
|
Fix premature .ini saving leading to missing bindings
|
2021-08-15 04:07:48 +03:00 |
|
erorcun
|
0db14d718c
|
All the sliders, unite
|
2021-08-15 03:39:38 +03:00 |
|
erorcun
|
fd52285074
|
Fix premature .ini saving leading to missing bindings
|
2021-08-15 03:29:49 +03:00 |
|
erorcun
|
4a5f7464c1
|
Switch PR & remove X11 part from CMakeLists
|
2021-08-14 18:09:07 +03:00 |
|
Nikolay Korolev
|
39d2c427e5
|
merge miami
|
2021-08-14 17:18:34 +03:00 |
|
Nikolay Korolev
|
958e2f36bb
|
ginput script
|
2021-08-14 16:44:09 +03:00 |
|
Nikolay Korolev
|
ba859dc3b5
|
fix
|
2021-08-14 16:31:34 +03:00 |
|
erorcun
|
3a95c77c9e
|
Revert "map memory usage high default"
This reverts commit 81c6c5e47a.
|
2021-08-13 00:51:05 +03:00 |
|
erorcun
|
df89e5091e
|
Revert "map memory usage high default"
This reverts commit b7c7c883d7.
|
2021-08-13 00:16:16 +03:00 |
|
withmorten
|
81c6c5e47a
|
map memory usage high default
|
2021-08-12 23:08:33 +02:00 |
|
withmorten
|
b7c7c883d7
|
map memory usage high default
|
2021-08-12 23:07:54 +02:00 |
|
Sergeanur
|
4141caa4d6
|
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/core/Radar.cpp
# src/core/config.h
|
2021-08-12 16:04:25 +03:00 |
|
Sergeanur
|
92c5cf1877
|
Sync audio changes from master
|
2021-08-12 14:57:16 +03:00 |
|
Sergeanur
|
43fbf297c8
|
Waypoint text fix
|
2021-08-12 14:15:49 +03:00 |
|
Sergeanur
|
033d89a9ab
|
Refactor cAudioManager::ProcessActiveQueues, fix doppler effect
|
2021-08-12 13:01:07 +03:00 |
|
Sergeanur
|
9a1b826021
|
Merge remote-tracking branch 'origin/miami' into lcs
|
2021-08-12 11:43:17 +03:00 |
|
Sergeanur
|
4f8993e19b
|
Replace static_assert with #error
|
2021-08-12 11:39:34 +03:00 |
|
Sergeanur
|
ce78081a7f
|
Put more things under ifdef
|
2021-08-12 11:39:34 +03:00 |
|
Nikolay Korolev
|
b99edf9a6b
|
mission retry fix
|
2021-08-12 11:23:10 +03:00 |
|
Sergeanur
|
2c79080e1b
|
Merge branch 'miami' into lcs
# Conflicts:
# src/core/Radar.cpp
# src/core/Radar.h
|
2021-08-11 09:36:58 +03:00 |
|
Sergeanur
|
d7a28c4d2b
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
|
2021-08-11 08:35:01 +03:00 |
|
Sergeanur
|
0544beb00d
|
Add sprite to the waypoint marker
|
2021-08-11 08:15:30 +03:00 |
|
Sergeanur
|
1f98f01dcb
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
|
2021-08-09 18:14:19 +03:00 |
|
Sergeanur
|
8ea411e4c5
|
Add sprite to the waypoint marker
|
2021-08-09 18:07:42 +03:00 |
|
Nikolay Korolev
|
c851d9a6ba
|
Merge branch 'miami' into lcs
|
2021-08-09 00:08:42 +03:00 |
|
Sergeanur
|
76a22c0d13
|
Fix
|
2021-08-08 18:02:23 +03:00 |
|
Sergeanur
|
f887d515fa
|
Sync fix from miami
|
2021-08-08 17:53:01 +03:00 |
|
Nikolay Korolev
|
68db861c45
|
merge
|
2021-08-08 17:29:57 +03:00 |
|
Nikolay Korolev
|
873840a6a5
|
merge
|
2021-08-08 17:19:49 +03:00 |
|
Nikolay Korolev
|
947f67dfb7
|
small fix
|
2021-08-08 17:17:20 +03:00 |
|
Nikolay Korolev
|
478bdcc1ca
|
merge
|
2021-08-08 17:14:21 +03:00 |
|
Nikolay Korolev
|
63046894b0
|
small refactoring
|
2021-08-08 16:57:37 +03:00 |
|
Nikolay Korolev
|
74f00c3c63
|
merge
|
2021-08-08 15:46:47 +03:00 |
|
Nikolay Korolev
|
88b4c7b50b
|
merge
|
2021-08-08 15:34:02 +03:00 |
|
Nikolay Korolev
|
9cc1201892
|
merge
|
2021-08-08 13:38:21 +03:00 |
|
Nikolay Korolev
|
c69edce800
|
mission replay
|
2021-08-07 20:24:01 +03:00 |
|
Nikolay Korolev
|
5999ddc76d
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2021-08-03 21:44:18 +03:00 |
|
aap
|
0338d4c393
|
CPhysical almost done
|
2021-08-02 20:05:39 +02:00 |
|
Sergeanur
|
865ce46fdb
|
Fix waypoint disappearing after each save
|
2021-08-02 14:26:00 +03:00 |
|
erorcun
|
418bf3ab69
|
Fix R* optimization that prevents peds to spawn
|
2021-08-01 13:56:24 +03:00 |
|