joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,619 Commits 3 Branches 0 Tags 63 MiB
Commit Graph

648 Commits

Author SHA1 Message Date
Nikolay Korolev c5c887cc11 merge 2021-08-29 19:40:10 +03:00
Nikolay Korolev 453f8c05a4 script revision p1 2021-08-29 19:32:22 +03:00
Sergeanur eeacbfeb6a Merge branch 'miami' into lcs 2021-08-29 10:31:13 +03:00
Sergeanur 9a7b469f4e Audio: fixing bugs, fixing types, making code more accurate to original 2021-08-29 09:42:32 +03:00
Sergeanur 2be8fcfa64 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/audio/AudioManager.cpp
#	src/core/Radar.cpp
 2021-08-29 08:58:54 +03:00
Nikolay Korolev b7db2a12d4 keep noinline only for broken vs versions 2021-08-26 01:47:17 +03:00
Sergeanur 800ab92960 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
 2021-08-25 09:07:41 +03:00
erorcun 285fee01f2 PedIK: fix fix 2021-08-22 12:23:12 +03:00
erorcun d4ce6bcde0 Fix a bug about switching to previous weapon unintendedly 2021-08-21 16:34:26 +03:00
Sergeanur e0be6beb18 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
#	src/audio/PolRadio.cpp
#	src/control/CarCtrl.cpp
 2021-08-21 13:25:42 +03:00
erorcun 80b7d52eeb Auto switch to remote grenade after detonator 2021-08-20 21:59:50 +03:00
erorcun 0256790e1c Fix some auto-aim problems 2021-08-20 21:26:19 +03:00
Sergeanur d7e764d519 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/AudioLogic.cpp
#	src/core/config.h
#	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-08-16 10:09:39 +03:00
aap 2f92ccecb1 work on CAutomobile 2021-08-16 00:19:09 +02:00
erorcun 435b8fe52e Fix impossible bullets 2021-08-15 18:34:43 +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 2c79080e1b Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/Radar.cpp
#	src/core/Radar.h
 2021-08-11 09:36:58 +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
Nikolay Korolev 9cc1201892 merge 2021-08-08 13:38:21 +03:00
aap 621f941ff7 CVehicle done 2021-08-04 13:56:29 +02:00
aap bec1cbc1cb CVehicle fixes and cleanup 2021-08-04 13:54:26 +02:00
erorcun 192190769d Add ped and car density slider to menu, remove dumb collision "optimization" 2021-08-01 13:56:09 +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
Magnus Larsen d923cd2f24 Allow sector ped count to exceed gap-list size 
This solves the gnNumTempPedList assertion.
To prove this works, change gapTempPedList's length to 12, and visit the
Triad's basketball court.

# Conflicts:
#	src/peds/Ped.cpp
 2021-07-31 20:34:32 +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
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 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 f7a2c265b3 Remove deceiving comment 2021-07-26 09:16:43 +03:00
Sergeanur 1aac4d802f Fix Tommy looking at one spot due to crouching + shooting 2021-07-26 07:41:34 +03:00
Sergeanur d83b8cf940 Merge branch 'miami' into lcs 
# Conflicts:
#	src/renderer/Hud.cpp
 2021-07-25 21:01:00 +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 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 3377709c4b Merge branch 'miami' into lcs 2021-07-15 00:51:01 +03:00
Magnus Larsen fb5a207abc Fix NearPed count going negative 2021-07-13 17:45:01 +02: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
withmorten 6f103a3b82 finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 02:06:43 +02:00
Sergeanur 5d5e0f62e8 Merge branch 'miami' into lcs 
# Conflicts:
#	premake5.lua
 2021-07-03 16:39:22 +03:00
erorcun 1c0878f65b Sanitizer fixes 2 2021-07-03 02:57:32 +03:00
erorcun 4eea98c66b Peds: Efforts to find the reason of crashes on GCC 7.5.0 
* Prevent deleted peds to be in nearPeds list (was always needed, might be unrelated to crashes)
* Add asserts to nearPeds and PedIK ctor (crash reasons)
* Shouldn't fix reported crashes since they were caused by null peds.
 2021-07-02 23:56:54 +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
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 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 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 776e8ff2ee Fix some timer calls 2021-06-24 21:45:48 +03:00