archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-05 22:17:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,434 Commits 3 Branches 0 Tags
f4894952fcf2b906051801d86959776b31908c95
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergeanur 4141caa4d6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/core/Radar.cpp
#	src/core/config.h
 2021-08-12 16:04:25 +03:00
Sergeanur 0a2df3ca4c Fix sampman_null 2021-08-12 15:03:38 +03:00
Sergeanur 92c5cf1877 Sync audio changes from master 2021-08-12 14:57:16 +03:00
Sergeanur 43fbf297c8 Waypoint text fix 2021-08-12 14:15:49 +03:00
Sergeanur ec22576e49 Merge remote-tracking branch 'aap/lcs' into lcs 
# Conflicts:
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
 2021-08-12 11:45:25 +03:00
Sergeanur 9a1b826021 Merge remote-tracking branch 'origin/miami' into lcs 2021-08-12 11:43:17 +03:00
Sergeanur 68c37d2d88 Reverse miami vice ped comments 2021-08-11 10:55:00 +03:00
Sergeanur 80dc23621e uncomment GetSpecialCharacterTalkSfx 2021-08-11 10:47:02 +03:00
Sergeanur b289bb4edb Reverse special characters' ped comments 2021-08-11 10:09:20 +03:00
Sergeanur 2c79080e1b Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/Radar.cpp
#	src/core/Radar.h
 2021-08-11 09:36:58 +03:00
Sergeanur 75f812cfcd Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/RoadBlocks.cpp
#	src/core/Radar.cpp
#	src/core/Radar.h
#	src/peds/Ped.cpp
#	src/peds/Population.cpp
#	src/renderer/Renderer.cpp
#	src/vehicles/CarGen.cpp
 2021-08-11 09:32:59 +03:00
Sergeanur 463fdab6a4 Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2 2021-08-11 08:42:26 +03:00
Sergeanur d7a28c4d2b Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-11 08:35:01 +03:00
Sergeanur 0544beb00d Add sprite to the waypoint marker 2021-08-11 08:15:30 +03:00
Sergeanur 1f98f01dcb Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-09 18:14:19 +03:00
Sergeanur 8ea411e4c5 Add sprite to the waypoint marker 2021-08-09 18:07:42 +03:00
Sergeanur 26a9ac91ee Merge branch 'miami' into lcs 2021-08-08 18:02:45 +03:00
Sergeanur 76a22c0d13 Fix 2021-08-08 18:02:23 +03:00
Sergeanur f887d515fa Sync fix from miami 2021-08-08 17:53:01 +03:00
SergeanurandGitHub cb5586e658 Merge pull request #1268 from Nick007J/master 
move debug stuff to a separate file
 2021-08-02 15:06:40 +03:00
Sergeanur 865ce46fdb Fix waypoint disappearing after each save 2021-08-02 14:26:00 +03:00
Sergeanur a481b900b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/modelinfo/MloModelInfo.cpp
#	src/modelinfo/MloModelInfo.h
#	src/renderer/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-07-31 20:43:52 +03:00
Sergeanur 835fa4e74b Make cars and peds to not despawn when you look away 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/core/config.h
#	src/peds/Population.cpp
 2021-07-31 20:32:13 +03:00
SergeanurandGitHub 232b5a04ba Merge pull request #1251 from Sergeanur/HigherDrawDist 
Make cars and peds to not despawn when you look away
 2021-07-31 20:07:29 +03:00
SergeanurandGitHub 9d25e7f315 Merge pull request #1248 from davicr/radar-cutscene-bugfix 
Fix blip rendering during scripted sequences
 2021-07-31 20:06:20 +03:00
Sergeanur e8dcc8432d Possible crashfix with wanted level 2021-07-30 20:36:07 +03:00
Sergeanur b77d93ba4a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-29 01:59:20 +03:00
Sergeanur 7bacf3b6f4 Reverse unused audio functions 2021-07-29 01:52:49 +03:00
Sergeanur cce97588fe Reverse unused audio functions from mobile 
# Conflicts:
#	src/audio/AudioManager.h
 2021-07-29 00:43:04 +03:00
Sergeanur 6cea1de9e6 Reverse unused audio functions from mobile 2021-07-29 00:40:32 +03:00
Sergeanur 81673ab304 Fix comments 2021-07-28 10:36:18 +03:00
Sergeanur 04126cd18a Merge branch 'miami' into lcs 2021-07-28 10:32:58 +03:00
Sergeanur 2aa37813d2 cAudioManager declaration reordering 2021-07-28 10:32:43 +03:00
Sergeanur 92679555b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/MusicManager.cpp
 2021-07-28 09:42:24 +03:00
Sergeanur 8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur 7adc85995f Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2021-07-28 09:24:23 +03:00
Sergeanur 61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur 98003d0d41 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:56:42 +03:00
Sergeanur 49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur 029e315f0a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:42:18 +03:00
Sergeanur 16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur f82c3c8ea7 Merge branch 'miami' into lcs 2021-07-27 22:39:14 +03:00
Sergeanur 9dbaa7a77f PolRadio type fixes 2021-07-27 22:38:57 +03:00
Sergeanur d0666a8702 One more type fix 2021-07-27 22:38:35 +03:00
Sergeanur 16e2e3d091 Type fix 2021-07-27 22:32:47 +03:00
Sergeanur fbb42085bd Merge branch 'miami' into lcs 2021-07-27 22:30:45 +03:00
Sergeanur 7aa8d7c073 AudioManager.cpp reordering 2021-07-27 22:29:40 +03:00
Sergeanur ad2ccdb44a Merge branch 'miami' into lcs 2021-07-27 22:02:45 +03:00
Sergeanur 782d38c6b7 Sort AudioCollision functions into original order 2021-07-27 22:02:25 +03:00
Sergeanur 5240dce018 cAudioManager::GetCollisionOneShotRatio cleanup 2021-07-27 22:01:17 +03:00
SergeanurandGitHub ec7d702185 Merge pull request #1255 from Nick007J/lcs 
low effort save support
 2021-07-27 20:59:08 +03:00
Sergeanur 6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
Sergeanur c0488b3190 Fix stuck looking flag when answering phone and idle weapon animation 2021-07-26 20:40:55 +03:00
Sergeanur 1180f32d9c Fix bike kick sound 2021-07-26 11:33:56 +03:00
Sergeanur 371f1be9b3 Fix smooth spray when using chainsaw or when you stop shooting while using free camera and PC controls 2021-07-26 09:54:04 +03:00
Sergeanur 250727c9ca Fix muzzleflash rotation 2021-07-26 09:52:39 +03:00
Sergeanur f7a2c265b3 Remove deceiving comment 2021-07-26 09:16:43 +03:00
Sergeanur f19a1aebd4 Remove deceiving comment 2021-07-26 09:16:20 +03:00
Sergeanur bc3734cae3 Fix smooth spray when shooting with colt or usi while using PC controls 2021-07-26 09:13:16 +03:00
Sergeanur cafc0f3c10 Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:28:01 +03:00
Sergeanur 123f2fda9b Fix ridiculously accurate bullets when you shoot behind with enabled free camera 2021-07-26 08:22:57 +03:00
Sergeanur 1aac4d802f Fix Tommy looking at one spot due to crouching + shooting 2021-07-26 07:41:34 +03:00
Sergeanur f73dfa12e6 Make cars and peds to not despawn when you look away 2021-07-26 04:43:26 +03:00
Sergeanur 6a94299eac Fix 2021-07-26 04:42:15 +03:00
Sergeanur ed9c911a0e Fix traffic light corona facing wrong side 2021-07-26 04:40:23 +03:00
Sergeanur a064b3a687 Audio changes: 
- Reorder AudioCollision.cpp functions into original order
- Add missing cAudioCollision::Reset()
- Move cAudioCollision ctor into .h (like original)
- Fix argument types for ped comment functions and more
- Fix wrong names of ped comment functions
- Fix incorrect ped comments
- Remove getters
- Reorder declarations of cAudioManager
- Wrap PC only functions around ifdef
- Add cAudioManager methods from PS2 and mobile
 2021-07-26 04:34:55 +03:00
Sergeanur a510a03b8a Small fix 2021-07-25 22:27:00 +03:00
Sergeanur c234cb4663 Law enforcers and generic female ped comments 2021-07-25 22:16:02 +03:00
Sergeanur d83b8cf940 Merge branch 'miami' into lcs 
# Conflicts:
#	src/renderer/Hud.cpp
 2021-07-25 21:01:00 +03:00
Sergeanur 5032d24ad8 Fix 2021-07-25 19:59:02 +03:00
Sergeanur 601f63f4fb Sync fix from master 2021-07-25 19:50:00 +03:00
Sergeanur bf757fc960 Fix CPlayerInfo distance types 2021-07-24 00:59:19 +03:00
Sergeanur 3adf37a3a9 Fix aiming with flamethrower with PC controls 2021-07-22 22:54:30 +03:00
Sergeanur aec797671e Fix aiming with minigun and flamethrower with PC controls 2021-07-22 22:15:27 +03:00
Sergeanur cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
Sergeanur 1d1f10d68c Fixes from miami 2021-07-22 20:56:15 +03:00
Sergeanur 5e34b1efcf Possible fix of RemoveAndAdd crash 2021-07-22 20:37:49 +03:00
Sergeanur 953e4fc4ff Fix falling damage 2021-07-22 20:07:51 +03:00
Sergeanur bbbe9b2632 Fix enum use 2021-07-22 07:06:54 +03:00
Sergeanur a1444b992f Fix Predator shooting sound 2021-07-22 07:01:04 +03:00
Sergeanur 7a034142c9 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
 2021-07-18 00:05:51 +03:00
Sergeanur d0404cbdb7 render -> renderer (original name) 2021-07-18 00:04:26 +03:00
Sergeanur c937bdbfea render -> renderer (original name) 2021-07-18 00:03:57 +03:00
Sergeanur 026a2b3f1f Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp
#	src/core/config.h
 2021-07-15 18:07:22 +03:00
Sergeanur 780cd225e9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:12 +03:00
Sergeanur 2ce36a48b9 Make PS2 VB files work together with PC audio files 2021-07-15 18:06:02 +03:00
Sergeanur 3377709c4b Merge branch 'miami' into lcs 2021-07-15 00:51:01 +03:00
Sergeanur 17fca82401 Update GXT 2021-07-15 00:50:41 +03:00
Sergeanur 02c4ada807 Remove stupid cast 2021-07-15 00:49:46 +03:00
Sergeanur 4f78733836 Remove stupid cast 2021-07-15 00:47:11 +03:00
Sergeanur c982700a69 Enable cutscene shadows 2021-07-13 01:00:00 +03:00
Sergeanur 55d30a11ec Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioManager.h
#	src/control/Garages.cpp
#	src/control/Garages.h
#	src/control/Script5.cpp
#	src/core/config.h
#	utils/gxt/american.txt
#	utils/gxt/spanish.txt
 2021-07-12 04:13:22 +03:00
Sergeanur 3f5fdc39a5 Reorganize config.h 2021-07-12 03:58:34 +03:00
Sergeanur b4364c3672 Reorganize config.h 2021-07-12 03:34:37 +03:00
Sergeanur dc29e7c044 Add PED DENSITY and CAR DENSITY lines to GXT 2021-07-11 23:55:11 +03:00
Sergeanur 11434f96cc Add PED DENSITY and CAR DENSITY lines to GXT 2021-07-11 23:52:55 +03:00
Sergeanur 6a2ce20313 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	gamefiles/TEXT/german.gxt
#	utils/gxt/german.txt
 2021-07-10 02:10:12 +03:00
Sergeanur 71d1b46417 Merge branch 'miami' into lcs 
# Conflicts:
#	utils/gxt/german.txt
 2021-07-10 02:07:14 +03:00
Sergeanur 4981fe3091 Remove redundant SampleManager.InitialiseChannel call 2021-07-10 02:06:35 +03:00
Sergeanur ddf2b09e55 Update GXT compiler with fix of German 2021-07-10 02:04:35 +03:00