joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,087 Commits 3 Branches 0 Tags 63 MiB
Commit Graph

4226 Commits

Author SHA1 Message Date
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 f1545daeae Rename unused audio member 2021-08-12 11:46:10 +03:00
Sergeanur 4f8993e19b Replace static_assert with #error 2021-08-12 11:39:34 +03:00
Sergeanur 2ef43e8d1a Fix sampman_null 2021-08-12 11:39:34 +03:00
Sergeanur ce78081a7f Put more things under ifdef 2021-08-12 11:39:34 +03:00
Sergeanur 6c2d179aad Add define to enable/disable external 3d audio simulation 2021-08-12 11:39:34 +03:00
Nikolay Korolev b99edf9a6b mission retry fix 2021-08-12 11:23:10 +03:00
Sergeanur 2eb0390dc9 Fix unset emitting volume for sawmill 2021-08-11 13:35:50 +03:00
Sergeanur f131f70761 Fix unset emitting volume for moan sound 2021-08-11 12:10:48 +03:00
Sergeanur 75f812cfcd Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/RoadBlocks.cpp
#	src/core/Radar.cpp
#	src/core/Radar.h
#	src/peds/Ped.cpp
#	src/peds/Population.cpp
#	src/renderer/Renderer.cpp
#	src/vehicles/CarGen.cpp
 2021-08-11 09:32:59 +03:00
Sergeanur 463fdab6a4 Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2 2021-08-11 08:42:26 +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
withmorten ab5965cc8d fix steam saves 2021-08-09 16:36:15 +02:00
withmorten 858f913fac small fix 2021-08-09 16:34:05 +02:00
Nikolay Korolev 3869369703 Merge remote-tracking branch 'upstream/miami' into miami 2021-08-09 00:07:50 +03:00
Nikolay Korolev 2ee32abf84 fix bug in CCurves 2021-08-09 00:07:02 +03:00
Barracuda6 42ad9c4378 Comment out text following #endif 2021-08-08 18:09:56 +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 4673f509f6 Revert "small fix" 
This reverts commit bd96584433.
 2021-08-08 17:42:32 +03:00
Nikolay Korolev 35dd465c19 Revert "small fix" 
This reverts commit bd96584433.
 2021-08-08 17:41:35 +03:00
Nikolay Korolev 8d9508bda4 Merge branch 'master' into miami 2021-08-08 17:34:28 +03:00
Nikolay Korolev bd96584433 small fix 2021-08-08 17:34:03 +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 668311a444 Merge branch 'master' into miami 2021-08-08 15:44:18 +03:00
Nikolay Korolev 15f770531c fixed tab 2021-08-08 15:42:44 +03:00
Nikolay Korolev 88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Nikolay e947081622
Merge pull request #1266 from Nick007J/miami 
Mission replay
 2021-08-07 18:47:28 +03:00
aap bec1cbc1cb CVehicle fixes and cleanup 2021-08-04 13:54:26 +02:00
aap 4f461bd7be CVehicle fixes and cleanup 2021-08-04 13:54:04 +02:00
Nikolay Korolev 80d00fe31a more cherry-pick fix 2021-08-03 22:20:14 +03:00
Nikolay Korolev 6fbb7da82d cherrypick fixes 2021-08-03 22:14:58 +03:00
Nikolay Korolev 5a22896197 move debug 2021-08-03 21:53:45 +03:00
Nikolay Korolev 8bcbee4ea7 move debug script stuff to a separate file 2021-08-03 21:53:42 +03:00
Nikolay Korolev 5999ddc76d Merge remote-tracking branch 'upstream/miami' into miami 2021-08-03 21:44:18 +03:00
aap 4a047f56bc CPhysical fixes and cleanup 2021-08-02 20:02:57 +02:00
aap 09748d094a CPhysical fixes and cleanup 2021-08-02 20:02:35 +02:00
Sergeanur cb5586e658
Merge pull request #1268 from Nick007J/master 
move debug stuff to a separate file
 2021-08-02 15:06:40 +03:00
Sergeanur 865ce46fdb Fix waypoint disappearing after each save 2021-08-02 14:26:00 +03:00
Nikolay Korolev 2b99f2634b sync 2021-08-01 14:00:16 +03:00
Nikolay Korolev 6d7dec96af move debug script stuff to a separate file 2021-08-01 13:58:15 +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
erorcun 0542b1bd4d Fix radio scroll when player controls disabled 2021-07-31 23:03:59 +03:00
erorcun e80cbf8bb2 Fix radio scroll when player controls disabled 2021-07-31 22:57:54 +03:00
Magnus Larsen d923cd2f24 Allow sector ped count to exceed gap-list size 
This solves the gnNumTempPedList assertion.
To prove this works, change gapTempPedList's length to 12, and visit the
Triad's basketball court.

# Conflicts:
#	src/peds/Ped.cpp
 2021-07-31 20:34:32 +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 3c5bae164f CVisibilityPlugins and CRenderer fixes 2021-07-29 19:43:47 +02:00
aap 30061396e8 CVisibilityPlugins and CRenderer fixes; pulled MLO back in 2021-07-29 19:43:06 +02:00
Sergeanur 7bacf3b6f4 Reverse unused audio functions 2021-07-29 01:52:49 +03:00
Sergeanur cce97588fe Reverse unused audio functions from mobile 
# Conflicts:
#	src/audio/AudioManager.h
 2021-07-29 00:43:04 +03:00
Sergeanur 6cea1de9e6 Reverse unused audio functions from mobile 2021-07-29 00:40:32 +03:00
Sergeanur 81673ab304 Fix comments 2021-07-28 10:36:18 +03:00
Sergeanur 2aa37813d2 cAudioManager declaration reordering 2021-07-28 10:32:43 +03:00
Sergeanur 8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur 61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur 49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur 16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur 9dbaa7a77f PolRadio type fixes 2021-07-27 22:38:57 +03:00
Sergeanur d0666a8702 One more type fix 2021-07-27 22:38:35 +03:00
Sergeanur 16e2e3d091 Type fix 2021-07-27 22:32:47 +03:00
Sergeanur 7aa8d7c073 AudioManager.cpp reordering 2021-07-27 22:29:40 +03:00
Sergeanur 782d38c6b7 Sort AudioCollision functions into original order 2021-07-27 22:02:25 +03:00
Sergeanur 5240dce018 cAudioManager::GetCollisionOneShotRatio cleanup 2021-07-27 22:01:17 +03:00
erorcun 1eedf7f0ae
Merge pull request #1257 from Nopey/fixbugs_pedgaplist 
Fix bug triggering gnNumTempPedList assertion
 2021-07-27 21:51:28 +03:00
Magnus Larsen 55e83982c3 Remove static_assert from previous commit 2021-07-27 00:23:40 -07:00
Magnus Larsen 388dd5cb00 Allow sector ped count to exceed gap-list size 
This solves the gnNumTempPedList assertion.
To prove this works, change gapTempPedList's length to 12, and visit the
Triad's basketball court.
 2021-07-26 19:50:10 -07:00
withmorten d77ed4608f fix 2021-07-26 20:25:36 +02:00
Sergeanur c0488b3190 Fix stuck looking flag when answering phone and idle weapon animation 2021-07-26 20:40:55 +03:00
Sergeanur 1180f32d9c Fix bike kick sound 2021-07-26 11:33:56 +03:00
Sergeanur 371f1be9b3 Fix smooth spray when using chainsaw or when you stop shooting while using free camera and PC controls 2021-07-26 09:54:04 +03:00
Sergeanur 250727c9ca Fix muzzleflash rotation 2021-07-26 09:52:39 +03:00
Sergeanur f7a2c265b3 Remove deceiving comment 2021-07-26 09:16:43 +03:00
Sergeanur f19a1aebd4 Remove deceiving comment 2021-07-26 09:16:20 +03:00
Sergeanur bc3734cae3 Fix smooth spray when shooting with colt or usi while using PC controls 2021-07-26 09:13:16 +03:00
Sergeanur cafc0f3c10 Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:28:01 +03:00
Sergeanur 123f2fda9b Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:22:57 +03:00
Sergeanur 1aac4d802f Fix Tommy looking at one spot due to crouching + shooting 2021-07-26 07:41:34 +03:00
Sergeanur f73dfa12e6 Make cars and peds to not despawn when you look away 2021-07-26 04:43:26 +03:00
Sergeanur 6a94299eac Fix 2021-07-26 04:42:15 +03:00
Sergeanur ed9c911a0e Fix traffic light corona facing wrong side 2021-07-26 04:40:23 +03:00
Sergeanur a064b3a687 Audio changes: 
- Reorder AudioCollision.cpp functions into original order
- Add missing cAudioCollision::Reset()
- Move cAudioCollision ctor into .h (like original)
- Fix argument types for ped comment functions and more
- Fix wrong names of ped comment functions
- Fix incorrect ped comments
- Remove getters
- Reorder declarations of cAudioManager
- Wrap PC only functions around ifdef
- Add cAudioManager methods from PS2 and mobile
 2021-07-26 04:34:55 +03:00
Sergeanur a510a03b8a Small fix 2021-07-25 22:27:00 +03:00
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
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 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 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
withmorten 8018e40ebf
Merge pull request #1217 from Nopey/master 
Fix debug script loader crashing missions
 2021-07-15 23:09:28 +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 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
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 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 6c097398d1 fix FixGarages 2021-07-12 22:47:17 +02: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
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
withmorten f686065769 get rid of // done comments in audiomanager.h 2021-07-11 03:59:37 +02:00
withmorten 3194fdb2c1 fix the fix (and another fix) 2021-07-11 03:34:43 +02:00
withmorten 58de524d70 tiny diff fix 2021-07-11 03:26:59 +02:00
withmorten d7ceb4870c tiny diff fixes 2021-07-11 03:26:21 +02:00