mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-03 23:55:42 +00:00
Code Issues Projects Releases Wiki Activity
5592 commits 3 branches 0 tags 63 MiB
Commit graph

5592 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur
5032d24ad8 Fix 2021-07-25 19:59:02 +03:00
Sergeanur
601f63f4fb Sync fix from master 2021-07-25 19:50:00 +03:00
Nikolay Korolev
1619d2395e Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-25 11:58:41 +03:00
Nikolay Korolev
b69222e017 friggin the riggin 2021-07-25 11:58:03 +03:00
Nikolay
d86637daea
Merge pull request #1025 from Nick007J/lcs 
Ferries
 2021-07-25 11:57:21 +03:00
Nikolay Korolev
dc729009ac Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-24 01:02:23 +03:00
Sergeanur
bf757fc960 Fix CPlayerInfo distance types 2021-07-24 00:59:19 +03:00
Nikolay Korolev
a7e673c2ec sync 2021-07-24 00:47:04 +03:00
Sergeanur
3adf37a3a9 Fix aiming with flamethrower with PC controls 2021-07-22 22:54:30 +03:00
Sergeanur
aec797671e Fix aiming with minigun and flamethrower with PC controls 2021-07-22 22:15:27 +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
Sergeanur
cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
Sergeanur
1d1f10d68c Fixes from miami 2021-07-22 20:56:15 +03:00
Sergeanur
5e34b1efcf Possible fix of RemoveAndAdd crash 2021-07-22 20:37:49 +03:00
Sergeanur
953e4fc4ff Fix falling damage 2021-07-22 20:07:51 +03:00
Sergeanur
bbbe9b2632 Fix enum use 2021-07-22 07:06:54 +03:00
Sergeanur
a1444b992f Fix Predator shooting sound 2021-07-22 07:01:04 +03:00
withmorten
76558e9313 fix garbage data written in garage save block 2021-07-19 23:44:01 +02:00
withmorten
a437d2bc26 fix garbage data written in garage save block 2021-07-19 23:43:51 +02:00
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