archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-05 20:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,406 Commits 3 Branches 0 Tags
826be7472fd35a863762ac4d12b46ce2f26f8b80
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SergeanurandGitHub 4f7793a423 Merge pull request #997 from Fire-Head/lcs 
Lcs WaterCannon
 2021-02-03 21:44:21 +02:00
SergeanurandGitHub 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 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
SergeanurandGitHub 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
SergeanurandGitHub 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
SergeanurandGitHub 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
Sergeanur cc94419a72 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
 2021-01-20 19:32:03 +02:00
Sergeanur c7c7eff918 Get rid of bitfields in CPool 
# Conflicts:
#	src/core/templates.h
 2021-01-20 19:24:08 +02:00
Sergeanur 3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
Sergeanur 95448eea3d More fonts 2021-01-20 18:40:54 +02:00
Sergeanur 9b820cc0b6 Fix CFont::PrintStringFromBottom 2021-01-20 14:23:03 +02:00
Sergeanur 3ebd08e38c Merge branch 'lcs' into lcsfont 
* lcs:
  fix
  some free cam fixes for controller
  initial work on vehicles
 2021-01-19 03:25:00 +02:00
Sergeanur f38ff074c4 more font 2021-01-19 03:24:02 +02:00
Sergeanur 8d2aa61f9b Merge branch 'lcs' into lcsfont 
# Conflicts:
#	src/render/Font.cpp
 2021-01-18 15:01:17 +02:00
Sergeanur 8395704dc6 Use of sized bool types for CFont 2021-01-18 14:55:48 +02:00
Sergeanur eb5fdac918 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
 2021-01-16 16:56:24 +02:00
Sergeanur 518bc555a6 font 2021-01-16 16:55:26 +02:00
Sergeanur 21a6ed247b Use of sized bool types for CFont 2021-01-16 16:06:11 +02:00
Sergeanur 4bd7bafd7c Merge branch 'miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
 2021-01-15 17:57:35 +02:00
Sergeanur 19749effce Fix Jumbo Sound reseting when walking 2021-01-15 17:54:21 +02:00
Sergeanur ff057838ec Merge branch 'miami' into lcs 
* miami:
  Fix backface culling of cutscene objects
  more renames
  anim velocity union
  rename m_vehEnterType -> m_vehDoor
  Port cmake improvements to miami
  some loose ends
  move TODO to Readme
  Fix build without FIX_BUGS, divide to 0 fixes
 2021-01-13 14:56:25 +02:00
Sergeanur 0e9a44dd43 Fix backface culling of cutscene objects 2021-01-13 14:55:55 +02:00
Sergeanur 94f25a429f Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  more securom fixes
  move stuff back into class; securom comments
  More font fixes
  fix
  fix CreateInstance virtual overload order
  escalator fix
  ProcessWheel bug
 2021-01-13 02:08:13 +02:00
Sergeanur 92b1e8ab75 More font fixes 2021-01-13 01:01:04 +02:00
Sergeanur f73e870bde Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  bug of the decade
  big oof
  colmodel fix
 2021-01-12 22:29:50 +02:00
SergeanurandGitHub 8888ee3974 Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr 
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
 2021-01-12 13:22:44 +02:00
Sergeanur cb4b4d584c Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
 2021-01-12 12:55:07 +02:00
Sergeanur 7e888a6379 Fix collective commands 2021-01-12 02:29:10 +02:00
Sergeanur dcb4eedeb0 Fix collective commands 2021-01-12 02:28:08 +02:00
Sergeanur 3e6eea25b3 More fix 2021-01-12 02:15:44 +02:00
Sergeanur 2ce6e59d9b PLAY_ANNOUNCEMENT 2021-01-11 23:55:45 +02:00
Sergeanur 132a710a0a Case sensitive my ass 2021-01-11 23:50:56 +02:00
Sergeanur a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
Sergeanur 585300cd33 More font fix 2021-01-10 22:37:11 +02:00
Sergeanur 322d93ab0c Fix font 2021-01-09 16:55:45 +02:00
Sergeanur 852c3badbb Change window name 2021-01-09 14:21:46 +02:00
Sergeanur e5b7628802 Remove fake firetruck ID 2021-01-09 13:43:09 +02:00
Sergeanur da10ce7b05 More linux fix 2021-01-09 13:33:45 +02:00
Sergeanur b484638bb9 Merge remote-tracking branch 'origin/lcs' into lcs 
* origin/lcs:
  cam sector fix
  streaming fixes
 2021-01-09 13:24:26 +02:00
Sergeanur 9a145ab15f Possibly fix linux build 2021-01-09 13:24:09 +02:00
Sergeanur 2ce925caba Sector sizes 2021-01-09 01:22:50 +02:00
Sergeanur a871da4fbe Add Relocatable Chunk stubs 2021-01-08 23:42:42 +02:00
Sergeanur b6875b41f4 Level 4 2021-01-08 23:20:52 +02:00
Sergeanur de13141b68 CKeyGen fixes 2021-01-08 22:39:25 +02:00
Sergeanur af09cb06f5 Merge branch 'miami' into lcs 
* miami:
  Use original names
 2021-01-08 21:53:42 +02:00
Sergeanur faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
Sergeanur 079b8e0e16 CKeyGen 2021-01-08 20:51:31 +02:00
Sergeanur 4debd89d8e Merge branch 'miami' into lcs 
# Conflicts:
#	src/render/Timecycle.cpp
 2021-01-08 20:24:43 +02:00
Sergeanur 68e8c1ce04 Add multisampling 2021-01-08 20:22:08 +02:00
Sergeanur bf3135eb41 Enable trains 2021-01-08 18:31:50 +02:00
Sergeanur e9001207ea Disable water creatures 2021-01-08 18:26:35 +02:00
Sergeanur 95260371cb Train anims in enum 2021-01-08 18:25:35 +02:00
Sergeanur c6c55d0130 Train anims in enum 2021-01-08 18:24:53 +02:00
Sergeanur 5fb3edf258 Allocator fix 2021-01-08 17:21:07 +02:00
Sergeanur ecdd751ec3 PC controls and icon 2021-01-08 16:57:22 +02:00
Sergeanur ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02:00
Sergeanur 8485dcdb03 Update readme and workflows 2021-01-08 16:38:27 +02:00
Sergeanur d68ffc2da6 Original GXT support 2021-01-08 15:34:21 +02:00
Sergeanur 0e2af13656 Merge branch 'miami' into lcs 
* miami:
  wtf
  fix
  small cleanup
  Fix gOneShotCol
  Fix garage messages position
  Fix font on green screen counter
  Add MPG123_QUIET to mp3 files
  Make opus available alongside other formats
  Fix pickup text
  Fix char in stats
  Add missing GXT line
  fail
  minor refactoring
  Fix 16KHz track
  GET_WHEELIE_STATS fix
  Cleanup and fixes for new decoders
  Fixes for CVbFile
  Small fixes for new wav decoder
  Remove fastmath from premake's config
  Implementing our own WAV decoder to replace SndFile
 2021-01-08 14:47:37 +02:00
Sergeanur 556b9ae574 Fix gOneShotCol 2021-01-08 00:47:21 +02:00
Sergeanur 24d73aeb71 Fix garage messages position 2021-01-08 00:04:38 +02:00
Sergeanur debf39fe64 Fix font on green screen counter 2021-01-07 23:47:17 +02:00
Sergeanur c423c59365 Add MPG123_QUIET to mp3 files 2021-01-07 22:15:55 +02:00
Sergeanur 6b0fa20b8b Make opus available alongside other formats 2021-01-07 22:01:44 +02:00
Sergeanur 0428b5b694 Fix pickup text 2021-01-07 21:55:41 +02:00
Sergeanur c2672bd630 Fix char in stats 2021-01-07 21:00:20 +02:00
Sergeanur eecf095077 Add missing GXT line 2021-01-07 20:57:17 +02:00