mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-03-06 03:59:39 +00:00
Code Issues Projects Releases Wiki Activity
5398 commits 3 branches 0 tags 56 MiB
Commit graph

4483 commits

Author SHA1 Message Date
Nikolay Korolev 2420325c02 fix 2021-01-31 01:45:07 +03:00
Nikolay Korolev 07a5cc6544 garages 2021-01-31 01:38:00 +03:00
withmorten 5dfe396af3 use macro for waterlevel z offset 2021-01-30 20:13:25 +01:00
Sergeanur c193ade58b Font fixes 2021-01-30 20:46:37 +02:00
Nikolay Korolev 01d4312251 Merge branch 'lcs' into lcs-dev 2021-01-30 20:27:26 +03:00
Nikolay Korolev 2c29ab5542 fix 2021-01-30 20:27:02 +03:00
Nikolay Korolev 8b08098d4e fix 2021-01-30 20:26:10 +03:00
Nikolay Korolev c3c2a4269d stuff 2021-01-30 20:23:30 +03:00
Nikolay Korolev a0c5d75f83 fixed bike bomb 2021-01-30 14:55:00 +03:00
Nikolay Korolev dbf5c06144 fixed bike bomb 2021-01-30 14:53:51 +03:00
withmorten 990637bf52 waterlevel: use macro for 400.0f 2021-01-29 17:57:51 +01:00
erorcun f61a91c97d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-29 19:30:27 +03:00
erorcun d52b917c54 Some regular fixes and UB fixes 2021-01-29 19:23:02 +03:00
erorcun f5f153dbfd Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-29 19:16:40 +03:00
erorcun c4328afce7 Even more fixes & shorten quit screen 2021-01-29 19:16:26 +03:00
withmorten f7fc919d98 add NewRenderer ini read/write 2021-01-29 16:46:03 +01:00
withmorten 7db28f9f7f fix NewRender typo 2021-01-29 16:43:17 +01:00
withmorten 934aa92a9b add NewRenderer ini read/write, fix backfaceculling read 2021-01-29 16:41:34 +01:00
erorcun 2e7405b76c CdStreamPosix fixes 2021-01-29 16:31:13 +03:00
erorcun 982b024c5c CdStreamPosix fixes 2021-01-29 16:25:32 +03:00
aap 595a000f6a fix shutdown 2021-01-29 13:43:50 +01:00
withmorten 8482180706 waterlevel fix fix 2021-01-29 01:20:20 +01:00
withmorten 2fc6b542bc waterlevel fix 2021-01-29 01:18:32 +01:00
erorcun 810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
Nikolay Korolev 4270180b8b fix 2021-01-29 00:05:57 +03:00
Nikolay Korolev 2d5f087041 fix 2021-01-28 23:25:59 +03:00
Nikolay Korolev 7056f9954f fix 2021-01-28 23:25:15 +03:00
Nikolay Korolev 7c38e2db24 fix 2021-01-28 23:23:49 +03:00
aap 64a4ed6db6 fixed uninitialized nearclip 2021-01-28 17:40:15 +01:00
aap 9e3c192376 fix some little UB 2021-01-28 15:35:35 +01:00
aap ebb615d080 fix some little UB 2021-01-28 15:30:32 +01:00
erorcun e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +03:00
erorcun 2d0562412e Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:49:50 +03:00
Nikolay Korolev 9fc0ec0bf4 I hate ATanOfXY pt 2 2021-01-28 02:41:21 +03:00
erorcun 2b269ff1c0 Fix some Collision NaN/inf's 2021-01-28 02:18:04 +03:00
erorcun 8150f55dbc
Merge pull request #1002 from kusst/miami 
Change text color in texture conversion dialog so it matches VC colors.
 2021-01-28 02:16:04 +03:00
kusst 8a7c7efe85
ifdefs + fix progressbar being under dialogbox 2021-01-27 23:56:23 +01:00
Nikolay Korolev 3f8e258055 fix 2021-01-28 01:50:10 +03:00
Nikolay Korolev fa2eb24ba2 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-28 01:08:18 +03:00
Nikolay Korolev 433baf5f3c fix 2021-01-28 01:08:06 +03:00
GaryOderNichts d2cf090ace Fix texture conversion box 2021-01-27 23:06:43 +01:00
erorcun be88a42bad Fix some Collision NaN/inf's 2021-01-28 00:51:43 +03:00
erorcun a216bb56ee Attempt to fix input delays on GLFW 2021-01-27 22:19:10 +03:00
erorcun ab939e059b Clean up POSIX streaming code 2021-01-27 22:19:00 +03: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
erorcun 8846f50cb7 Attempt to fix input delays on GLFW 2021-01-27 18:26:48 +03:00
erorcun 843dd9b5e1 Clean up POSIX streaming code 2021-01-27 18:26:08 +03:00
kusst e1e13d14a4
Also change progressbar color 2021-01-27 03:36:22 +01:00
kusst 30c26e5a9c
Change text color in texture conversion dialog... 
...so it matches VC style.
 2021-01-27 00:35:57 +01:00
aap 70c1f0640d add missing ferry vehicle desc 2021-01-26 19:24:22 +01:00
Nikolay Korolev 9b1db9709b Merge branch 'lcs' into lcs-dev 2021-01-26 21:10:55 +03:00
Nikolay Korolev edb50b66a0 enum change 2021-01-26 20:46:42 +03: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 0f623c2354 Use original animation names from VCS 2021-01-26 19:35:40 +02:00
Sergeanur f27e1ec818 Fix doubles in ZoneCull 2021-01-26 19:26:28 +02:00
Nikolay Korolev 2fea28f194 fix 2021-01-26 02:27:57 +03:00
Nikolay Korolev 42d9d6abc8 syncd 2021-01-26 02:27:32 +03:00
Nikolay Korolev 46e63da4d8 sync 2021-01-26 02:25:47 +03:00
Nikolay Korolev d7bd0be53e garage stuff 2021-01-26 02:23:55 +03:00
Fire_Head 0ae6d1fecf
Merge branch 'lcs' into lcs 2021-01-26 01:01:32 +03:00
Fire-Head d898abf63d config 2021-01-26 00:55:55 +03:00
Fire-Head ba4028b9dd lcs WaterCannon 2021-01-26 00:52:03 +03: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
erorcun 202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
erorcun cb34060f00 Support pads without L2-R2, add comments 2021-01-25 16:48:41 +03:00
withmorten 9d4053419b
Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
aap 785bd8ebcc proper ini fix 2021-01-25 13:02:00 +01:00
aap a4c5b87b90 more bletcherous stuff 2021-01-25 10:45:38 +01:00
aap fef87b9219 fix some breakage 2021-01-25 10:43:12 +01:00
aap 4f591aa87a ini fixes 2021-01-25 10:30:57 +01:00
aap d6544933aa
Merge pull request #984 from aap/lcs 
modelinfos
 2021-01-25 10:30:34 +01:00
aap 453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap 4564f7aeea modelinfo fixes 2021-01-24 23:24:41 +01:00
aap ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
shfil 1ab96abb91 Add cmake option for sanitizers 2021-01-24 21:36:13 +01:00
shfil 513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
shfil 1d3b4d1e9a
Add cmake option for sanitizers 2021-01-24 21:34:53 +01:00
Sergeanur 0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
 2021-01-24 22:22:16 +02:00
erorcun 071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
erorcun 5336620f5c Ped: car enter anim. fix 2021-01-24 20:05:43 +03:00
erorcun a0bf47cfd2 Fix out of bound binding orders 2021-01-24 19:39:31 +03:00
aap a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
Sergeanur e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
aap 1bee2caf5c CClumpModelInfo 2021-01-24 15:28:26 +01:00
aap 9361aeb8eb CTimeModelInfo and CWeaponModelInfo 2021-01-24 14:06:16 +01:00
aap 8cbae5d62a CSimpleModelInfo 2021-01-24 13:47:33 +01:00
shfil d68ec362dd
Fix CCollision::DistToLine 2021-01-24 12:36:43 +01:00
shfil ca1de3cd17
Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
shfil 3e6bb267f3
Fix CCollision::DistToLine 2021-01-24 12:34:40 +01:00
aap c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
withmorten 5183d7cf0f enable default resolution for vanilla defines 2021-01-23 23:18:05 +01:00
withmorten db6b7b473d whitespace fix 2021-01-23 23:02:22 +01:00
Nikolay Korolev 8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
Nikolay Korolev c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +03:00
Nikolay Korolev 4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
Nikolay Korolev de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev 6bdc0365ee another backport 2021-01-23 23:15:50 +03:00
Nikolay Korolev 4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
Nikolay Korolev 921ca7712e use ARRAY_SIZE 2021-01-23 23:10:59 +03:00
aap 4269e613a3
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch 
Fix plane / ccbb cheat flight pitch
 2021-01-23 21:06:33 +01:00
Sergeanur 2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Nikolay Korolev d28e9a7b62 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 23:04:38 +03:00
Nikolay Korolev 37d1aa4129 script fixes 2021-01-23 23:04:24 +03:00
Zach Charo 77051ddc78
Update Vehicle.cpp 2021-01-23 13:38:45 -06:00
aap a1d6833bac txd store 2021-01-23 19:23:38 +01: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
erorcun 770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03:00
erorcun 1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03: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
erorcun 45c2488e36 Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
erorcun 73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
Nikolay Korolev 3326603265 added some missing functions 2021-01-23 15:33:01 +03:00
Nikolay Korolev b5c4866964 added some missing functions 2021-01-23 15:32:07 +03:00
Nikolay Korolev 35258b9b9c added some missing functions 2021-01-23 15:29:00 +03:00
aap f6fb473cf9 revert accident 2021-01-23 12:59:52 +01:00
aap a22b6168c6 wrong path node array 2021-01-23 12:50:46 +01:00
aap 2814f2e8cf wrong path node array 2021-01-23 12:49:54 +01:00
aap 20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
Nikolay Korolev 552497d71b fix 2021-01-23 14:11:57 +03:00
Nikolay Korolev 8d0100f100 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 12:54:27 +03:00
Nikolay Korolev a105003a7a I hate GetATanOfXY 2021-01-23 12:54:08 +03: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
withmorten 2650fa9a92 VANILLA_BUILD fixes 2021-01-23 02:17:28 +01: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
erorcun f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Nikolay Korolev 965a3d6eec Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 02:36:34 +03:00
Nikolay Korolev 917cf44def script coronas 2021-01-23 02:36:13 +03:00
Sergeanur c884edd923 cSmallHeap 2021-01-23 00:03:12 +02:00
withmorten 6f4e2ab491 get rid of unsupported LIBRW in config.h 2021-01-22 22:47:29 +01:00
withmorten 5988c0e95a fix tabs in crossplatform 2021-01-22 22:01:00 +01:00
erorcun 0ea72af60c Peds reporting to phone changes for GTA3D 2021-01-22 23:58:57 +03:00
erorcun 226e3b83da No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-22 23:43:49 +03:00
withmorten f6c846d27a fix 2021-01-22 21:27:18 +01:00
withmorten 3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
withmorten d58f090198 fix RW33 build, undef ANISOTROPIC_FILTERING for vanilla build 2021-01-22 20:33:29 +01:00
Filip Gawin e9adf8162b fix 2021-01-22 19:59:27 +01:00
Filip Gawin 609cad506f Better output for validating size assert 2021-01-22 19:54:43 +01:00
Nikolay Korolev bdb216bf7c fix 2021-01-22 20:59:57 +03: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
withmorten cc6d5374d5 fix config.h 2021-01-22 18:41:58 +01: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
withmorten feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01: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 e6d9a0d1ad Get rid of outro screen 2021-01-22 02:19:02 +02:00
aap c8236d0dd2
Merge pull request #976 from Fire-Head/lcs 
Lcs pobj
 2021-01-22 01:12:03 +01:00
Fire_Head 6bdf005171
Update ParticleObject.h 2021-01-22 03:10:19 +03:00
aap ce77e80414
Merge pull request #963 from Nick007J/lcs 
all LCS script commands
 2021-01-22 00:59:20 +01:00
aap de10f0dda6
Merge pull request #975 from aap/lcs 
loadscreens, not accurate
 2021-01-22 00:59:13 +01:00
Fire-Head 37b9ba5bd7 lcs pobj 2021-01-22 02:59:08 +03:00
aap 035d655e47
Merge pull request #972 from Sergeanur/lcsfont 
Partial CFont
 2021-01-22 00:59:07 +01: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
aap f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +01:00
aap 8520bbd2c7 higher wheel LOD dist 2021-01-22 00:40:46 +01:00
withmorten d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
withmorten 497e0b801f m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:19:44 +01:00
withmorten a511d79bf0 free cam fixes 2021-01-21 23:21:03 +01:00
aap 69500eed56 how the hell did that happen? 2021-01-21 22:35:11 +01:00
aap c67273e92a fixed anisotropic filtering; updated librw 2021-01-21 22:30:20 +01:00
aap 1999427225 fuck 2021-01-21 22:26:44 +01:00
aap 94ff966994 bletch 2021-01-21 22:25:14 +01:00
aap e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01:00
Nikolay Korolev 50cde66067 fix 2021-01-22 00:14:30 +03: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
withmorten ef24783bff
Merge pull request #968 from withmorten/cw 
make building with Codewarrior 7 possible
 2021-01-21 21:55:33 +01:00
Nikolay Korolev 46ae5700ee a few fixes 2021-01-21 23:51:15 +03:00
Nikolay Korolev c8e715c33b Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-21 23:19:12 +03:00
withmorten 034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
Sergeanur ed74182cc2 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	vendor/librw
 2021-01-21 16:03:27 +02:00
Nikolay Korolev f0097ff733 fix 2021-01-21 16:09:58 +03:00
aap 24de9f92e8 enable screenshots for librw; update librw 2021-01-21 10:21:47 +01:00
aap 6df52f06b6 enable screenshots for librw 2021-01-21 10:19:01 +01:00
withmorten f2596b3759 Merge remote-tracking branch 'upstream/master' into cw 2021-01-21 03:20:31 +01:00
withmorten ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Nikolay Korolev 8e825fa629 fixed saving 2021-01-20 22:16:11 +03:00
Nikolay Korolev a5be17d941 Merge branch 'lcs-dev' into lcs 2021-01-20 21:15:03 +03:00
Nikolay Korolev 23831e38e6 sync 2021-01-20 21:14:12 +03:00
Nikolay Korolev ad745aae63 some more script 2021-01-20 21:12:42 +03: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 c54f5c4b4f
Merge pull request #971 from Sergeanur/PoolFlags 
Get rid of bitfields in CPool
 2021-01-20 18:59:49 +02:00
Sergeanur 9b193a47a2
Merge pull request #966 from Sergeanur/matrix 
Get rid of RwMatrix in CMatrix
 2021-01-20 18:59:33 +02:00
Sergeanur 95448eea3d More fonts 2021-01-20 18:40:54 +02:00
withmorten ba34d72183 free cam inversion fix 2021-01-20 13:59:17 +01:00
withmorten 8590457d41 free cam inversion fix 2021-01-20 13:57:03 +01:00
Sergeanur 9b820cc0b6 Fix CFont::PrintStringFromBottom 2021-01-20 14:23:03 +02:00
Nikolay Korolev b4b4c996ba Merge branch 'lcs-dev' into lcs 2021-01-20 12:12:56 +03:00
Nikolay Korolev b1454276ed Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-20 12:12:46 +03:00
Nikolay Korolev aa0f77043c script fixes 2021-01-20 12:12:26 +03:00
aap 2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
Nikolay Korolev dac4dd560a saves 2021-01-19 23:34:37 +03:00
aap 505438cd90 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-19 21:33:17 +01:00
aap bb66028e74 pc radar fix 2021-01-19 21:33:09 +01:00
aap 7e136a792f work on colourfilters 2021-01-19 20:42:16 +01:00
Sergeanur a9b8d30ce0 Get rid of bitfields in CPool 2021-01-19 21:32:55 +02:00
Sergeanur e6ef164441 Get rid of VuVector 2021-01-19 18:38:10 +02:00
withmorten 25d3066eae fix RWLIBS build without GTA_PS2_STUFF 2021-01-19 12:05:38 +01:00
aap 8baae4c77f PSP rendering and shader cleanup 2021-01-19 11:38:51 +01:00
aap c295981c5a fix handbrake 2021-01-19 09:06:43 +01: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
Nikolay Korolev c124bbe4bf Merge branch 'lcs-dev' into lcs 2021-01-19 02:38:28 +03:00
Nikolay Korolev 061fd25c61 fixes 2021-01-19 02:38:02 +03:00
Nikolay Korolev 923abb94d8 Merge branch 'lcs-dev' into lcs 2021-01-19 00:03:52 +03:00
Nikolay Korolev 03cf1e7535 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-19 00:00:12 +03:00
Nikolay Korolev 8b80a8803b fix 2021-01-18 23:59:54 +03:00
Nikolay Korolev ef59c623fd Merge remote-tracking branch 'upstream/master' 2021-01-18 23:59:16 +03:00
Nikolay Korolev 8c1f4ba65d fix 2021-01-18 23:59:07 +03:00
Nikolay Korolev 47c697feca fixes 2021-01-18 23:58:26 +03:00
Nikolay Korolev 177680216c fix 2021-01-18 22:30:18 +03:00
Nikolay Korolev 14a1d3d251 Merge branch 'lcs' into lcs-dev 2021-01-18 22:20:27 +03:00
Nikolay Korolev 239dd55146 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-18 22:19:50 +03:00
Nikolay Korolev c09297997e script full 2021-01-18 22:19:30 +03:00
withmorten 776693235c fix 2021-01-18 20:10:13 +01:00
withmorten b5c09965a9 some free cam fixes for controller 2021-01-18 20:10:13 +01:00
Sergeanur 91093305d6 Get rid of RwMatrix in CMatrix 2021-01-18 21:06:59 +02:00
aap d01deec11d wrong ifdef 2021-01-18 20:03:30 +01:00
aap 7687ce84ed wrong ifdef 2021-01-18 20:03:24 +01:00
withmorten 20dabf0b49 fix 2021-01-18 17:30:18 +01:00
withmorten df4e22e3d0 some free cam fixes for controller 2021-01-18 17:25:31 +01:00
aap 7a730384ef
Merge pull request #962 from aap/lcs 
initial work on vehicles
 2021-01-18 14:11:55 +01: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
aap a672860c40 initial work on vehicles 2021-01-18 10:59:19 +01:00
withmorten a6faa0384b fix common.h d3d includes 2021-01-17 22:10:04 +01:00
erorcun deaaf3d22f Migrate from old .ini to new .ini 2021-01-17 21:33:53 +01:00
erorcun 448e41ecaa Store all settings in .INI 2021-01-17 21:33:53 +01:00
erorcun 5a47379bf5 Includes overhaul, fix some compiler warnings 2021-01-17 21:32:54 +01:00
aap 2b4b00b388
Merge pull request #960 from withmorten/miami 
add the bad crack "features" behind SECUROM define
 2021-01-17 20:06:25 +01:00
Nikolay Korolev 5e1113d884 fix attempt 2021-01-17 18:46:49 +03:00
Nikolay Korolev 9001a64ef9 Merge branch 'lcs' into lcs-dev 2021-01-17 16:02:56 +03:00
Nikolay Korolev 186441e7f5 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-17 16:02:38 +03:00
Nikolay Korolev e5af1edcb9 script until 1497 2021-01-17 16:02:19 +03:00
aap 913a001375 vehicle fixes 2021-01-17 10:00:41 +01:00
aap 357b67e3f5 vehicle fixes 2021-01-17 10:00:34 +01:00
Fire-Head 777ef6b663 fix ida's sweet little lies 2021-01-17 06:16:49 +03:00
Fire-Head f5164f3804 fix crash on exit 2021-01-17 03:13:21 +03:00
Fire_Head 6075bf3fc2
Merge pull request #959 from Fire-Head/lcs 
Lcs Particle
 2021-01-16 22:00:02 +03:00
Nikolay Korolev e99cd8052c sync 2021-01-16 20:06:55 +03:00
Nikolay Korolev d25420a33b fix 2021-01-16 20:06:10 +03:00
Nikolay Korolev 72b25cd3a8 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-16 20:04:41 +03:00
Nikolay Korolev df98d04d79 fix 2021-01-16 20:04:17 +03:00
Nikolay Korolev 9a7442c2fd script7 2021-01-16 20:02:41 +03:00
Nikolay Korolev ef97134f50 sync 2021-01-16 18:17:42 +03:00
Nikolay Korolev c28ed42617 script6 2021-01-16 18:16:35 +03: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 caa7d3177c Use of sized bool types for CFont 2021-01-16 16:05:27 +02:00
Nikolay Korolev 19505b664c consistency fix 2021-01-16 13:42:46 +03:00
Nikolay Korolev 32ab01cd32 consistency fix 2021-01-16 13:42:04 +03:00
Nikolay Korolev b4f6a9336b more fix 2021-01-16 13:35:36 +03:00
Nikolay Korolev 7ea77d8da4 more fix 2021-01-16 13:32:41 +03:00
Nikolay Korolev 708d5831e4 Script5.cpp 2021-01-16 13:26:46 +03:00
Nikolay 193fb2a381
fix 2021-01-16 13:24:22 +03:00
Filip Gawin d2fac78413 Port debug messagess for audio cache 2021-01-16 01:42:16 +01:00
Filip Gawin 6bebde8279 Port debug messagess for audio cache 2021-01-16 01:38:18 +01:00
Fire-Head 96fdbac69a rem null checks 2021-01-16 01:12:27 +03:00
Fire-Head 8989b5ea39 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-15 19:13:05 +03: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
withmorten d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Filip Gawin 7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
Filip Gawin 5acbf9ef59 fix 2021-01-14 22:20:40 +01:00
Filip Gawin 1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
Filip Gawin a0a88b4663 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-14 22:06:43 +01:00
Filip Gawin c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01:00
Nikolay Korolev 8b6bcef4b7 Merge branch 'lcs' into lcs-dev 2021-01-14 23:21:43 +03:00
Nikolay Korolev c00ebef329 incoming "fuck" commit 2021-01-14 23:21:17 +03:00
Nikolay Korolev 0b0d286f5c incoming "fuck" commit 2021-01-14 23:15:12 +03:00
Filip Gawin 70358d90b4 Backport fix from re3 2021-01-14 15:30:33 +01:00
Nikolay Korolev ad908f5dde fix 2021-01-14 00:16:55 +03:00
Nikolay Korolev 6a93cc49be fix 2021-01-14 00:15:45 +03:00
erorcun a844cbbc3d hud ammo fix 2021-01-13 23:16:25 +03:00
erorcun 13b52229be hud ammo fix 2021-01-13 23:07:12 +03:00
aap ab14a0bc61 foobar 2021-01-13 20:40:20 +01:00
aap 3a6935f126 fixed shoot through collision 2021-01-13 20:39:00 +01:00
aap 7994b80dcf fixed weapon LOS check 2021-01-13 20:10:04 +01:00
Nikolay Korolev 9f914dcd10 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-13 22:03:21 +03:00
Nikolay Korolev daf1de550c fix 2021-01-13 22:02:28 +03:00
Nikolay Korolev a9ab3ea5b4 fix 2021-01-13 20:55:54 +03:00
Fire-Head d63e3f1559 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 20:18:26 +03:00
Nikolay Korolev 7388cc8a78 Merge branch 'lcs' into lcs-dev 2021-01-13 19:47:00 +03:00
erorcun 011a9cc775 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-13 16:54:45 +03:00
erorcun 7f15e11b1b fix save loading, hopefully 2021-01-13 16:54:36 +03:00
aap 361808923a arrest cam fixes 2021-01-13 14:16:38 +01:00
Nikolay Korolev 3e198086e3 some script 2021-01-13 16:01:49 +03: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
aap ac3ba5b4a6 more renames 2021-01-13 13:41:31 +01:00
aap 6aab948be2 more renames 2021-01-13 13:41:24 +01:00
aap 2804ad2363 anim velocity union 2021-01-13 13:06:38 +01:00
aap 083aa700e9 anim velocity union 2021-01-13 13:06:31 +01:00
aap e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
aap 7c3e43aa2e rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:11 +01:00
Filip Gawin 4741afd2cf Port cmake improvements to miami 2021-01-13 12:45:10 +01:00
aap 1b55a9956f some loose ends 2021-01-13 12:31:33 +01:00
erorcun 57201187de Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 14:22:31 +03:00
Filip Gawin 4097c20bdd Make cmake files more generic 2021-01-13 12:15:22 +01:00
aap fb1bd1a5bd fix !FREE_CAM build 2021-01-13 10:48:55 +01:00
erorcun 542a5393ac Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 03:08:50 +03: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
Fire-Head ec17355056 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 02:55:47 +03:00
withmorten 5d4917a5d7
Merge pull request #956 from withmorten/miami 
more securom fixes
 2021-01-13 00:32:39 +01:00
withmorten e122a75dd2 more securom fixes 2021-01-13 00:28:51 +01:00
withmorten 6103677914 more securom fixes 2021-01-13 00:28:07 +01:00
withmorten 2b91af4493
Merge pull request #955 from withmorten/miami 
move stuff back into class; securom comments
 2021-01-13 00:22:51 +01:00
withmorten 232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
withmorten c210e1bae6 move stuff back into class; securom comments 2021-01-13 00:18:34 +01:00
Sergeanur 92b1e8ab75 More font fixes 2021-01-13 01:01:04 +02:00
Nikolay Korolev 4505b8795a fix 2021-01-13 01:37:25 +03:00
Nikolay Korolev a7ad2a7e1a sync with lcs-dev 2021-01-13 01:36:01 +03:00
Nikolay Korolev 510ad223f0 Script4.cpp 2021-01-13 01:34:49 +03:00
aap b2ee24b549 fix CreateInstance virtual overload order 2021-01-12 23:33:44 +01:00
aap b407f6a011 fix CreateInstance virtual overload order 2021-01-12 23:32:45 +01:00
aap d68d1d9999 escalator fix 2021-01-12 23:29:53 +01:00
aap faab9f4aa4 escalator fix 2021-01-12 23:28:13 +01:00
withmorten 4a96c7c9f2 fix CreateInstance virtual overload order 2021-01-12 23:25:12 +01:00
Fire-Head 39dd219fbc Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 01:18:58 +03:00
Fire-Head 660d040531 assert, temp fixes 2021-01-13 01:06:22 +03:00
aap 2088dfb3b3 ProcessWheel bug 2021-01-12 23:02:32 +01:00
aap 8858df2185 ProcessWheel bug 2021-01-12 22:58:50 +01:00
Fire-Head 3e6016dc6e Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 00:11:15 +03:00
Fire-Head 096db533a6 rem gMakeResources 2021-01-13 00:09:40 +03:00
Fire-Head 3648ef4687 lcs particle 2021-01-13 00:07:24 +03: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
aap 0afa027ab4 bug of the decade 2021-01-12 21:28:13 +01:00
Nikolay Korolev e6aa9f9d4e big oof 2021-01-12 20:56:49 +03:00
aap 48ce6151f9 fix building with PED_SKIN 2021-01-12 18:55:21 +01:00
Nikolay Korolev 6cfc61ac0e big oof 2021-01-12 20:54:52 +03:00
Nikolay Korolev 1c3f3c1842 script4 2021-01-12 20:52:31 +03:00
aap 55320a03f1 little cleanup of vehicle rendering 2021-01-12 14:07:24 +01:00
aap 9b2037419f mobile vehicle rendering 2021-01-12 13:41:29 +01:00
aap 99a6976f53 colmodel fix 2021-01-12 12:42:29 +01:00
Sergeanur 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
Nikolay Korolev 167a841010 Merge branch 'lcs-dev' into lcs 2021-01-12 12:17:22 +03:00
Nikolay Korolev 2736c3a9d1 fix 2021-01-12 12:16:52 +03: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 be1e09aad4 Fix collective commands 2021-01-12 02:26:37 +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
aap afcb794d59
Merge pull request #947 from withmorten/miami 
fix CPed struct, GetWantedLevel
 2021-01-11 22:46:06 +01:00
aap 6ef3b8c458
Merge pull request #949 from majesticCoding/lcs 
unused CFerryDoor
 2021-01-11 22:45:10 +01:00
Nikolay Korolev daf5cfe425 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-12 00:43:45 +03:00
Nikolay Korolev 42e4e7c063 fix 2021-01-12 00:43:26 +03:00
Nikolay Korolev 7496a463d4 Merge branch 'lcs-dev' into lcs 2021-01-12 00:42:44 +03:00
Nikolay Korolev 091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
majestic 0f0812618a unused CFerryDoor 2021-01-11 12:47:09 -08:00
aap 383142bcbe some useless code 2021-01-11 20:20:08 +01:00
Fire-Head 06fbbaa43f fix explosion jet 2021-01-11 21:12:11 +03:00
Fire-Head f728c58383 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-11 21:10:28 +03:00
Fire-Head e2095bf70b fix explosion jet 2021-01-11 21:10:24 +03: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
Nikolay Korolev 31dd135075 fuck 2021-01-11 20:53:03 +03:00
Nikolay Korolev c7052b3d6f fuck 2021-01-11 20:51:18 +03:00
withmorten 4a8a1af885 fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01:00
Nikolay Korolev 4422a3df23 Merge branch 'lcs-dev' into lcs 2021-01-11 17:26:17 +03:00
Nikolay Korolev a214d0ed4c fix 2021-01-11 17:25:51 +03:00
Nikolay Korolev 08e5c8e010 fixes 2021-01-11 17:22:07 +03:00
Nikolay Korolev 81b5e66dd4 fixes 2021-01-11 17:18:25 +03:00
Nikolay Korolev 625376f0d3 500-599 2021-01-11 17:14:56 +03:00
Anonymous Maarten 3519cbd3e5 conan: build re3 + librw with RelWithDebInfo build_type 2021-01-11 11:24:25 +01:00
Anonymous Maarten 6b8374f391 cmake: install files ready for copying in game folder 2021-01-11 11:24:25 +01:00
Anonymous Maarten 96e2ba19f8 cmake: add resource (settings windows icon) 2021-01-11 11:24:25 +01:00
Anonymous Maarten b375e20c75 cmake: opus is now optional + libsndfile only when using openal 2021-01-11 11:24:25 +01:00
Anonymous Maarten e9adfd8663 cmake: search for miles import library 2021-01-11 11:24:25 +01:00
Anonymous Maarten 8d0b4ede68 cmake: use openal/opusfile/mpg123/libsndfile correctly 2021-01-11 11:24:25 +01:00
Anonymous Maarten 9707eeb8cb audio: only use #pragma comment(lib, "xxx.lib") on MSVC 2021-01-11 11:24:25 +01:00
Anonymous Maarten 2f48d0c828 cmake: null audio is not possible + add cmake opus support 2021-01-11 11:24:25 +01:00
Anonymous Maarten 2ff9270279 cmake: make librw non-vendorable + rename Findmpg123 + create targets for dependencies 2021-01-11 11:24:25 +01:00
Anonymous Maarten 8a157eee0a audio: only use #pragma comment(lib, xxx.lib) on MSVC 2021-01-11 01:12:44 +01:00
Nikolay Korolev cf11b32849 of course 2021-01-11 02:43:57 +03:00
Nikolay Korolev 53a99cb9ee script2 2021-01-11 02:35:03 +03:00
erorcun 8aaa3c4884 Automobile: fix 2021-01-10 23:52:37 +01:00
erorcun b5711b21dc Automobile: fix 2021-01-11 01:10:24 +03:00
Sergeanur 585300cd33 More font fix 2021-01-10 22:37:11 +02:00
Nikolay Korolev 642970df95 Merge branch 'lcs-dev' into lcs 2021-01-10 22:58:43 +03:00
Nikolay Korolev 75d1715442 script file 1 done (hopefully) 2021-01-10 22:58:06 +03:00
Fire-Head adc7127055 fix pickup coronas 2021-01-10 22:24:21 +03:00
aap ca64363899 debugmenu vehicle spawn list 2021-01-10 19:58:58 +01:00
aap 93ea98520b mobile building rendering 2021-01-10 19:45:58 +01:00
aap ebca91e0d0 update librw 2021-01-10 18:43:44 +01:00
aap cc2cebffb6 update librw 2021-01-10 18:43:11 +01:00
shfil c3b6e9da43
Fix linux build 2021-01-10 17:14:33 +01:00
aap c631e6c61c env map tweaks 2021-01-10 14:32:37 +01:00
aap 453405f131 dont render untextured world 2021-01-10 13:05:34 +01:00
aap 0ee87d7b46 env map rendering 2021-01-10 11:59:57 +01:00
Nikolay b0e395e853
Merge pull request #942 from majesticCoding/lcs 
just original marker's colors
 2021-01-10 13:44:40 +03:00
Seemann ad7855f995 Update command definitions 2021-01-10 12:27:51 +03:00
Seemann c2265e29d2 Update command definitions 2021-01-09 23:59:47 -05:00
Nikolay Korolev 1b3047c812 Merge branch 'lcs-dev' into lcs 2021-01-09 22:24:52 +03:00
Nikolay Korolev f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
aap d3aa8a118c fix rendering; update librw 2021-01-09 19:45:19 +01:00
majestic 2639fba582 just original marker color 2021-01-09 10:26:07 -08:00
aap 03c5fdef43 moved new renderer; implemented leeds building rendering 2021-01-09 19:20:32 +01:00
Nikolay Korolev 203dff9165 script 2021-01-09 20:33:21 +03:00
aap e906a807f1 moved new renderer 2021-01-09 18:22:09 +01:00
aap 4bb6740bf4 moved new renderer, fixed a bug 2021-01-09 18:22:02 +01:00
aap 434bc01f0b fix fix 2021-01-09 16:17:47 +01:00
aap f6f0cb708e boat fix 2021-01-09 16:13:38 +01:00
aap 9693184cea boat fix 2021-01-09 16:13:33 +01:00
Sergeanur 322d93ab0c Fix font 2021-01-09 16:55:45 +02:00
Nikolay Korolev 1f79fb608a fix 2021-01-09 17:47:55 +03:00
Nikolay Korolev c1e68b2c61 fix 2021-01-09 17:43:21 +03:00
Nikolay Korolev a38d0a0fbd Merge branch 'lcs-dev' into lcs 2021-01-09 17:35:57 +03:00
Nikolay Korolev b32301592f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-09 17:35:52 +03:00
Nikolay Korolev 97c95b7639 more script 2021-01-09 17:35:27 +03: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
aap 822f0bd40b cam sector fix 2021-01-09 12:11:52 +01:00
aap e473d234fd cam sector fix 2021-01-09 12:11:34 +01:00
aap 7f5deb0f97 cam sector fix 2021-01-09 12:10:10 +01:00
aap 225b8953fd streaming fixes 2021-01-09 11:43:58 +01:00
Fire-Head 6b78bab99a Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 03:38:39 +03:00
Fire-Head 8e7cce0634 useless fix 2021-01-09 03:37:59 +03:00
Nikolay b7f9bfda4a
fail 2021-01-09 02:41:27 +03:00
Sergeanur 2ce925caba Sector sizes 2021-01-09 01:22:50 +02:00
aap 4a7b3d6d7b fix world bounds check for cars 2021-01-09 00:13:29 +01:00
aap 219af60102 timecycle back to normal 2021-01-08 23:53:14 +01:00
aap 14a5144de7 Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs 2021-01-08 23:43:56 +01:00
aap 49d5c02d69 anims done. ped fight hacked to compile 2021-01-08 23:43:52 +01:00
Fire-Head 91c6389754 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 01:02:17 +03:00
Fire-Head 7a3ee349da sync with re3 
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
 2021-01-09 01:01:41 +03:00
Sergeanur a871da4fbe Add Relocatable Chunk stubs 2021-01-08 23:42:42 +02:00
Nikolay Korolev 3ac74c86a1 fix 2021-01-09 00:33:16 +03:00
Nikolay Korolev 2bf88fcef5 Merge branch 'lcs' into lcs-dev 2021-01-09 00:30:13 +03:00
Sergeanur b6875b41f4 Level 4 2021-01-08 23:20:52 +02:00
Nikolay Korolev a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Fire-Head 02f6ed7da3 fix last commit, debugmenu options 2021-01-08 23:55:13 +03:00
Sergeanur de13141b68 CKeyGen fixes 2021-01-08 22:39:25 +02:00
Fire-Head 39a121351d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-08 23:30:35 +03:00
Fire-Head 00d23c61d9 .ini for scaling, radar, sprites 2021-01-08 23:30:30 +03: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 8eed6ae179 Use original names 2021-01-08 21:50:59 +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
Fire_Head 6e42c791cf
Merge pull request #909 from Fire-Head/master 
Sprite Scaling Option
 2021-01-08 19:43:31 +03:00
Sergeanur bf3135eb41 Enable trains 2021-01-08 18:31:50 +02:00
Fire-Head 368d2f3279 bb .ini hello defines 2021-01-08 19:31:48 +03: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
Nikolay Korolev 613d08d3e2 Merge branch 'lcs-dev' into lcs 2021-01-08 18:59:14 +03:00
Nikolay Korolev e92666d988 wtf 2021-01-08 18:57:59 +03:00
Nikolay c594d89dc5
Merge pull request #930 from Nick007J/master 
PS2 combinations for our cheats
 2021-01-08 18:52:37 +03: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 d68ffc2da6 Original GXT support 2021-01-08 15:34:21 +02:00
aap 223b49e3be little fixes 2021-01-08 13:51:50 +01:00
aap 8be0567924 little fixes 2021-01-08 13:51:42 +01:00
aap a99457ee29 fix phones 2021-01-08 13:51:31 +01: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
aap 37a58a04f2 timecycle; some rendering 2021-01-08 13:34:49 +01:00
Nikolay Korolev 824ca7599c wtf 2021-01-08 13:07:36 +03:00
Nikolay Korolev f8569a74cb fix 2021-01-08 12:59:51 +03:00
Nikolay Korolev 236b3b1c2b more stuff 2021-01-08 12:41:39 +03:00
aap d820df0dbe small cleanup 2021-01-08 01:44:19 +01:00
aap ec61964bce unused var 2021-01-08 01:44:08 +01:00
aap ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01: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 d8a04c9e43 Add MPG123_QUIET to mp3 files 2021-01-07 22:15:30 +02:00
Sergeanur ef13866af6 Make opus available alongside other formats 2021-01-07 22:13:46 +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
Nikolay Korolev 168d3d7ddb PS2 combinations for our cheats 2021-01-07 19:30:12 +03:00
Nikolay Korolev 5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +03:00
Nikolay Korolev 2173ceae95 missing changes 2021-01-07 18:36:02 +03:00
Nikolay Korolev 9d6db921bd fail 2021-01-07 18:31:54 +03:00
Nikolay Korolev db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
Nikolay Korolev 416a898943 minor refactoring 2021-01-07 16:33:42 +03:00
Sergeanur 0845abf640 Fix 16KHz track 2021-01-07 15:16:24 +02:00
Nikolay Korolev 69d30f2204 some lcs stuff 2021-01-07 15:21:35 +03:00
Nikolay 08ddef6a93
Merge pull request #929 from majesticCoding/miami 
GET_WHEELIE_STATS fix
 2021-01-06 23:04:39 +03:00
majestic f61e2d04f1 GET_WHEELIE_STATS fix 2021-01-06 11:56:13 -08:00
Sergeanur 0b73b13b9a Cleanup and fixes for new decoders 2021-01-06 20:23:30 +02:00
Sergeanur 02a28996f4 Cleanup and fixes for new decoders 2021-01-06 20:22:09 +02:00
Filip Gawin ff9d6e4fd6 Fixes for CVbFile 2021-01-06 18:15:32 +01:00
Filip Gawin 36996af82b Fixes for CVbFile 2021-01-06 18:14:44 +01:00
Filip Gawin 2bcb2a40e4 Small fixes for new wav decoder 2021-01-06 17:57:43 +01:00
Filip Gawin 145bd243e8 Small fixes for new wav decoder 2021-01-06 17:56:23 +01:00
Fire-Head 148383ff53 upd 2021-01-06 18:56:13 +03:00
Sergeanur a51757429e Implementing our own WAV decoder to replace SndFile 2021-01-06 15:52:12 +02:00
Sergeanur 493f6cb578 Implementing our own WAV decoder to replace SndFile 2021-01-06 15:46:59 +02:00
aap a6409fb445 fix 2021-01-05 20:58:39 +01:00
Sergeanur d94e8e8faf duh 2021-01-05 21:31:49 +02:00
Sergeanur fd4c2172f5 Add support of PS2 audio streams to OpenAL 2021-01-05 21:23:27 +02:00
Sergeanur bc363a74f5 Add support of PS2 audio streams to OpenAL 2021-01-05 21:06:17 +02:00
erorcun bafaa6acc6 sand fix 2021-01-05 18:53:00 +03:00
Sergeanur f639aae2ae Fix chainsaw sound 2021-01-05 13:04:42 +02:00
erorcun 2e734a4750 Automobile: more pointless fixes 2021-01-05 13:45:20 +03:00
aap e6ef2f12de first version of new renderer 2021-01-05 11:12:48 +01:00
erorcun 0d3e6a3dce Vehicle: Automobile: more pointless fixes 2021-01-05 04:41:24 +03:00
Fire-Head 11de714d9d remake 2021-01-05 04:17:18 +03:00
Sergeanur 042e21115e More audio fix 2021-01-05 00:50:51 +02:00
Sergeanur 63e9f6d826 Audio fixes 2021-01-05 00:32:03 +02:00
Sergeanur 32d3ea0a2d Audio fixes 2021-01-05 00:31:31 +02:00
aap 33fd33b03a fix to !PC_PLAYER_CONTROLS 2021-01-04 23:29:23 +01:00
aap 8026bba723 pop boot fix 2021-01-04 22:59:55 +01:00
Nikolay Korolev a6680e38d5 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-05 00:48:40 +03:00
Nikolay Korolev 6fa081e004 fix 2021-01-05 00:48:25 +03:00
Sergeanur 6753d39dd0 Fix uninitialized filed in cAudioManager 2021-01-04 23:11:31 +02:00
Sergeanur 150f5302b7 Handle stereo panning in OAL manually for streams 2021-01-04 22:48:43 +02:00
Sergeanur 047f9c49ec Fix CEntity::UpdateRwFrame 2021-01-04 22:28:44 +02:00
Sergeanur 09c213738b Fix CEntity::UpdateRwFrame 2021-01-04 22:27:51 +02:00
Sergeanur a346461ea8 Increase number of stream buffers, plus ALStreamSources fix 2021-01-04 22:27:32 +02:00
Sergeanur 4f9bfb4387 Fix missing ifdef 2021-01-04 21:55:41 +02:00
Sergeanur 7adac51152 Handle stereo panning in OAL manually for streams 2021-01-04 20:11:04 +02:00
Nikolay Korolev 601f77b5c8 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-04 21:03:31 +03:00
Nikolay Korolev 2d072325ad fix 2021-01-04 21:03:19 +03:00
Samilop Iter 8d782a1027
Update FileLoader.cpp 2021-01-04 18:07:39 +01:00
Samilop Iter c2ff171364
Update FileLoader.cpp 2021-01-04 18:04:50 +01:00
erorcun 3b1400eaed Fixes from miami Entity/Physical proof-read 1 2021-01-04 16:28:30 +03:00
Sergeanur 2db0d7cfa1 Double the volume for mission audio in OAL + small fix 2021-01-04 15:08:02 +02:00
erorcun ae388c48d0 cfo fix 2021-01-04 16:05:49 +03:00
erorcun 2860f6e4a9 cfo fix 2021-01-04 16:03:54 +03:00
aap 362f2b5ec4
Merge pull request #924 from erorcun/miami 
Entity/Physical proof-read 1
 2021-01-04 12:45:56 +01:00
erorcun 22e8202d27 Entity/Physical proof-read 1 2021-01-04 13:41:41 +03:00
Sergeanur 1efbd7ead2 Fix unlimited rotation in Phnom Penh '86 2021-01-04 10:58:12 +02:00
Filip Gawin bbbfe65870 Port nerf of rain particles from miami 2021-01-04 00:16:32 +01:00
Nikolay Korolev 33f467453e dumb 2021-01-03 23:36:32 +03:00
Nikolay Korolev bec8f6b86c reorder 2021-01-03 22:29:16 +03:00
erorcun 5b081398b5 Frontend: disable windowed mode selector while in game 2021-01-03 22:00:25 +03:00
Nikolay Korolev 21e151cadd hud fix 2021-01-03 20:06:29 +03:00
Nikolay Korolev 0392145512 obsolete comment 2021-01-03 19:03:13 +03:00
aap 6579645934
Merge pull request #916 from Sergeanur/VC/VarConsole 
CVarConsole
 2021-01-03 17:01:17 +01:00
aap 12a869c62a
Merge pull request #921 from TheOfficialFloW/patch-2 
Fix typo in ProcessMissionAudioSlot.
 2021-01-03 17:00:08 +01:00
Nikolay Korolev 213a8eb905 fixed intro text line defaults 2021-01-03 18:59:03 +03:00
TheOfficialFloW 0c2ea268d1
Fix typo in ProcessMissionAudioSlot. 2021-01-03 16:56:12 +01:00
Nikolay Korolev 06fd054eb3 fixed intro text line defaults 2021-01-03 18:56:05 +03:00
erorcun ee05c7fe42 Frontend: disable windowed mode selector in game 2021-01-03 18:30:50 +03:00
erorcun 28ec412369 Ped: PlayerPed: sync with master 2021-01-03 18:29:09 +03:00
Sergeanur 941e70a701 Sync miami things 2021-01-03 16:44:21 +02:00
Sergeanur 2e06e4b6b8 Fix speed of sound 2021-01-03 16:43:58 +02:00
erorcun c4479a0185 Ped: PlayerPed: fixes 2021-01-03 17:33:50 +03:00
TheOfficialFloW e46b06491c Fix nFramesForPretendPlaying. 2021-01-03 14:59:16 +01:00
Nikolay Korolev 5e019ed9f8 fixed array size 2021-01-03 13:57:27 +03:00
Nikolay Korolev 29e0cfa98b fix 2021-01-03 12:52:26 +03:00
Sergeanur 9ae3fac08e Fix ServiceTrack 2021-01-03 00:52:30 +02:00
Sergeanur 1169437ec6 Fix uninitialized RadioStaticCounter 2021-01-03 00:15:33 +02:00
aap 57677b7b55 slightly better variable name 2021-01-02 20:30:16 +01:00
aap 0d05be4e31 slightly better variable name 2021-01-02 20:30:12 +01:00
aap ec1e8b6c86 "clarification" of handling code 2021-01-02 20:15:07 +01:00
aap 78fed0dfe7 "clarification" of handling code 2021-01-02 20:15:01 +01:00
erorcun cdb65e9ced fix fix 2021-01-02 18:30:00 +03:00
erorcun 482ff4562f Vehicle: Automobile: fixes and style things 2021-01-02 18:27:11 +03:00
aap e58acce9e4 old line was better (until we know whats going on) 2021-01-02 13:00:23 +01:00
Sergeanur 30bc51ae9e Pad2 fix 2021-01-02 13:42:49 +02:00
Sergeanur 38bca2332d Fix arg 2021-01-02 13:42:27 +02:00
erorcun 2268365c3b Vehicle: Automobile: fixes and style things 2021-01-02 14:41:53 +03:00
Sergeanur 42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
Sergeanur c587203ebe Pad2 fix 2021-01-02 13:28:10 +02:00
Sergeanur e7c46ac658 Partial controller buttons support 2021-01-02 12:51:09 +02:00
aap 3fffcb47d9 increase screen droplet splash dist 2021-01-01 23:33:29 +01:00
aap 716e322246 increase screen droplet splash dist 2021-01-01 23:33:25 +01:00
Filip Gawin 55af046c92 Encode files to UTF-8 2021-01-01 21:07:39 +01:00
Nikolay Korolev a7f053776a Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 23:06:44 +03:00
Nikolay Korolev c75c4603fc bad stuff 2021-01-01 23:06:20 +03:00
Nikolay Korolev 29b76fc4f5 small thing 2021-01-01 22:57:17 +03:00
Filip Gawin d3b11c2b8c Encode files to UTF-8 2021-01-01 20:55:35 +01:00
aap ec00a1eb0d rain fix 2021-01-01 18:37:17 +01:00
Filip Gawin b3581bc0b4 Overhaul and enable cache for openal build 2021-01-01 16:43:26 +01:00
Sergeanur c3f49386ca Fix wrong sound when bumping peds 2021-01-01 15:11:12 +02:00
aap 60197c2d7e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-01 14:02:05 +01:00
aap 0127d7eb8b wrong bike fall off anim 2021-01-01 14:02:02 +01:00
Nikolay Korolev b4b9f9601b Merge branch 'miami' into lcs-dev 2021-01-01 14:55:00 +03:00
Nikolay Korolev 4604b45852 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 14:53:37 +03:00
Nikolay Korolev 9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Sergeanur 4f3e4cd542 Restore some marker code 2021-01-01 12:58:14 +02:00
Sergeanur ccf6232039 small CWorld fixes 2021-01-01 12:47:22 +02:00
Sergeanur c9a7fd9435 small CWorld fixes 2021-01-01 12:47:11 +02:00
Nikolay Korolev 2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00
Nikolay Korolev 575845772f Merge branch 'miami' into lcs-dev 2021-01-01 13:21:42 +03:00
aap c74c7ce1d4 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-01 00:03:16 +01:00
aap 4d1305efb2 some CAutomobile fixes 2020-12-31 23:59:45 +01:00
Filip Gawin e9288dd005 CMoneyMessages::RegisterOne v2 2020-12-31 22:09:25 +01:00
Filip Gawin 9d29b33ff4 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-31 22:06:55 +01:00
Filip Gawin a0a3a095ac CMoneyMessages::RegisterOne v2 2020-12-31 22:06:39 +01:00
aap 14eb16d5d4 remove superfluous CWorld:: 2020-12-31 22:03:42 +01:00
aap 31000fb4f0 remove superfluous CWorld:: 2020-12-31 22:03:37 +01:00
aap 4e7c2b90f7 mult -> div 2020-12-31 21:58:03 +01:00
aap 613bb72eb7 fix explosion 2020-12-31 21:57:52 +01:00
Filip Gawin ed9c288db8 Fix CMoneyMessages::RegisterOne 2020-12-31 21:46:16 +01:00
Filip Gawin ff665fe27f Fix CMoneyMessages::RegisterOne 2020-12-31 21:43:53 +01:00
Nikolay Korolev a9bf0fa97e Merge remote-tracking branch 'upstream/miami' into miami 2020-12-31 19:30:11 +03:00
Nikolay Korolev 56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
shfil d11325cf0f
Fix UB in ProjectileInfo.cpp 2020-12-31 16:34:50 +01:00
shfil 9938d04ca7
Fix UB in ProjectileInfo.cpp 2020-12-31 16:33:34 +01:00
aap d89d3db126 fix UB 2020-12-31 16:14:51 +01:00
aap 1a8a1c91cb fix UB 2020-12-31 16:14:46 +01:00
Fire-Head bc7161754f fix compiling 2020-12-31 18:10:08 +03:00
Fire-Head 7a360b1181 hud cleanup 2020-12-31 07:56:50 +03:00
aap 80d15d142d fix use of LoadFile 2020-12-30 15:08:18 +01:00
aap 77884e0a57 fix use of LoadFile 2020-12-30 15:08:10 +01:00
aap 2e38b51e1c foobar! 2020-12-29 20:32:37 +01:00
aap 426364b961 fix custom pipes mem leak 2020-12-29 20:31:06 +01:00
aap 14f7dbade8 fix custom pipes mem leak 2020-12-29 20:30:57 +01:00
Fire-Head 8fadca196b gxt key, default value 2020-12-29 22:16:52 +03:00
Fire-Head 30236a804d fix ini key 2020-12-29 21:01:36 +03:00
Fire_Head 89e2709304
Merge pull request #1 from GTAmodding/master 
update
 2020-12-29 20:51:37 +03:00
Fire-Head 224e805fe4 Sprite Scaling option 2020-12-29 20:24:16 +03:00
Sergeanur 2bc843fdcd More menu error sound fix 2020-12-29 14:03:59 +02:00
Sergeanur b9e97ab79d Reorder CEntity functions into their original order 2020-12-29 13:55:26 +02:00
Sergeanur f75460fc1d Reorder CEntity functions into their original order 2020-12-29 13:55:15 +02:00
Sergeanur c1caf380de
Merge pull request #904 from Sergeanur/bvf 
Enable BIND_VEHICLE_FIREWEAPON with gta3.set size check
 2020-12-29 08:49:39 +02:00
Sergeanur 06df781bca Fix error sound in when entering load/save menu 2020-12-29 08:31:38 +02:00
aap c93fb5e443 fix neo screendroplet moving 2020-12-28 21:58:21 +01:00
aap f7e52d7a21 fix neo screendroplet moving 2020-12-28 21:58:16 +01:00
Fire-Head ad560ffaf9 multiple instances sema fix 2020-12-28 23:13:20 +03:00
Fire-Head 8af298c668 multiple instances sema fix 2020-12-28 23:08:47 +03:00
Sergeanur 5ebcef2718 Use enum in frontend 2020-12-28 20:48:30 +02:00
Sergeanur 6b52fb5fb6 Add shadow to subtitles with cutscene borders off 2020-12-28 15:04:07 +02:00
erorcun 5780200ba3 Fix original wanted stars position 2020-12-28 15:29:21 +03:00
Sergeanur 9c2f1b0833 More bike leftovers 2020-12-28 14:00:44 +02:00
Sergeanur 7eb96d5373 Add bike leftovers 2020-12-28 13:44:20 +02:00
Sergeanur b9747de5d6 Enable BIND_VEHICLE_FIREWEAPON with gta3.set size check 2020-12-28 08:36:21 +02:00
erorcun dc96a49dfd Ped: WeaponInfo: little fixes and renamings 2020-12-28 04:02:24 +03:00
erorcun 7b2f17826a Ped: Real weapon fix 2020-12-28 03:52:23 +03:00