archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-30 21:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,620 Commits 3 Branches 0 Tags
19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sergeanur 9f3f0ee2d2 Fix borders 2021-02-11 04:36:00 +02:00
Sergeanur 7c485560c5 Translated string fix 2021-02-11 04:28:21 +02: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 bf8687590e Add textures 2021-02-10 09:03:13 +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
Sergeanur 4f7793a423 Merge pull request #997 from Fire-Head/lcs 
Lcs WaterCannon
 2021-02-03 21:44:21 +02:00
Sergeanur 2e7726c574 Merge pull request #1022 from IlDucci/miami 
[miami] Adding strings to re3's GXT, recompiling GXT files
 2021-02-03 21:44:00 +02:00
Sergeanur 3e0dbf42d4 Add radio off text 2021-01-31 23:46:45 +02:00
Sergeanur c193ade58b Font fixes 2021-01-30 20:46:37 +02:00
Sergeanur d69b73eaa8 Merge pull request #998 from IlDucci/lcs 
Updating Spanish.txt FOLLOWING the existing strings on master and mia…
 2021-01-30 05:19:40 +02: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
Sergeanur 0862c79b21 Merge branch 'miami' into lcs 
* miami:
  Fix anim id in replay
 2021-01-26 19:39:54 +02:00
Sergeanur 2d2625bf75 Fix anim id in replay 2021-01-26 19:39:05 +02:00
Sergeanur fb64bb314c Merge pull request #992 from ForeverL95/ForeverL95-patch-1 
Add spanish translation for new strings
 2021-01-25 22:50:52 +02:00
Sergeanur cea8ad4b85 Fix check 2021-01-25 19:40:19 +02:00
Sergeanur 129d7333be Fix function dupe 2021-01-25 19:38:13 +02:00
Sergeanur 9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
Sergeanur c21e5f5e79 Move CRunningScript 2021-01-25 19:33:02 +02:00
Sergeanur c5ff13abca Update OpenAL 2021-01-25 18:50:27 +02:00
Sergeanur 0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
 2021-01-24 22:22:16 +02:00
Sergeanur c1f0fe1da6 Merge pull request #987 from Sergeanur/lcsHud 
Partial hud
 2021-01-24 22:19:31 +02:00
Sergeanur e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
Sergeanur 2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Sergeanur 13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +02:00
Sergeanur de44a17e64 Fix ini name 2021-01-23 18:16:47 +02:00
Sergeanur e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/core/re3.cpp
 2021-01-23 17:54:46 +02:00
Sergeanur defbb01aaa Merge remote-tracking branch 'origin/lcs' into lcs 
* origin/lcs:
  Remove size assert
  Add TXD mid field
  Enable GTA_BRIDGE
  LCS model indices
 2021-01-23 15:14:24 +02:00
Sergeanur 904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
 2021-01-23 15:14:15 +02:00
Sergeanur 4bde3366c1 Merge pull request #980 from Sergeanur/lcsMID 
LCS model indices
 2021-01-23 15:09:54 +02:00
Sergeanur cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
Sergeanur e03aaec030 Add (Don't) walk lights 2021-01-23 04:07:50 +02:00
Sergeanur 0aad73f4a1 Remove size assert 2021-01-23 03:39:24 +02:00
Sergeanur 3565f179af Add TXD mid field 2021-01-23 03:12:01 +02:00
Sergeanur b35b0c598d Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
Sergeanur 6b54d04bfc LCS model indices 2021-01-23 02:56:48 +02:00
Sergeanur c884edd923 cSmallHeap 2021-01-23 00:03:12 +02:00
Sergeanur e019bd91fd Reenable PS2_AUDIO_PATHS 2021-01-22 19:46:50 +02:00
Sergeanur ea916b6ae5 Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  fix config.h
  small premake fix
 2021-01-22 19:45:58 +02:00
Sergeanur cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
 2021-01-22 15:04:09 +02:00
Sergeanur 8dab92d158 CMessages::GetTokenPadKeyString 2021-01-22 05:49:17 +02:00
Sergeanur b5deee823c Load LCS radar blips 2021-01-22 04:00:17 +02:00
Sergeanur 7091ab5e75 Fix save/load and brief menus 2021-01-22 02:44:32 +02:00
Sergeanur 0495d0f232 GXT fixes 2021-01-22 02:26:26 +02:00
Sergeanur e6d9a0d1ad Get rid of outro screen 2021-01-22 02:19:02 +02:00
Sergeanur 06d8860d42 Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  fuck
  bletch
  fixed anisotropic filtering; updated librw
  fix
 2021-01-22 01:58:38 +02:00
Sergeanur 9d2509ab5b A bit of frontend and GXT 2021-01-22 01:56:47 +02:00
Sergeanur e8db0e3abb Merge branch 'lcs' into lcsfont 
* lcs:
  fix
  enable screenshots for librw; update librw
  Get rid of bitfields in CPool
  Sync matrix with master
  free cam inversion fix
  free cam inversion fix
  Fix CFont::PrintStringFromBottom
  pc radar fix
  work on colourfilters
  PSP rendering and shader cleanup
  fix handbrake
  fix
  wrong ifdef
  fix
  some free cam fixes for controller
  sync milessdk with re3mss
  vehicle fixes
  fix
  add the bad crack "features" behind SECUROM define

# Conflicts:
#	src/render/Font.cpp
 2021-01-21 23:11:36 +02:00
Sergeanur ed74182cc2 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	vendor/librw
 2021-01-21 16:03:27 +02:00