mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-03-21 16:07:32 +00:00
Code Issues Projects Releases Wiki Activity
5080 commits 3 branches 0 tags 56 MiB
Commit graph

4219 commits

Author SHA1 Message Date
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 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
erorcun 53a4b6936b Revert "Use PS2-y global names on SampMan" 
We know that they changed all those names on PC.

This reverts commit 091a65996e.
 2021-06-27 17:59:50 +03:00
erorcun 091a65996e Use PS2-y global names on SampMan 2021-06-27 17:53:14 +03:00
erorcun 3587cb029e Remove waiting for stream closure in multi-thread audio 2021-06-27 14:42:52 +03:00
erorcun a923728877 Fix map texture leak 2021-06-27 00:34:46 +03:00
erorcun 05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03:00
withmorten 4819d195d8 fix WriteSaveHeader 2021-06-26 19:19:45 +02:00
withmorten f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup"" 
This reverts commit af7573ddbe.
 2021-06-26 19:14:46 +02:00
erorcun 9c8ef3cca0
Merge pull request #1151 from erorcun/miami 
Multi-threaded audio streams on OAL
 2021-06-26 16:28:43 +03:00
erorcun 107c4df69c Multi-threaded audio streams 
Under MULTITHREADED_AUDIO define.
 2021-06-26 16:24:23 +03:00
withmorten 9ab4f1a2d9 fix screenshot name space 2021-06-26 13:13:43 +02:00
withmorten 171d9fd036 fix screenshot name space 2021-06-26 13:13:07 +02:00
Sergeanur 225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
Sergeanur 6cb8c11285 Fix premature CTimer calls 2021-06-26 04:09:45 +03:00
Sergeanur 3092b9a46e Small timer fix 2021-06-26 01:56:29 +03:00
erorcun 9b5caa190e Pool fixes 
Mostly for Linux
 2021-06-26 00:27:20 +03:00
erorcun af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup" 
This reverts commit 2b67aba94c.
 2021-06-26 00:25:59 +03:00
withmorten c869602b6d
Merge pull request #1148 from withmorten/miami-githash 
miami: add no-git-hash option to premake
 2021-06-25 19:51:52 +02:00
withmorten 4bab6d5356
Merge pull request #1147 from withmorten/githash 
add no-git-hash option to premake
 2021-06-25 19:51:45 +02:00
Sergeanur 2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +03:00
erorcun 9382e86d38 Fix Particle FPE 2021-06-25 18:29:38 +03:00
withmorten 4e3fc35401 add no-git-hash option to premake 2021-06-25 02:41:40 +02:00
withmorten 84fb48825d add no-git-hash option to premake 2021-06-25 02:40:42 +02:00
Sergeanur f46461331c Refactor CTimer::Update 2021-06-25 02:40:56 +03:00
Sergeanur 1f082a85cb Refactor CTimer::Update 2021-06-25 02:33:40 +03:00
Sergeanur 4660491243 Timer fix 2021-06-25 02:22:07 +03:00
Sergeanur e5aa150557 Frontend fix 2021-06-25 00:40:00 +03:00
Sergeanur 14c71f39ff High FPS Fixes 2021-06-25 00:39:47 +03:00
Sergeanur b8cf8c53e7 Don't restart OAL device when switching EAX 2021-06-24 21:34:33 +03:00
Sergeanur 5156626582 Make sampman stream functions default to stream 0 + type fixes 2021-06-24 21:34:33 +03:00
majestic fe65f20a30 forgotten field in CBaseModelInfo::Shutdown 2021-06-24 21:34:33 +03:00
Sergeanur 4b8b0a6d74 Small fix 2021-06-24 21:34:33 +03:00
Sergeanur 0f0cb40151 Fix use of enum in ped comment banks switch 2021-06-24 21:34:33 +03:00
Sergeanur 2b8ae07ec6 forgot 2021-06-24 21:34:33 +03:00
Sergeanur 1b5dbc4b41 Add macros to set sample loop offsets 2021-06-24 21:34:33 +03:00
Sergeanur 6426963807 Fix cAudioManager::ProcessCarHeli 2021-06-24 21:34:33 +03:00
Sergeanur 23755fdfb4 Fix bullet trace sound offset 2021-06-24 21:34:33 +03:00
Sergeanur 793e1223de fix 2021-06-24 21:34:33 +03:00
Sergeanur fad64667a7 Fix some timer calls 2021-06-24 21:34:33 +03:00
Sergeanur 6e4a2947ea Fix sin & cos calls 2021-06-24 21:34:33 +03:00
Sergeanur f2c8522daa Fix IsSphereVisible calls 2021-06-24 21:34:33 +03:00
aap 93e9929925 CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:34:33 +03:00
Sergeanur be019c6126 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES 
# Conflicts:
#	src/core/config.h
 2021-06-24 21:34:33 +03:00
Sergeanur 02655313e9 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:34:33 +03:00
Sergeanur 59ed4d0029 Fix MAX_DIGITAL_MIXER_CHANNELS 2021-06-24 21:34:33 +03:00
majestic 42e655b4cc some fixes for CPed 2021-06-24 21:34:32 +03:00
Sergeanur 5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur bd94c16e78 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:34:32 +03:00
erorcun 618d689dff Pool fixes + peds not forming circle fix 2021-06-24 21:34:28 +03:00
Sergeanur 5c1af537af Don't restart OAL device when switching EAX 2021-06-24 21:32:44 +03:00
Sergeanur a446dbefaa Fix police scanner on high fps 2021-06-24 21:32:44 +03:00
Sergeanur 2592da2273 Remove frameTime, fix pause mode timer 2021-06-24 21:32:44 +03:00
Sergeanur b90784da90 Make times more accurate 2021-06-24 21:32:44 +03:00
Sergeanur f741101e44 Fix redone + add hud fix 2021-06-24 21:32:44 +03:00
Sergeanur cacec36dd1 Fix cut off sfx on high framerates 2021-06-24 21:32:44 +03:00
Sergeanur f2390deaa9 Make sampman stream functions default to stream 0 2021-06-24 21:32:44 +03:00
Sergeanur 8fc99387f5 Fix use of enum in ped comment banks switch 2021-06-24 21:32:44 +03:00
Sergeanur 939d0c59a3 Add macros to set sample loop offsets 2021-06-24 21:32:44 +03:00
Sergeanur edc25a689f Fix typo 2021-06-24 21:32:44 +03:00
Sergeanur 68b5270fe4 Fix some timer calls 2021-06-24 21:32:43 +03:00
Sergeanur a11bf19b93 Fix sin & cos calls 2021-06-24 21:32:43 +03:00
Sergeanur 2ad3a75be5 Fix IsSphereVisible calls 2021-06-24 21:32:43 +03:00
aap 50058371ef CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:32:43 +03:00
Sergeanur ce0a097392 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES 2021-06-24 21:32:43 +03:00
Sergeanur 1e084dfab7 Set number of stereo sources 2021-06-24 21:32:43 +03:00
Sergeanur 5a55d3a949 Patch PolRadio 2021-06-24 21:32:43 +03:00
Sergeanur 7a2dbd9112 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:32:43 +03:00
Sergeanur c9804510d1 This means sound should be panned right, not volume 2021-06-24 21:32:43 +03:00
Sergeanur c37f4c3c1a Fix cAudioManager::SetupJumboFlySound 2021-06-24 21:32:43 +03:00
Sergeanur 319bf9d8d2 Fix return type 2021-06-24 21:32:43 +03:00
Sergeanur 786e101acf Use bool8 in audio code 2021-06-24 21:32:43 +03:00
Sergeanur 596e12b897 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:32:43 +03:00
Sergeanur 4a9d890ae9 Fix quiet police scanner on OpenAL 2021-06-24 21:32:43 +03:00
Sergeanur 873c4fc81e Make gang members react to sexy females 2021-06-24 21:32:43 +03:00
Sergeanur f518676b76 fabs -> fabsf 2021-06-24 21:32:43 +03:00
Sergeanur 0f6583560d small RoadBlock fix 2021-06-24 21:32:43 +03:00
Sergeanur 6537dfe7f1 Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fix 2021-06-24 21:32:43 +03:00
aap f2b59f5097 update librw 2021-06-24 21:32:43 +03:00
erorcun 8ae4859398 Fix FPE 2021-06-24 21:32:43 +03:00
aap c4f231deb4 experiment: sorted building list for new renderer 2021-06-24 21:32:43 +03:00
aap c58d98a39e fix new renderer 2021-06-24 21:32:43 +03:00
aap 77ca9c593f fix postfx fix 2021-06-24 21:32:43 +03:00
erorcun 8488dc791a Pointless fixes 2021-06-24 21:32:39 +03:00
Sergeanur 0c41734c20 Fix quiet police scanner on OpenAL 2021-05-17 17:46:33 +03:00
Sergeanur 3a7cb9c5ce Fix oneshot audio crash 2021-05-17 08:06:05 +03:00
Sergeanur 8a728faeb6 Fixes to sfx names 2021-05-16 13:17:35 +03:00
Sergeanur 2fc431d1bb Complete sfx enum, rename some sounds + fixes of missing ped comments 2021-05-12 03:26:54 +03:00
Sergeanur fc1bfcbc21 fabs -> fabsf 2021-05-10 09:13:32 +03:00
Sergeanur 4da733145e fix 2021-05-10 02:45:29 +03:00
Sergeanur 3dda658e42 Use some GetMatrix/SetMatrix logic based on SA 
# Conflicts:
#	src/control/Pickups.cpp
#	src/control/RoadBlocks.cpp
#	src/core/World.cpp
#	src/entities/Entity.cpp
#	src/objects/CutsceneHead.cpp
#	src/objects/Object.cpp
 2021-05-10 02:45:04 +03:00
Sergeanur 1817727a66 Small Acos fix 2021-05-10 02:36:18 +03:00
aap ceb22d71dd update librw 2021-03-02 22:23:05 +01:00
erorcun 97008905b6 Fix FPEs 2021-03-02 03:38:41 +03:00
aap 6122f6980b fix new renderer 2021-02-28 19:07:46 +01:00
aap 7c42ed6edb fix postfx fix 2021-02-28 19:04:15 +01:00
aap ce604c77ba fix postfx 2021-02-28 15:30:13 +01:00
aap df1ad8e122 fix postfx 2021-02-28 15:29:58 +01:00
aap 82245789ed proper radar clipping 2021-02-28 14:55:14 +01:00
aap 931bc690cd proper radar clipping 2021-02-28 14:55:01 +01:00
aap d2b5a422e4 update librw 2021-02-28 14:17:14 +01:00
aap 087174c6a6 update librw; little fix 2021-02-28 14:15:22 +01:00
erorcun a311f643f9 Fixes 2021-02-28 15:50:51 +03:00
Sergeanur 9fce8636b0 Fix muzzleflash rotation 2021-02-26 20:37:22 +02:00
Sergeanur c5303c2ea4 Fix muzzleflash rotation 2021-02-26 20:31:26 +02:00
Sergeanur 478f6e07d4 Uhh, right 
# Conflicts:
#	src/audio/AudioManager.h
 2021-02-26 11:08:32 +02:00
Sergeanur 5bdbb5f802 Uhh, right 2021-02-26 11:05:37 +02:00
Sergeanur b01d6be3f4 PoliceRadio -> PolRadio (original name) 2021-02-26 10:57:11 +02:00
Sergeanur 59c9ae29cf PoliceRadio -> PolRadio (original name) 2021-02-26 10:56:26 +02:00
Sergeanur 82ebd8aae1 Fix controls 2021-02-22 17:47:58 +02:00
Haydn Trigg d506f8588c Fix stack corruption in HandleGraphEvent 2021-02-21 17:15:21 +01:00
erorcun 1d336d851d Fix Radio Off text more 2021-02-21 18:22:02 +03:00
Haydn Trigg 620155ac8d Fix stack corruption in HandleGraphEvent 2021-02-21 11:38:32 +00:00
erorcun 71cf666bbd A saner way to remove Stingers, may fix Physical crash 2021-02-20 23:58:08 +03:00
erorcun 040c6f9027 Fix split second Radio Off text 2021-02-19 22:56:39 +03:00
erorcun 14dcd8f04c Fix MP3 player 2021-02-19 22:32:11 +03:00
aap b88cf7b939 make debug render groups optional 2021-02-19 18:41:47 +01:00
aap 9a7fa47857 make debug render groups optional 2021-02-19 18:41:31 +01:00
withmorten 8128e8e817 tiny sync with miami 2021-02-19 16:33:37 +01:00
withmorten 60bc816af5 nil -> false 2021-02-19 16:32:25 +01:00
withmorten 73fce903b8 nil -> false 2021-02-19 16:23:52 +01:00
erorcun 139c6bfcf3 Fix MP3 player 2021-02-19 14:30:41 +03:00
erorcun bf7280b55b Get keyboard input from X11 on Linux 2021-02-19 02:36:47 +03:00
erorcun dfa0c8bf19 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-19 02:30:02 +03:00
withmorten 4eea06e620 name error strings to REVC 2021-02-18 22:59:40 +01:00
withmorten 781617d484 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:55:26 +01:00
withmorten 48cec4a786 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:40:32 +01:00
erorcun 946be081b0 Get keyboard input from X11 on Linux 2021-02-19 00:23:14 +03:00
aap 11bc8ea602 update librw; render groups only if extension supported 2021-02-18 20:31:53 +01:00
aap 6245a17e16 update librw; render groups only if extension supported 2021-02-18 20:31:46 +01:00
aap 3457ff48ce d3d9 debug render groups 2021-02-18 13:08:29 +01:00
aap 253021866c d3d9 debug render groups 2021-02-18 13:08:22 +01:00
aap 146ad3b4a1 fix last commit 2021-02-18 12:23:33 +01:00
aap e8b435a624 fix last commit 2021-02-18 12:23:26 +01:00
aap 996772faf2 add debug render groups 2021-02-18 12:21:52 +01:00
aap 9db87fc636 add debug render groups 2021-02-18 12:21:47 +01:00
Sergeanur cba1f85026 Add russian support 2021-02-18 11:34:23 +02:00
aap 59bf3a1cc4 update librw; gl cleanup 2021-02-18 01:58:42 +01:00
aap a4412e8d63 update librw; gl cleanup 2021-02-18 01:58:36 +01:00
Sergeanur ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02:00
Sergeanur ee6b7152c7 Fix endless vibration in pause menu 2021-02-17 15:04:53 +02:00
erorcun 691c8e7702 Fix fuzzy #ifdef 2021-02-17 15:59:05 +03:00
erorcun 75d8dd2bf2 Show Radio Off on interiors that don't want radio 2021-02-17 15:58:52 +03:00
Steve Wills 2b6628aa65 Fix seg fault when configuring controller 2021-02-17 01:12:39 +03:00
erorcun 4d8f340827
Merge pull request #1050 from swills/controller_config_segfault_fix 
Fix seg fault when configuring controller
 2021-02-16 22:29:55 +03:00
Adrian Graber 88c11e92d3 Fix buffer overflow on re3_sem_open/close 2021-02-16 18:26:07 +01:00
Adrian Graber 19b39f49fa
Fix buffer overflow on re3_sem_open/close 2021-02-16 18:12:21 +01:00
Steve Wills e482ab6292 Fix mistake 2021-02-16 11:13:20 -05:00
Steve Wills 20d9498fdb Put fix behind ifdef 2021-02-16 10:55:11 -05:00
erorcun 1bfd7c0345 Fix FindClose->closedir 2021-02-16 18:31:00 +03:00
Adrian Graber ee287f6120 Only include sys/syscall.h when __linux__ is defined 2021-02-16 18:29:55 +03:00
Adrian Graber 48227bd350 Add unnamed semaphore define toggle for CdStreamPosix 2021-02-16 18:29:41 +03:00
erorcun 1a64053da5
Merge pull request #986 from AGraber/nx-upstream 
Add toggle for (un)named semaphores and prevent linux header inclusion on non-linux paltforms
 2021-02-16 18:27:31 +03:00
erorcun 5ee4931fb6 Fix FindClose->closedir 2021-02-16 18:26:44 +03:00
erorcun 4368841f02 Fix rare stream deadlock on Windows 2021-02-16 17:55:42 +03:00
erorcun 49fd99119d Fix rare stream deadlock on Windows 2021-02-16 17:45:29 +03:00
Fire-Head 63e5afda0b fix mailbox particle 2021-02-15 21:25:18 +03:00
aap edc77d7f00 removed some f suffixes from shaders 2021-02-15 15:06:45 +01:00
aap adf688635a removed some f suffixes from shaders 2021-02-15 15:06:37 +01:00
withmorten a58d76d27d Revert "always console for windows Debug builds" 
This reverts commit a76c962aa3.
 2021-02-15 14:58:19 +01:00
withmorten fec39e87c0 Revert "always console for windows Debug builds" 
This reverts commit a826091dc9.
 2021-02-15 14:57:19 +01:00
withmorten a76c962aa3 always console for windows Debug builds 2021-02-15 14:27:35 +01:00
withmorten a826091dc9 always console for windows Debug builds 2021-02-15 14:24:07 +01:00
erorcun 5ce5000b14 Try to fix streams stop after a while 2 2021-02-15 05:09:46 +03:00
Steve Wills a666de46aa Fix seg fault when configuring controller 
Since controllerAction can be -2 (line 2105)
 2021-02-14 14:06:37 -05:00
erorcun be55085303 Try to fix streams stop after a while 2021-02-14 20:45:58 +03:00
Fire-Head 0681fe3eca cannon fix 2021-02-14 20:11:58 +03:00
Fire-Head 0b6e46b1e4 cannon fix 2021-02-14 20:11:23 +03:00
Nikolay Korolev 3d90a146d8 Merge remote-tracking branch 'upstream/miami' into miami 2021-02-14 20:09:16 +03:00
Nikolay Korolev 6ba0d2e6bd fail 2021-02-14 20:08:55 +03:00
erorcun 70b919137d (Test) Try to fix streams stop after a while 2021-02-14 18:07:21 +03:00
Sergeanur 9f6f9a7af3
Merge pull request #1024 from IlDucci/miami 
[Miami] Updating font widths.
 2021-02-14 07:53:45 +02:00
withmorten e5d5160492 glfw window icon 2021-02-13 17:09:12 +01:00
withmorten 8d27dba4cd glfw window icon 2021-02-13 17:01:47 +01:00
IlDucci ae8b2198e2 Redone the entire grouping to follow the textures, added ifdefs, added a small legend for the Pricedown characters in EFIGS font1 2021-02-13 16:50:28 +01:00
Sergeanur 02ac7c309e Disable RANDOMSPLASH only if loading screen is disabled 2021-02-13 16:16:02 +02:00
Sergeanur 4907c56231 Disable RANDOMSPLASH 2021-02-13 16:10:14 +02:00
aap 333530e260 new icon 2021-02-13 14:54:51 +01:00
aap 04345643a0 new icon 2021-02-13 14:54:44 +01:00
aap 65f9917b65 clean up debug menu 2021-02-13 14:22:34 +01:00
aap 9c7d83ebc1 dbg menu again 2021-02-13 14:22:11 +01:00
aap d0fbba19d1 debugmenu cleanup 2021-02-13 13:47:03 +01:00
aap 0f8614221b debugmenu cleanup 2021-02-13 00:00:02 +01:00
Fire-Head 291cdd4bfb iii icon fix 2021-02-13 01:35:48 +03:00
erorcun 035f0010d8 fix 2021-02-12 21:26:03 +03:00
erorcun 0ec16a5b0e Fix XInput hotplug 2021-02-12 21:10:52 +03:00
Filip Gawin 0c60ceeb33 Cmake version for hash 2021-02-12 21:09:46 +03:00
erorcun 2c784d979a Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 21:09:23 +03:00
erorcun 6689b0be02 Fix XInput hotplug 2021-02-12 19:50:26 +03:00
Sergeanur e98164ec41 Sync aspect ratio setting with master 2021-02-12 18:00:20 +02:00
erorcun a44d7d86cb
Merge pull request #1029 from erorcun/master 
Remove version text, add toggleable debug info(with commit hash!)
 2021-02-12 18:15:51 +03:00
Filip Gawin 1b8d03f3aa Cmake version for hash 2021-02-12 16:38:03 +03:00
Sergeanur aadc39eccd Add missing rtpng.h 2021-02-12 08:46:32 +02:00
Sergeanur c5042dcdf6 Add english strings to translations as stubs, also translation notice 2021-02-12 08:14:10 +02:00
Sergeanur 9e22eaf798 Fix RW34 2021-02-12 08:06:34 +02:00
Sergeanur e7a4a3516f Add english strings to translations as stubs, also translation notice 2021-02-12 07:52:21 +02:00
Sergeanur 2c194df591 Fix RW33 2021-02-12 05:37:30 +02:00
erorcun 9e1c048e20 Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 05:28:08 +03:00
aap 879838c9f2 enable screenshots with F12 2021-02-12 00:29:09 +01:00
aap f3bfdd7857 imrove readme; enable screenshots with F12 2021-02-12 00:06:54 +01:00
Sergeanur 998d88763d Fix RC cars detonation button 2021-02-11 18:03:47 +02:00
Sergeanur e4320c02cf Enable BIND_VEHICLE_FIREWEAPON 2021-02-11 17:16:01 +02:00
Sergeanur 579ad052ed Fix black screen during credits 2021-02-11 13:30:04 +02:00
Nikolay Korolev 7c74c01741 fixed attractors 2021-02-11 13:35:56 +03:00
Sergeanur 9d8e32d9b2
Merge pull request #1026 from Sergeanur/VC/ControllerMenu 
Controller menu
 2021-02-11 12:31:13 +02:00
Sergeanur 28f9160bca Fix crash when falling from bike while shooting 2021-02-11 12:13:03 +02:00
Sergeanur a6b56e6b7a Merge remote-tracking branch 'origin/master' 
* origin/master:
  startproject now depends on librw
  Ped jump teleport/kill fix
 2021-02-11 06:53:29 +02:00
Sergeanur c9f804486d Fix setup 4 texts 2021-02-11 06:53:00 +02:00
Sergeanur 4f27a28762 More fixes 2021-02-11 05:03:41 +02:00
Sergeanur 9f3f0ee2d2 Fix borders 2021-02-11 04:36:00 +02:00
erorcun a6d402e8fd Ped jump teleport/kill fix 2021-02-10 15:34:48 +03:00
erorcun 6d56fb41c6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-10 15:27:04 +03:00
erorcun 775db94a96 Ped jump teleport/kill fix 2021-02-10 15:26:42 +03:00
Sergeanur 3c7a7bc8a7 Fixes 2021-02-10 13:42:59 +02:00
Sergeanur 5072c8b6f0 Merge branch 'miami' into VC/ControllerMenu 
* miami:
  Fix repeating pickup sound on revenue pickup
 2021-02-10 12:22:12 +02:00
Sergeanur ca85e44c9e Fix repeating pickup sound on revenue pickup 2021-02-10 12:21:21 +02:00
Sergeanur 5f3e68ec45 Save vibration setting 2021-02-10 09:16:04 +02:00
Sergeanur d6068c421d Add undef 2021-02-10 09:08:02 +02:00
Sergeanur b6af7393e8 Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu 
* origin/miami:
  fix clouds
  Use our synonyms for attack anims again
  Detect joystick menu for XInput
  reorganize shaders; use modulate flag; update librw
  fix generic.txd crash
  Use original animation names from VCS

# Conflicts:
#	src/core/MenuScreensCustom.cpp
 2021-02-10 09:01:53 +02:00
Sergeanur 12330e38cb Controller menu 2021-02-10 08:57:51 +02:00
aap 26bbbe0037 fix clouds 2021-02-09 20:02:29 +01:00
aap 25703b04a2 fix clouds 2021-02-09 19:59:55 +01:00
erorcun d460c3863e Also check font textures for new languages 2021-02-08 18:21:00 +03:00
erorcun 94eed33940 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-08 13:24:49 +03:00
erorcun b464bb7fd4 Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim 2021-02-08 13:23:19 +03:00
erorcun 0eb1913713 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-02-08 13:21:53 +03:00
erorcun 2cad49940e Use our synonyms for attack anims again 2021-02-07 21:13:54 +03:00
erorcun d224f8b7ee Don't show menu map and new languages if gamefiles isn't copied 2021-02-07 20:38:53 +03:00
erorcun 675aef29cf Detect joystick menu for XInput 2021-02-07 19:50:17 +03:00
aap 425f360363 reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
aap 6662e60b63 reorganize shaders; use modulate flag; update librw 2021-02-06 16:33:17 +01:00
aap cc435ea711 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-02-06 10:23:28 +01:00
erorcun c7ba01b034 Detect joystick menu for XInput 2021-02-05 18:23:50 +03:00
IlDucci b864103976 Restoring original sorting. 2021-02-05 13:53:24 +01:00
Nikolay Korolev 102d105e0a fix 2021-02-05 14:45:03 +03:00
IlDucci 86513cb2c9 [Miami] Updating font widths. 
- Fixing widths in SF Arborcrest for the characters ¡, Ñ, ñ, ¿.
 - Fixing the ¡ character width in Rage font.
 - Mapped the characters that are being affected by each width size.
 2021-02-05 12:44:41 +01:00
withmorten 2bd8be5872 Fix inverted vertical camera 2021-02-05 12:08:14 +01:00
aap 9125e604b9 fix generic.txd crash 2021-02-05 10:58:01 +01:00
aap 5385d004ec fix generic.txd crash 2021-02-05 10:51:12 +01:00
Nikolay Korolev 09de511c37 fixed plane AI 2021-02-05 11:31:54 +03:00
withmorten a78212ea80 fix MASTER crashes 2021-02-04 23:43:04 +01:00
withmorten bf299e5c17 fix MASTER crashes 2021-02-04 23:41:10 +01:00
withmorten 8553120fdb add missing ASCII_STRCMP stuff 2021-02-04 19:47:47 +01:00
withmorten 42342745f3 CHud::Draw fix 2021-02-04 18:29:47 +01:00
withmorten 7aaaaa953b CHud::Draw fix 2021-02-04 18:28:24 +01:00
withmorten 263a766d8e
revert Fix RW build 2021-02-04 01:40:45 +01:00
Sergeanur 61618389e1 Fix crash on changing anti aliasing 2021-02-04 01:52:57 +02:00
withmorten e6d86bfab5 fix VC_PED_PORTS build 2021-02-03 23:37:10 +01:00
Sergeanur e077a6bf28 Fix RW build 2021-02-03 22:21:16 +02:00
erorcun c002dd6cba MP3 player fixes 2021-02-03 23:12:55 +03:00
erorcun ca48ebcb6e MP3 player fixes 2021-02-03 23:03:00 +03:00
Nikolay Korolev ca65c76419 fix 2021-02-03 22:46:04 +03:00
Sergeanur 91c3bdfa15
Merge pull request #1019 from Sergeanur/ControllerMenu2 
Controller menu
 2021-02-03 21:43:25 +02:00
Nikolay Korolev aeccd8c166 Merge remote-tracking branch 'upstream/master' 2021-02-03 15:35:14 +03:00
Nikolay Korolev f6326606b7 fix 2021-02-03 15:35:06 +03:00
erorcun f541520040 Merge branch 'master' of https://github.com/gtamodding/re3 2021-02-03 15:12:24 +03:00
erorcun 7ff899bd22 OAL Loops, fixes 2021-02-03 15:10:27 +03:00
erorcun f42f785c78
Merge pull request #1020 from erorcun/master 
MusicManager fixes
 2021-02-03 14:22:33 +03:00
erorcun 1667ffdd8f MusicManager fixes 2021-02-03 14:08:28 +03:00
Sergeanur a7e11d134f Add undef 2021-02-03 02:53:54 +02:00
Sergeanur adf07aab47 Fix compilation 2021-02-03 02:47:45 +02:00
Sergeanur 91612eb45a Controller menu 2021-02-03 02:41:12 +02:00
Sergeanur b47a23ab79
Merge pull request #1001 from Sergeanur/animNames 
Use original animation names from VCS
 2021-02-03 02:14:48 +02:00
erorcun 713562685a OAL Loops, fixes 2021-02-02 22:30:13 +03:00
withmorten b65f8a3fe2 no advanced script log when log level is 0 2021-02-02 11:35:16 +01:00
withmorten 1b293a3cfb no advanced script log when log level is 0 2021-02-02 11:32:20 +01:00
withmorten 4281730b16 fix UB and potential crashes when doing ice cream 2021-02-02 11:27:30 +01:00
erorcun 1eb77c4d6d
Merge pull request #1016 from erorcun/miami 
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio…
 2021-02-02 05:31:29 +03:00
erorcun 902e539c0d Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text 2021-02-01 14:18:17 +03:00
Sergeanur 4afa7b86ae Add radio off text 2021-01-31 23:44:30 +02:00
Filip Gawin 3d4791f291 Revert "First batch of fixes (CallAndMessage)" 
This reverts commit 7a3b80a9b7.
 2021-01-31 21:06:38 +01:00
Filip Gawin 7a3b80a9b7 First batch of fixes (CallAndMessage) 2021-01-31 20:44:39 +01:00
shfil 264d7d98d7
fix realloc 2021-01-31 15:01:46 +01:00
shfil 5de4e88d7a
fix realloc 2021-01-31 15:00:36 +01:00
Adrian Graber b60baf46f6 Only include sys/syscall.h when __linux__ is defined 2021-01-31 14:27:06 +01:00
Adrian Graber d76b58cc72 Add unnamed semaphore define toggle for CdStreamPosix 2021-01-31 14:27:00 +01:00
withmorten da378077f7 renderer fix from miami 2021-01-31 02:08:42 +01:00
withmorten 2e37001881 fix UB and new renderer crashes 2021-01-31 01:19:25 +01:00
Nikolay Korolev e5190481e4 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-31 01:46:33 +03:00
Nikolay Korolev 2420325c02 fix 2021-01-31 01:45:07 +03:00
withmorten 5dfe396af3 use macro for waterlevel z offset 2021-01-30 20:13:25 +01:00
Sergeanur c193ade58b Font fixes 2021-01-30 20:46:37 +02:00
Nikolay Korolev 8b08098d4e fix 2021-01-30 20:26:10 +03:00
Nikolay Korolev dbf5c06144 fixed bike bomb 2021-01-30 14:53:51 +03:00
withmorten 990637bf52 waterlevel: use macro for 400.0f 2021-01-29 17:57:51 +01:00
erorcun f61a91c97d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-29 19:30:27 +03:00
erorcun d52b917c54 Some regular fixes and UB fixes 2021-01-29 19:23:02 +03:00
erorcun f5f153dbfd Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-29 19:16:40 +03:00
erorcun c4328afce7 Even more fixes & shorten quit screen 2021-01-29 19:16:26 +03:00
withmorten f7fc919d98 add NewRenderer ini read/write 2021-01-29 16:46:03 +01:00
withmorten 7db28f9f7f fix NewRender typo 2021-01-29 16:43:17 +01:00
withmorten 934aa92a9b add NewRenderer ini read/write, fix backfaceculling read 2021-01-29 16:41:34 +01:00
erorcun 2e7405b76c CdStreamPosix fixes 2021-01-29 16:31:13 +03:00
erorcun 982b024c5c CdStreamPosix fixes 2021-01-29 16:25:32 +03:00
aap 595a000f6a fix shutdown 2021-01-29 13:43:50 +01:00
withmorten 8482180706 waterlevel fix fix 2021-01-29 01:20:20 +01:00
withmorten 2fc6b542bc waterlevel fix 2021-01-29 01:18:32 +01:00
erorcun 810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
Nikolay Korolev 7056f9954f fix 2021-01-28 23:25:15 +03:00
Nikolay Korolev 7c38e2db24 fix 2021-01-28 23:23:49 +03:00
aap 64a4ed6db6 fixed uninitialized nearclip 2021-01-28 17:40:15 +01:00
aap 9e3c192376 fix some little UB 2021-01-28 15:35:35 +01:00
aap ebb615d080 fix some little UB 2021-01-28 15:30:32 +01:00
erorcun e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +03:00
erorcun 2d0562412e Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:49:50 +03:00
erorcun 2b269ff1c0 Fix some Collision NaN/inf's 2021-01-28 02:18:04 +03:00
erorcun 8150f55dbc
Merge pull request #1002 from kusst/miami 
Change text color in texture conversion dialog so it matches VC colors.
 2021-01-28 02:16:04 +03:00
kusst 8a7c7efe85
ifdefs + fix progressbar being under dialogbox 2021-01-27 23:56:23 +01:00
GaryOderNichts d2cf090ace Fix texture conversion box 2021-01-27 23:06:43 +01:00
erorcun be88a42bad Fix some Collision NaN/inf's 2021-01-28 00:51:43 +03:00
erorcun a216bb56ee Attempt to fix input delays on GLFW 2021-01-27 22:19:10 +03:00
erorcun ab939e059b Clean up POSIX streaming code 2021-01-27 22:19:00 +03:00
Sergeanur e8a10748a4 fix fix 2021-01-27 20:39:22 +02:00
Sergeanur 97cf189d15 Fix subtitle shadow 2021-01-27 20:19:22 +02:00
Sergeanur 97351ad2c2 Use original animation names from VCS 2021-01-27 18:50:24 +02:00
erorcun 8846f50cb7 Attempt to fix input delays on GLFW 2021-01-27 18:26:48 +03:00
erorcun 843dd9b5e1 Clean up POSIX streaming code 2021-01-27 18:26:08 +03:00
kusst e1e13d14a4
Also change progressbar color 2021-01-27 03:36:22 +01:00
kusst 30c26e5a9c
Change text color in texture conversion dialog... 
...so it matches VC style.
 2021-01-27 00:35:57 +01:00
Sergeanur 2d2625bf75 Fix anim id in replay 2021-01-26 19:39:05 +02:00
Sergeanur 0f623c2354 Use original animation names from VCS 2021-01-26 19:35:40 +02:00
Sergeanur f27e1ec818 Fix doubles in ZoneCull 2021-01-26 19:26:28 +02:00
erorcun 202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
erorcun cb34060f00 Support pads without L2-R2, add comments 2021-01-25 16:48:41 +03:00
withmorten 9d4053419b
Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
aap 453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap 4564f7aeea modelinfo fixes 2021-01-24 23:24:41 +01:00
shfil 513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
shfil 1d3b4d1e9a
Add cmake option for sanitizers 2021-01-24 21:34:53 +01:00
erorcun 071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
erorcun 5336620f5c Ped: car enter anim. fix 2021-01-24 20:05:43 +03:00
erorcun a0bf47cfd2 Fix out of bound binding orders 2021-01-24 19:39:31 +03:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
shfil ca1de3cd17
Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
shfil 3e6bb267f3
Fix CCollision::DistToLine 2021-01-24 12:34:40 +01:00
withmorten 5183d7cf0f enable default resolution for vanilla defines 2021-01-23 23:18:05 +01:00
withmorten db6b7b473d whitespace fix 2021-01-23 23:02:22 +01:00
Nikolay Korolev 4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
Nikolay Korolev de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev 6bdc0365ee another backport 2021-01-23 23:15:50 +03:00
Nikolay Korolev 4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
Nikolay Korolev 921ca7712e use ARRAY_SIZE 2021-01-23 23:10:59 +03:00
aap 4269e613a3
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch 
Fix plane / ccbb cheat flight pitch
 2021-01-23 21:06:33 +01:00
Zach Charo 77051ddc78
Update Vehicle.cpp 2021-01-23 13:38:45 -06:00
erorcun 770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03:00