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
erorcun
192190769d
Add ped and car density slider to menu, remove dumb collision "optimization"
2021-08-01 13:56:09 +03:00
Nikolay Korolev
1479093d33
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-01 12:54:20 +03:00
Nikolay Korolev
70080f1fdb
mission replay
2021-08-01 12:54:05 +03:00
Sergeanur
a481b900b9
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/CarCtrl.cpp
# src/modelinfo/MloModelInfo.cpp
# src/modelinfo/MloModelInfo.h
# src/renderer/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
# src/rw/VisibilityPlugins.h
2021-07-31 20:43:52 +03:00
Sergeanur
835fa4e74b
Make cars and peds to not despawn when you look away
...
# Conflicts:
# src/control/CarCtrl.cpp
# src/core/config.h
# src/peds/Population.cpp
2021-07-31 20:32:13 +03:00
Sergeanur
232b5a04ba
Merge pull request #1251 from Sergeanur/HigherDrawDist
...
Make cars and peds to not despawn when you look away
2021-07-31 20:07:29 +03:00
Sergeanur
9d25e7f315
Merge pull request #1248 from davicr/radar-cutscene-bugfix
...
Fix blip rendering during scripted sequences
2021-07-31 20:06:20 +03:00
aap
3f3e258d77
CVisibilityPlugins, CRenderer, some fixes
2021-07-29 19:59:34 +02:00
aap
3c5bae164f
CVisibilityPlugins and CRenderer fixes
2021-07-29 19:43:47 +02:00
Nikolay Korolev
c4f5cbce5e
fix
2021-07-27 22:27:13 +03:00
withmorten
d77ed4608f
fix
2021-07-26 20:25:36 +02:00
Sergeanur
f73dfa12e6
Make cars and peds to not despawn when you look away
2021-07-26 04:43:26 +03:00
Nikolay Korolev
c7d3b88cb7
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-25 21:44:31 +03:00
Nikolay Korolev
bf4b39781b
low effort save support
2021-07-25 21:44:21 +03:00
Sergeanur
d83b8cf940
Merge branch 'miami' into lcs
...
# Conflicts:
# src/renderer/Hud.cpp
2021-07-25 21:01:00 +03:00
Nikolay Korolev
b69222e017
friggin the riggin
2021-07-25 11:58:03 +03:00
Sergeanur
bf757fc960
Fix CPlayerInfo distance types
2021-07-24 00:59:19 +03:00
Davi
bd3c3849fe
Properly fix blip rendering during scripted sequences
...
Changes conditionals from "DrawBlips" and "ShowRadarTrace", "ShowRadarTraceWithHeight" to allow blips to be rendered during scripted sequences when "MENU_MAP" is enabled.
2021-07-22 16:10:15 -03:00
withmorten
a437d2bc26
fix garbage data written in garage save block
2021-07-19 23:43:51 +02:00
Nikolay Korolev
0a23afebb7
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-17 10:06:37 +03:00
withmorten
ec5a07b049
Merge remote-tracking branch 'origin/miami' into lcs
2021-07-15 19:11:32 +02:00
withmorten
c8cb1ed013
Merge pull request #1219 from withmorten/miami-ini
...
miami: switch out current ini_parser.hpp with pulzed/mINI
2021-07-15 18:56:14 +02:00
Sergeanur
780cd225e9
Make PS2 VB files work together with PC audio files
2021-07-15 18:06:12 +03:00
Sergeanur
2ce36a48b9
Make PS2 VB files work together with PC audio files
2021-07-15 18:06:02 +03:00
Sergeanur
3377709c4b
Merge branch 'miami' into lcs
2021-07-15 00:51:01 +03:00
Sergeanur
02c4ada807
Remove stupid cast
2021-07-15 00:49:46 +03:00
Sergeanur
4f78733836
Remove stupid cast
2021-07-15 00:47:11 +03:00
Nikolay Korolev
81aece7117
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-13 19:43:48 +03:00
Adrian Graber
6665b16ba2
Nintendo Switch support
2021-07-13 01:18:49 +02:00
Adrian Graber
a99a04ed49
Add Switch controller asset and configuration
...
* Add GXT string for the Nintendo Switch Controller
* Add frontend and button textures for Nintendo Switch controllers
* Fix wrong #ifndef when hiding screen resolution option on GTA_HANDHELD
2021-07-13 00:50:49 +02:00
Adrian Graber
ca5d3c8811
Replace GTA_SWITCH macro and use GAMEPAD_MENU
...
* Replace GTA_SWITCH macro with __SWITCH__ for platform specific stuff and GTA_HANDHELD for the rest (which could be used by other ports)
* Use GAMEPAD_MENU on GTA_HANDHELD, which will replace the usual controller setup (which contains some useless features for handhelds)
* Fix some identation inconsistencies
* Disable PC_PLAYER_CONTROLS on GTA_HANDHELD builds
2021-07-13 00:50:49 +02:00
Adrian Graber
6da20aa723
Enable Gamepad Menu on Switch
2021-07-13 00:49:21 +02:00
Adrian Graber
28f266302f
Add Nintendo Switch initial support
2021-07-13 00:49:13 +02:00
withmorten
523b23339c
disable USE_CUTSCENE_SHADOW_FOR_PED if COMPATIBLE_SAVES isn't defined
2021-07-13 00:21:11 +02:00
Sergeanur
c982700a69
Enable cutscene shadows
2021-07-13 01:00:00 +03:00
withmorten
6f0f9d7d69
Merge remote-tracking branch 'origin/miami' into lcs
2021-07-12 23:36:37 +02:00
Nikolay Korolev
91d958bf27
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-12 10:32:01 +03:00
withmorten
2f7ae611ed
Vanilla config for Windows and win-x86 only
2021-07-12 04:26:27 +02:00
withmorten
f50026828a
Vanilla config for Windows and win-x86 only
2021-07-12 04:24:10 +02:00
Sergeanur
55d30a11ec
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/AudioManager.h
# src/control/Garages.cpp
# src/control/Garages.h
# src/control/Script5.cpp
# src/core/config.h
# utils/gxt/american.txt
# utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
withmorten
ac3905123e
fix
2021-07-12 03:10:02 +02:00
Sergeanur
3f5fdc39a5
Reorganize config.h
2021-07-12 03:58:34 +03:00
Sergeanur
b4364c3672
Reorganize config.h
2021-07-12 03:34:37 +03:00
withmorten
6f52ad190e
miami: switch out current ini_parser.hpp with pulzed/mINI
2021-07-12 01:23:46 +02:00
withmorten
c0cbf8045f
switch out current ini_parser.hpp with pulzed/mINI
2021-07-12 01:19:22 +02:00
erorcun
02e84b4b97
Merge pull request #1150 from withmorten/miami-saves
...
miami: finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-12 01:07:32 +03:00
erorcun
a8fd3f828a
Merge pull request #1149 from withmorten/saves
...
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-12 01:06:59 +03:00
erorcun
291213ed40
Unite all sliders
2021-07-12 00:51:45 +03:00
erorcun
2a6f9c2757
Add ped and car density slider to menu, remove dumb collision "optimization"
2021-07-12 00:12:25 +03:00
Nikolay Korolev
776d46aacb
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-11 10:23:59 +03:00
withmorten
8a114514d9
fix hotring flap stat line
2021-07-11 00:30:26 +02:00
erorcun
d82dbf91ef
Merge/sync fixes after threaded audio
2021-07-10 23:14:13 +03:00
erorcun
5458632c40
Multi-threaded audio fixes
2021-07-10 23:13:51 +03:00
erorcun
ab73c2f539
Multi-threaded audio streams
...
Under MULTITHREADED_AUDIO define.
2021-07-10 23:13:42 +03:00
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
