archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-30 18:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,696 Commits 3 Branches 0 Tags
c7243aa2e93a8c0801ebf17345b2db583bc96d4d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergeanur c7243aa2e9 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:49:14 +03:00
Sergeanur 883d8172b0 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-27 14:33:39 +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
Sergeanur 225530ef04 Fix premature CTimer calls 2021-06-26 04:12:04 +03:00
Sergeanur 940d6bf6d3 Merge remote-tracking branch 'origin/miami' into lcs 2021-06-25 03:40:41 +03: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 1254c1202a Merge branch miami into lcs 2021-06-24 21:52:24 +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
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
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
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
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
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
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
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
Sergeanur c5303c2ea4 Fix muzzleflash rotation 2021-02-26 20:31:26 +02:00
Sergeanur 49b3bf5f2e Merge branch 'miami' into lcs 
* miami:
  Uhh, right
 2021-02-26 11:08:49 +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
Sergeanur cba1f85026 Add russian support 2021-02-18 11:34:23 +02:00
Sergeanur ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02: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 396326014d Restore old readme 2021-02-16 19:38:43 +02:00
Sergeanur 184f12a214 Remove Vanilla from CI 2021-02-16 19:38:08 +02:00
Sergeanur 0f46c8904d Fix 2021-02-16 19:32:43 +02: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
Sergeanur 9f6f9a7af3 Merge pull request #1024 from IlDucci/miami 
[Miami] Updating font widths.
 2021-02-14 07:53:45 +02:00
Sergeanur 83fdad7e0d Update invite link 2021-02-13 20:09:16 +02:00
Sergeanur e98164ec41 Sync aspect ratio setting with master 2021-02-12 18:00:20 +02:00
Sergeanur b1698948e6 Update TXDs 2021-02-12 12:59:39 +02:00
Sergeanur df336f5ba2 Convert TXDs to VC version, delete unused controller shadows 2021-02-12 09:20:35 +02: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 438277408b Use VEHICLE_FIREWEAPON in GXTs 2021-02-11 18:36:40 +02: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
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 4f27a28762 More fixes 2021-02-11 05:03:41 +02:00