Sergeanur
7a034142c9
Merge branch 'miami' into lcs
...
# Conflicts:
# premake5.lua
2021-07-18 00:05:51 +03:00
Sergeanur
d0404cbdb7
render -> renderer (original name)
2021-07-18 00:04:26 +03:00
Sergeanur
c937bdbfea
render -> renderer (original name)
2021-07-18 00:03:57 +03:00
Nikolay Korolev
cb7f18f268
fix
2021-07-17 15:49:28 +03:00
Nikolay Korolev
0a23afebb7
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-17 10:06:37 +03:00
withmorten
8018e40ebf
Merge pull request #1217 from Nopey/master
...
Fix debug script loader crashing missions
2021-07-15 23:09:28 +02: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
026a2b3f1f
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/audio/sampman_oal.cpp
# src/core/config.h
2021-07-15 18:07:22 +03: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
17fca82401
Update GXT
2021-07-15 00:50:41 +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
Magnus Larsen
fb5a207abc
Fix NearPed count going negative
2021-07-13 17:45:01 +02:00
erorcun
d2e594db2b
Merge pull request #1236 from Nopey/fix_nearPeds
...
Fix NearPed count going negative
2021-07-13 18:10:59 +03:00
Magnus Larsen
894495689f
Fix NearPed count going negative
2021-07-12 23:51:28 -07:00
Adrian Graber
7f544f9049
Fix artifact path
2021-07-13 01:32:43 +02:00
Adrian Graber
6665b16ba2
Nintendo Switch support
2021-07-13 01:18:49 +02:00
Adrian Graber
207378c947
Use svcGetInfo definitions from libnx
...
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
2021-07-13 00:50:49 +02:00
Adrian Graber
a7b38e1b34
Save current usable memory for Switch application
2021-07-13 00:50:49 +02:00
Adrian Graber
5cab196718
Finish cmake stuff for Switch build
...
* SDL2 for OpenAL not needed anymore
* Add re3_platform_target function and use that instead of manually building NRO
2021-07-13 00:50:49 +02:00
Adrian Graber
3bde84f6c8
Move assets to dedicated folder and redefine GLFW mappings for Switch
2021-07-13 00:50: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
b09b489ae7
Fix WINDOWS -> WIN32 on cmake
2021-07-13 00:50:49 +02:00
Anonymous Maarten
a247d53367
cmake: fix OpenAL on Switch + using X11 on Linux
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
02ec56e8f7
Add platform specific functions for glfw vibration
...
With implementation for Switch vibration through libnx hid/pad API
2021-07-13 00:50:45 +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
withmorten
b69cee3801
fix premake
2021-07-12 23:28:05 +02:00
withmorten
a4b92fe9be
fix premake
2021-07-12 23:26:49 +02:00
withmorten
6c097398d1
fix FixGarages
2021-07-12 22:47:17 +02:00
Nikolay Korolev
91d958bf27
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-12 10:32:01 +03:00
Nikolay Korolev
bef07b6353
small changes
2021-07-12 10:31:48 +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
erorcun
3515363df5
Merge pull request #1218 from withmorten/ini
...
switch out current ini_parser.hpp with pulzed/mINI
2021-07-12 02:40:15 +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
