crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
4,840 Commits 3 Branches 0 Tags 79 MiB
92679555b9
Commit Graph

4069 Commits

Author SHA1 Message Date
Sergeanur
cb72fee941 fix 2021-06-30 21:45:19 +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
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
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
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
Sergeanur
3e9c983f5c
Merge pull request #1153 from kusst/texread 
Make colors in texture conversion dialog more LCSy.
 2021-06-27 23:24:16 +03:00
Nikolay Korolev
73e112a217 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-27 14:53:43 +03:00
Sergeanur
879761af2c Merge fixes 2021-06-27 14:51:48 +03:00
Sergeanur
c7243aa2e9 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:49:14 +03:00
erorcun
3587cb029e Remove waiting for stream closure in multi-thread audio 2021-06-27 14:42:52 +03:00
Sergeanur
883d8172b0 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:33:39 +03:00
erorcun
05a29c7e6c Multi-threaded audio fixes 2021-06-27 00:00:07 +03: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
Nikolay Korolev
636f67ca3f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-06-26 14:34:52 +03:00
Sergeanur
d4ba7c387b Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/render/Particle.cpp
 2021-06-26 14:27:54 +03:00
Sergeanur
831737ecc8 Fixes 2021-06-26 14:25:40 +03:00
withmorten
9ab4f1a2d9 fix screenshot name space 2021-06-26 13:13:43 +02:00
Sergeanur
225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
kusst
ebd980bf14
Make colors in texture conversion dialog more LCSy. 2021-06-25 22:45:21 +02: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
erorcun
9382e86d38 Fix Particle FPE 2021-06-25 18:29:38 +03:00
Nikolay Korolev
8a5afd0db2 sync 2021-06-25 10:15:19 +03:00
withmorten
4e3fc35401 add no-git-hash option to premake 2021-06-25 02:41:40 +02:00
Sergeanur
a3ae267e83 Merge branch 'miami' into lcs 2021-06-25 02:41:33 +03:00
Sergeanur
f46461331c Refactor CTimer::Update 2021-06-25 02:40:56 +03:00
Sergeanur
4660491243 Timer fix 2021-06-25 02:22:07 +03:00
Sergeanur
7e7a2b74cd Fixes 2021-06-25 01:16:03 +03:00
Sergeanur
e671fe682d Merge remote-tracking branch 'GitHub/miami' into lcs 2021-06-25 00:47:06 +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
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur
3ebc475494 Don't restart OAL device when switching EAX 2021-06-24 21:46:46 +03:00
Sergeanur
27df328ec2 Make sampman stream functions default to stream 0 + type fixes 2021-06-24 21:46:21 +03:00
majestic
4351198bf5 forgotten field in CBaseModelInfo::Shutdown 2021-06-24 21:46:21 +03:00
Sergeanur
7c3457257b Small fix 2021-06-24 21:46:21 +03:00
Sergeanur
ba23408007 Fix use of enum in ped comment banks switch 2021-06-24 21:46:21 +03:00
Sergeanur
eaaba8646b forgot 2021-06-24 21:46:21 +03:00
Sergeanur
0910188058 Add macros to set sample loop offsets 2021-06-24 21:46:18 +03:00
Sergeanur
3cc9eb1c1c Fix cAudioManager::ProcessCarHeli 2021-06-24 21:45:49 +03:00
Sergeanur
db1c7de125 Fix bullet trace sound offset 2021-06-24 21:45:49 +03:00
Sergeanur
7a351f18ba fix 2021-06-24 21:45:48 +03:00
Sergeanur
776e8ff2ee Fix some timer calls 2021-06-24 21:45:48 +03:00
Sergeanur
3aac4ea62a Fix sin & cos calls 2021-06-24 21:45:48 +03:00
Sergeanur
1558788df1 Fix IsSphereVisible calls 2021-06-24 21:45:48 +03:00
aap
29d47da61e CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:45:45 +03:00
aap
e014bb5359 CEntity done; C(Vu)Vector fixes and cleanup 2021-06-24 21:45:21 +03:00
Sergeanur
fb03ee45b5 Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES 
# Conflicts:
#	src/core/config.h
 2021-06-24 21:45:21 +03:00
Sergeanur
60bb16d26c Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:45:18 +03:00
Sergeanur
b5bc3a9000 Fix MAX_DIGITAL_MIXER_CHANNELS 2021-06-24 21:44:40 +03:00
majestic
f34365dfc0 some fixes for CPed 2021-06-24 21:44:40 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
c7821635fd Wait states ported (scripted animations) 2021-06-24 21:42:10 +03:00
Sergeanur
0c3ee871f4 Fix C3dMarkers::PlaceMarker calls in Radar 2021-06-24 21:42:10 +03:00
Sergeanur
714cd47db9 Original pool sizes 2021-06-24 21:42:10 +03:00
Sergeanur
008f8a1e19 Fix mod 0 crash 2021-06-24 21:42:10 +03:00
Sergeanur
499b16678f Fix engine sounds, player and male01 ped comments 2021-06-24 21:42:10 +03:00
Sergeanur
0682cdedbd Fall back to mp3 if vb is not found 2021-06-24 21:42:10 +03:00
Sergeanur
1471c82a20 LCS sfx + mission audio 2021-06-24 21:42:08 +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
19dd95a1cb Merge branch 'miami' into lcs 
* miami:
  Pool fixes + peds not forming circle fix
 2021-05-18 08:12:47 +03:00
Sergeanur
3596897961 Merge pull request 'Pool fixes + peds not forming circle fix' (#4) from erorcun/re3:miami into miami 
Reviewed-on: https://git.jacksmininetwork.co.uk/re/re3/pulls/4
 2021-05-18 04:33:47 +00:00
Sergeanur
288c3dfc8f Merge branch 'miami' into lcs 
* miami:
  Fix quiet police scanner on OpenAL
 2021-05-17 18:22:59 +03:00
Sergeanur
0c41734c20 Fix quiet police scanner on OpenAL 2021-05-17 17:46:33 +03:00
Sergeanur
bd70540b53 Merge branch 'miami' into lcs 
* miami:
  Fix oneshot audio crash
 2021-05-17 08:06:34 +03:00
Sergeanur
3a7cb9c5ce Fix oneshot audio crash 2021-05-17 08:06:05 +03:00
Sergeanur
247974afd3 Merge branch 'miami' into lcs 
* miami:
  Fixes to sfx names
 2021-05-16 13:18:00 +03:00
Sergeanur
8a728faeb6 Fixes to sfx names 2021-05-16 13:17:35 +03:00
Sergeanur
fdb6428c6b Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-05-12 03:29:36 +03:00
Sergeanur
2fc431d1bb Complete sfx enum, rename some sounds + fixes of missing ped comments 2021-05-12 03:26:54 +03:00
Sergeanur
4e79d53661 Merge branch 'miami' into lcs 
* miami:
  fabs -> fabsf
 2021-05-10 09:13:51 +03:00
Sergeanur
fc1bfcbc21 fabs -> fabsf 2021-05-10 09:13:32 +03:00
Sergeanur
8f54093de1 Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/World.cpp
 2021-05-10 02:48:56 +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
Sergeanur
519218572a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
 2021-04-09 04:31:46 +03:00
erorcun
f6f8a24335 Merge branch 'miami' of http://git.jacksmininetwork.co.uk/re/re3 into miami 2021-03-06 19:31:47 +03:00
erorcun
62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +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
82245789ed proper radar clipping 2021-02-28 14:55:14 +01:00
aap
d2b5a422e4 update librw 2021-02-28 14:17:14 +01:00
erorcun
a311f643f9 Fixes 2021-02-28 15:50:51 +03: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
f6910d35f7 Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/render/Font.cpp
 2021-02-26 11:07:32 +02:00
Sergeanur
b01d6be3f4 PoliceRadio -> PolRadio (original name) 2021-02-26 10:57:11 +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
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
withmorten
60bc816af5 nil -> false 2021-02-19 16:32:25 +01:00
erorcun
dfa0c8bf19 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-19 02:30:02 +03:00
withmorten
82322293fe rename error strings to RELCS 2021-02-18 23:01:46 +01: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
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
3457ff48ce d3d9 debug render groups 2021-02-18 13:08:29 +01:00
aap
146ad3b4a1 fix last commit 2021-02-18 12:23:33 +01:00
aap
996772faf2 add debug render groups 2021-02-18 12:21:52 +01:00
Sergeanur
cba1f85026 Add russian support 2021-02-18 11:34:23 +02:00
withmorten
037c332158 Merge remote-tracking branch 'origin/miami' into lcs 2021-02-18 02:38:12 +01:00
aap
73612215d8 update librw; gl cleanup 2021-02-18 01:58:59 +01:00
aap
59bf3a1cc4 update librw; gl cleanup 2021-02-18 01:58:42 +01:00
Sergeanur
ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +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
Sergeanur
d37dc246eb Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  Fix buffer overflow on re3_sem_open/close
 2021-02-16 19:41:02 +02:00
Sergeanur
0f46c8904d Fix 2021-02-16 19:32:43 +02:00
Adrian Graber
88c11e92d3 Fix buffer overflow on re3_sem_open/close 2021-02-16 18:26:07 +01:00
Sergeanur
21278356ec Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  Fix FindClose->closedir
  Only include sys/syscall.h when __linux__ is defined
  Add unnamed semaphore define toggle for CdStreamPosix
  Fix rare stream deadlock on Windows
 2021-02-16 18:08:34 +02:00
Sergeanur
e38467ef3a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	premake5.lua
#	src/animation/AnimManager.cpp
#	src/animation/AnimationId.h
#	src/audio/MusicManager.cpp
#	src/audio/audio_enums.h
#	src/control/Script7.cpp
#	src/core/FileLoader.cpp
#	src/core/re3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/postfx.cpp
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_PS.hlsl
#	src/extras/shaders/make_hlsl.cmd
#	src/extras/shaders/obj/colourfilterVC_PS.cso
#	src/extras/shaders/obj/colourfilterVC_PS.inc
#	src/extras/shaders/obj/colourfilterVC_frag.inc
#	src/peds/PedFight.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Particle.cpp
#	src/render/WaterCannon.cpp
#	src/skel/win/gtavc.ico
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt
 2021-02-16 18:08:19 +02:00
erorcun
1bfd7c0345 Fix FindClose->closedir 2021-02-16 18:31:00 +03:00