mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-19 17:51:56 +00:00
Code Issues Projects Releases Wiki Activity
5,619 Commits 3 Branches 0 Tags 62 MiB
lcs
Commit Graph

4688 Commits

Author SHA1 Message Date
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
7b9d8c5a1f merge 2021-08-08 17:36:08 +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
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
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 Korolev
9cc1201892 merge 2021-08-08 13:38:21 +03:00
Nikolay Korolev
e6b1a0691b lcs bridge 2021-08-08 13:08:47 +03:00
Nikolay Korolev
0c4ab5b609 disable mission replay for lcs 2021-08-08 10:51:04 +03:00
Nikolay Korolev
2672504e8a more cherry-pick fix 2021-08-07 20:40:27 +03:00
Nikolay Korolev
a7e86e0510 cherrypick fixes 2021-08-07 20:40:18 +03:00
Nikolay Korolev
827f0ffbb6 move debug 2021-08-07 20:35:01 +03:00
Nikolay Korolev
883e8390c9 move debug script stuff to a separate file 2021-08-07 20:26:33 +03:00
Nikolay Korolev
c69edce800 mission replay 2021-08-07 20:24:01 +03:00
Nikolay Korolev
747705d430 lcs specific hack 2021-08-07 20:03:45 +03:00
Nikolay
e947081622
Merge pull request #1266 from Nick007J/miami 
Mission replay
 2021-08-07 18:47:28 +03:00
aap
621f941ff7 CVehicle done 2021-08-04 13:56:29 +02: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
0338d4c393 CPhysical almost done 2021-08-02 20:05:39 +02: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
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
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
aap
bf035b8167
Merge pull request #1259 from aap/lcs 
CVisibilityPlugins, CRenderer, some fixes
 2021-07-31 19:08:01 +02: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
Sergeanur
e8dcc8432d Possible crashfix with wanted level 2021-07-30 20:36:07 +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
aap
30061396e8 CVisibilityPlugins and CRenderer fixes; pulled MLO back in 2021-07-29 19:43:06 +02:00
Sergeanur
b77d93ba4a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-29 01:59:20 +03: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
04126cd18a Merge branch 'miami' into lcs 2021-07-28 10:32:58 +03:00
Sergeanur
2aa37813d2 cAudioManager declaration reordering 2021-07-28 10:32:43 +03:00
Sergeanur
92679555b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/MusicManager.cpp
 2021-07-28 09:42:24 +03:00
Sergeanur
8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur
7adc85995f Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2021-07-28 09:24:23 +03:00
Sergeanur
61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur
98003d0d41 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:56:42 +03:00
Sergeanur
49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur
029e315f0a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:42:18 +03:00
Sergeanur
16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur
f82c3c8ea7 Merge branch 'miami' into lcs 2021-07-27 22:39:14 +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
fbb42085bd Merge branch 'miami' into lcs 2021-07-27 22:30:45 +03:00
Sergeanur
7aa8d7c073 AudioManager.cpp reordering 2021-07-27 22:29:40 +03:00
Nikolay Korolev
c4f5cbce5e fix 2021-07-27 22:27:13 +03:00
Nikolay Korolev
c26a57fb9f fix 2021-07-27 22:18:24 +03:00
Sergeanur
ad2ccdb44a Merge branch 'miami' into lcs 2021-07-27 22:02:45 +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
Sergeanur
ec7d702185
Merge pull request #1255 from Nick007J/lcs 
low effort save support
 2021-07-27 20:59:08 +03:00
Sergeanur
6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +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
Nikolay Korolev
0461a36a4e fix 2021-07-26 21:59:56 +03:00
Nikolay Korolev
9e374491c5 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-26 21:58:37 +03: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
c234cb4663 Law enforcers and generic female ped comments 2021-07-25 22:16:02 +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
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
b69222e017 friggin the riggin 2021-07-25 11:58:03 +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
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
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
6f0f9d7d69 Merge remote-tracking branch 'origin/miami' into lcs 2021-07-12 23:36:37 +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
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
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
withmorten
8a114514d9 fix hotring flap stat line 2021-07-11 00:30:26 +02:00
erorcun
9f0a96ac89 Physical: division by zero fix 2021-07-10 23:27:00 +03:00
erorcun
e9baf31ad8 Physical: division by zero fix 2021-07-10 23:24:27 +03:00
erorcun
d82dbf91ef Merge/sync fixes after threaded audio 2021-07-10 23:14:13 +03:00
erorcun
db4ae18e5d Remove waiting for stream closure in multi-thread audio 2021-07-10 23:14:08 +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
Magnus Larsen
12efd1209b Fix Cheat menu debug script loader 2021-07-10 10:18:32 -07:00
Magnus Larsen
33c45e4ae0 Fix debug script loader crashing missions 
* open_script is now exposed in Script.h, perhaps it should be namespaced
as a static method on CTheScripts? I'm unsure what is preferred.
* I've moved the joypad code out of open_script to prevent buttons held
  down at mission load time from changing the scriptToLoad.
 2021-07-10 09:34:17 -07: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
Sergeanur
4981fe3091 Remove redundant SampleManager.InitialiseChannel call 2021-07-10 02:06:35 +03:00
withmorten
ffe199290b fix jittery cars at 15fps 2021-07-09 18:51:27 +02:00
withmorten
37b6d491e7 fix jittery cars at 15fps 2021-07-09 18:50:33 +02: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
7a1ff3b2ad Mission audio cleanup + sound pause 2021-07-09 00:02:35 +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
withmorten
79c010f082 fix macro redefinition warnings on win-glfw build 2021-07-08 01:44:55 +02:00
withmorten
f9a2f1daf7 fix macro redefinition warnings on win-glfw build 2021-07-08 01:40:58 +02:00
withmorten
e6544a6983 fix sampman_null build 2021-07-07 01:59:16 +02:00
withmorten
dadc56ccf9 fix sampman_null build 2021-07-07 01:54:16 +02: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
Sergeanur
77f31105de Fix overflow in audio code 2021-07-03 15:57:48 +03:00
Sergeanur
3ed4cdf109 Fix overflow in audio code 2021-07-03 15:57:08 +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
43631ba203 smol fix 2 2021-07-03 01:40:26 +02:00
withmorten
f9f854c4a8 smol fix 2021-07-03 01:36:44 +02: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
51042e15aa Remove redundant part of 'Sanitizer fixes 2' 2021-07-03 01:53:43 +03:00
erorcun
a8549e86a7 Sanitizer fixes 2 2021-07-03 01:42:24 +03:00
erorcun
424a6d90bd Peds: Efforts to find the reason of crashes on GCC 7.5.0 
* Prevent deleted peds to be in nearPeds list (was always needed, might be unrelated to crashes)
* Add asserts to nearPeds and PedIK ctor (crash reasons)
* Shouldn't fix reported crashes since they were caused by null peds.
 2021-07-03 01:30:54 +03:00
erorcun
70fa7fc239 Sanitizer fixes 2021-07-03 01:28:32 +03:00
erorcun
4eea98c66b Peds: Efforts to find the reason of crashes on GCC 7.5.0 
* Prevent deleted peds to be in nearPeds list (was always needed, might be unrelated to crashes)
* Add asserts to nearPeds and PedIK ctor (crash reasons)
* Shouldn't fix reported crashes since they were caused by null peds.
 2021-07-02 23:56:54 +03:00
Nikolay Korolev
10cc444482 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-02 11:28:46 +03:00
Sergeanur
987e09515b Fix use of integer in RemoveBuildingsNotInArea call 2021-07-02 10:33:45 +03:00
Sergeanur
9ea3549743 GameLogic - type fixes 2021-07-02 10:30:39 +03:00
Sergeanur
ae4bfef590 Refactor OnscreenTimer 2021-07-02 10:22:34 +03:00
Sergeanur
7df71c9673 Refactor OnscreenTimer 2021-07-02 10:18:22 +03:00
Sergeanur
8e6e46a919 Fix collision loading for mission entities 2021-07-02 00:18:38 +03:00
withmorten
65219365db fix compilation when ctype.h is included 2021-07-01 21:51:52 +02:00
withmorten
f7816c577f fix compilation when ctype.h is included 2021-07-01 21:49:01 +02: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
withmorten
2d38eb923d zero out work_buff before writing padding in save 2021-07-01 18:09:32 +02:00
withmorten
2071abd295 zero out work_buff before writing padding in save 2021-07-01 18:08:48 +02:00
Sergeanur
dd790b00e5 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/MusicManager.cpp
 2021-06-30 21:46:08 +03:00
Sergeanur
cb72fee941 fix 2021-06-30 21:45:19 +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
Sergeanur
b1c9340fd3 Fix unused code 2021-06-30 21:16:48 +03:00
withmorten
abe57fefa0 fix some string sizes to be MAX_PATH 2021-06-30 16:28:07 +02:00
withmorten
3383d8c6e7 fix some string sizes to be MAX_PATH 2021-06-30 16:23:44 +02:00
Sergeanur
d31a7e24a8 Fix text in elevator cam 2021-06-30 13:53:10 +03:00
erorcun
cac1c5bd42 Saner loop 2021-06-30 04:12:59 +03:00
erorcun
9f0daee186 Sanitizer fixes 2021-06-30 03:31:10 +03:00
withmorten
de4699a97e fix no VALIDATE_SAVE_SIZE build 2021-06-28 18:14:15 +02:00
erorcun
fdbd414299 Fix MP3 finding stack crash 2021-06-28 17:44:48 +03:00
erorcun
22e8e0eff8 Fix MP3 finding stack crash 2021-06-28 17:35:25 +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
1c5a864598 Fix script load 2021-06-28 05:23:58 +03: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