a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-29 12:51:54 +00:00
Code Issues Projects Releases Wiki Activity
1733 commits 4 branches 2 tags 50 MiB
Commit graph

1403 commits

Author SHA1 Message Date
aap eccc4a3a5b fixed bug and weirdness in CHeli 2020-04-15 16:17:18 +02:00
aap d7eee5c130 fixed clouds and sprites 2020-04-15 15:26:55 +02:00
aap 90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Sergeanur 27c9f7bc88 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-15 10:54:15 +03:00
Fire_Head 7c13d72edc
Update Weapon.cpp 2020-04-15 08:13:46 +03:00
Fire-Head daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Nikolay Korolev f7f4e44c34 Merge branch 'master' into garages_dev 2020-04-15 01:07:17 +03:00
Nikolay Korolev b354a72de1 Merge remote-tracking branch 'upstream/master' 2020-04-15 01:06:56 +03:00
Nikolay Korolev b657a8e17c bullet info 2020-04-15 01:06:32 +03:00
Nikolay Korolev 70b51d42f4
fixed crash 2020-04-15 00:33:55 +03:00
Sergeanur e373d0526e Merge branch 'master' into MoreLanguages 
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
 2020-04-15 00:10:50 +03:00
saml1er 6d5464b6bb CPedPath improvements 2020-04-14 23:32:15 +05:00
Nikolay Korolev f35d2721f5 fix 2020-04-14 20:16:02 +03:00
Nikolay Korolev fbed2c4530 fix debug stuff 2020-04-14 20:12:26 +03:00
Nikolay Korolev f2c78e4bfb Merge branch 'master' into game_dev 2020-04-14 20:10:39 +03:00
Nikolay Korolev 21a11fd343 scene edit 2020-04-14 20:09:42 +03:00
Sergeanur 6d934892ec RwMatFX support with linked RW libs 2020-04-14 18:35:07 +03:00
Sergeanur eb0b9f6255 fix CTheCarGenerators::SaveAllCarGenerators 2020-04-14 17:24:31 +03:00
Sergeanur 9a7b833aa5 Added missing audio ctors 2020-04-14 17:13:38 +03:00
saml1er bf040c7cd1 Remove float casts 2020-04-14 17:05:51 +05:00
saml1er 8bb23ca5d4 Refactor CPedPath::CalcPedRoute 2020-04-14 16:57:28 +05:00
Filip Gawin 41d42a3e53
Merge pull request #414 from ShFil119/audio17 
Finish audio
 2020-04-14 13:01:40 +02:00
saml1er b4d5d5249c CPedPath complete 2020-04-14 15:45:47 +05:00
Sergeanur a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
Sergeanur 7f8a4b4867 Debug font and CProfiles 2020-04-14 10:31:37 +03:00
erorcun 313f547860
Some cleanup 2020-04-14 03:21:16 +03:00
Nikolay Korolev f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Filip Gawin 2e20e040cc
Merge pull request #403 from saml1er/roadblocks 
CRoadBlocks complete
 2020-04-14 00:11:39 +02:00
Filip Gawin aa3b7869e5
Merge pull request #406 from Nick007J/master 
Pools load/save
 2020-04-14 00:11:22 +02:00
saml1er 60eb60de4e Use NUMROADBLOCKS enum member in CRoadBlocks 2020-04-14 02:13:00 +05:00
Nikolay Korolev 906133d3be
fix garages 2020-04-13 22:43:41 +03:00
Sergeanur 304b574eba added missing break 2020-04-13 22:25:24 +03:00
Nikolay Korolev 2709447073 Merge remote-tracking branch 'upstream/master' 2020-04-13 22:17:42 +03:00
Nikolay Korolev c21529467a
fixed record 2020-04-13 22:16:51 +03:00
Filip Gawin 67055c1fbb Cleanup cAudioManager::ProcessRainOnVehicle a bit 2020-04-13 21:13:07 +02:00
Nikolay Korolev 12d36d8710
fixed record 2020-04-13 22:12:41 +03:00
Nikolay Korolev 1c592c26f9 review fix 2020-04-13 21:57:13 +03:00
Nikolay Korolev 3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
Nikolay Korolev cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
erorcun 0e056a8e01
Merge pull request #412 from whampson/save-stuff 
GenericLoad() done
 2020-04-13 21:49:57 +03:00
Filip Gawin 3b9f1255af Finish audio code 2020-04-13 20:30:18 +02:00
Wes Hampson a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00
erorcun e2fb0578b5
Merge pull request #413 from erorcun/erorcun 
CFileLoader last funcs and Frontend cleanup
 2020-04-13 15:36:05 +03:00
Sergeanur d8be75ac46 Fix compilation error 2020-04-13 15:21:26 +03:00
saml1er 68f8a6a9ed more CRoadBlocks::GenerateRoadBlocks improvements 2020-04-13 15:21:39 +05:00
erorcun c008eb2431
Merge pull request #410 from Sergeanur/PacManPickups 
CPacManPickups
 2020-04-13 12:51:30 +03:00
Sergeanur 741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
eray orçunus 60c412149d CFileLoader last funcs and Frontend cleanup 2020-04-13 05:42:02 +03:00
saml1er 28fb1bdde7 Fix CRoadBlocks::GenerateRoadBlocks bugs 2020-04-13 05:52:18 +05:00
Wes Hampson dbf6e155ff GenericLoad() done 2020-04-12 15:47:12 -07:00
aap 3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
erorcun a622c9e877
Merge pull request #409 from erorcun/erorcun 
Frontend fixes + triangle for back as default
 2020-04-12 20:24:57 +03:00
eray orçunus 8b2138f7bd Frontend fixes + triangle for back as default 2020-04-12 20:22:28 +03:00
erorcun 9044f57a0e
Merge pull request #408 from erorcun/erorcun 
Revert "fix"
 2020-04-12 18:53:24 +03:00
eray orçunus bde3ef4f43 Revert "fix" 2020-04-12 18:51:46 +03:00
erorcun 0caceec1de
Merge pull request #407 from erorcun/erorcun 
Ped fix
 2020-04-12 18:39:23 +03:00
eray orçunus 8476283174 Ped fix 2020-04-12 18:37:59 +03:00
Nikolay Korolev e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev 1732f9b5c6 obviously forgot about it 2020-04-12 12:10:25 +03:00
Nikolay Korolev cbb298c8dd sync with master 2020-04-12 12:08:30 +03:00
Nikolay Korolev 04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay Korolev fa0f5542cc
Merge pull request #402 from Nick007J/master 
Record
 2020-04-12 12:06:12 +03:00
Nikolay Korolev c593599fc5
Merge pull request #399 from saml1er/master 
CObject complete
 2020-04-12 12:05:49 +03:00
Sergeanur d804ad48b9
Merge pull request #388 from ShFil119/audio16 
Yet another audio PR
 2020-04-12 11:46:48 +03:00
Nikolay Korolev 9593a2c000
fixed cranes bug 2020-04-12 11:36:51 +03:00
Filip Gawin 7d137d8f2d Cleanup audio code 2020-04-12 02:50:52 +02:00
eray orçunus 1932d98482 CDebug fix 2020-04-12 01:33:04 +03:00
erorcun 207aebc46c
Merge pull request #400 from erorcun/erorcun 
CMenuManager done and CHud fixes
 2020-04-12 00:57:46 +03:00
eray orçunus f2995640bd CMenuManager done and CHud fixes 2020-04-12 00:56:27 +03:00
saml1er 60898f39f2 Improve CRoadBlocks code 2020-04-12 02:08:16 +05:00
Sergeanur daceee593b Link with RW libs 2020-04-11 23:37:04 +03:00
Nikolay Korolev d010f6255a Merge branch 'master' into garages_dev 2020-04-11 21:02:31 +03:00
Nikolay Korolev fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
Nikolay Korolev 38dee74a5a CPools 2020-04-11 21:01:39 +03:00
aap c307e72fa0 Merge branch 'master' of github.com:gtamodding/re3 2020-04-11 19:33:46 +02:00
aap 3c999a1eb8 fixed traffic light position 2020-04-11 19:33:39 +02:00
saml1er ff16ba7801 CObject fixes 2020-04-11 22:31:32 +05:00
saml1er 0d19036a42 CRoadBlocks complete 2020-04-11 21:45:49 +05:00
Sergeanur 0ddc04743c Fix cutscene camera latency 2020-04-11 13:21:21 +03:00
Nikolay Korolev 1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
Nikolay Korolev bc90f958da fix constants 2020-04-11 02:27:50 +03:00
Nikolay Korolev c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
Nikolay Korolev 92b6d775d6 Record 2020-04-11 02:03:42 +03:00
Sergeanur f1413c4776 fixing r* visioned leak 2020-04-11 00:36:11 +03:00
aap df872a26b0 fuck you git, i fixed this already 2020-04-10 23:21:34 +02:00
Nikolay Korolev be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
saml1er 4f00576a8c Addendum to previous commit 2020-04-10 21:59:49 +05:00
saml1er 16360eb6df Refactor CObject::ObjectDamage switch statement 2020-04-10 21:52:02 +05:00
aap c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
saml1er c2b00d7ad9 Fix cast in CObject::ObjectDamage 2020-04-10 19:37:09 +05:00
saml1er 5544325acb Refactor CObject::ObjectDamage 2020-04-10 19:32:42 +05:00
Sergeanur 3a4442eca4 disabling the code that freezes gang members 2020-04-10 16:14:05 +03:00
saml1er bb21cff639 Fix Object.h and Object.cpp indentation 2020-04-10 17:03:02 +05:00
saml1er a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
Nikolay Korolev a27f7359ff fix 2020-04-10 12:20:04 +03:00
Nikolay Korolev 4864850657 Merge remote-tracking branch 'upstream/master' 2020-04-10 12:03:48 +03:00
Nikolay Korolev 314bb83b9a fixed intro crash 2020-04-10 12:03:22 +03:00
Sergeanur b76172e2dd PlayerSkin small cleanup 2020-04-10 11:41:48 +03:00
Sergeanur 8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +03:00
Nikolay Korolev 917fa80c18 record init 2020-04-10 11:03:38 +03:00
Sergeanur 6647312660 Fix sprite vertical scale 2020-04-10 10:52:47 +03:00
Nikolay Korolev 6473778c47
fix weather init 2020-04-10 02:17:32 +03:00
aap 34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
Sergeanur a5239b554f Merge remote-tracking branch 'Fire-Head/master' 
# Conflicts:
#	src/core/Radar.cpp
 2020-04-09 21:40:46 +03:00
aap 5b5de5d2f3
Merge pull request #393 from Sergeanur/txdimg 
txd.img creator
 2020-04-09 20:37:53 +02:00
aap d8cf6258b7
Merge pull request #395 from aap/master 
fixed questionable RW usage; changed radar mask to PS2 technique
 2020-04-09 20:35:04 +02:00
Sergeanur 6cfc31510d CStats finished 2020-04-09 20:15:45 +03:00
aap 6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
Sergeanur a5c7151656 AddExplosion shadow fix 2020-04-09 16:15:30 +03:00
aap 6297a9da11
Merge pull request #391 from Sergeanur/Cheats 
Cheats
 2020-04-09 12:30:23 +02:00
aap a6d449a2f4
Merge pull request #390 from Sergeanur/Explosion 
Finished CExplosion
 2020-04-09 12:30:13 +02:00
aap ee057cb427
Merge pull request #389 from Nick007J/master 
Weather
 2020-04-09 12:30:02 +02:00
aap 26fb53472e
Merge pull request #387 from aap/master 
implemented CSkidmarks
 2020-04-09 12:29:52 +02:00
Sergeanur cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
Sergeanur fd2152923c txd.img creator 2020-04-09 10:28:50 +03:00
Fire-Head 590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
Fire-Head c97ff5b31a cleanup 2020-04-09 03:06:43 +03:00
Fire-Head 3769170113 (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode 2020-04-09 02:52:38 +03:00
Sergeanur e6476bafff Cheats 2020-04-09 00:17:14 +03:00
Nikolay Korolev 6b06ee21ad Merge remote-tracking branch 'upstream/master' 2020-04-08 23:51:39 +03:00
Nikolay Korolev 42d5f65c55
fix bug 2020-04-08 23:50:45 +03:00
Nikolay Korolev d5f34e425e fixed random number retrieval 2020-04-08 21:56:33 +03:00
Nikolay Korolev b9a20da7d8 review fix 2020-04-08 21:47:58 +03:00
Nikolay Korolev ebba8519d9 review fixes 2020-04-08 21:40:02 +03:00
Nikolay Korolev cf36e09d39 final fixes 2020-04-08 21:18:19 +03:00
Nikolay Korolev 3e1062392e Merge branch 'master' into garages_dev 2020-04-08 20:32:56 +03:00
Nikolay Korolev b3571706d1 fix 2020-04-08 20:30:45 +03:00
aap 9176aef1b2 Merge branch 'master' of github.com:gtamodding/re3 2020-04-08 18:45:55 +02:00
Sergeanur 5a034097c9 Fix target sprite size 2020-04-08 19:05:22 +03:00
aap 6288d36f34 implemented CSkidmarks 2020-04-08 16:35:23 +02:00
Nikolay Korolev 5966e627f0
fix bug 2020-04-08 15:17:07 +03:00
Nikolay Korolev b075b0fccf Merge branch 'master' into garages_dev 2020-04-08 14:26:07 +03:00
Nikolay Korolev 24fc11a137 rain fix 2020-04-08 14:25:23 +03:00
Nikolay Korolev 8ee98574ff
fix bug 2020-04-08 14:16:59 +03:00
Nikolay Korolev 8e29a5ec88
bug fix 2020-04-08 14:06:27 +03:00
Sergeanur 7439d6482f Reverting tabs back to spaces for aap 2020-04-08 10:26:31 +03:00
Sergeanur 7eee938de2 Reverting tabs back to spaces for aap 2020-04-08 10:22:34 +03:00
aap f89df29001
Merge pull request #385 from aap/master 
implemented CRubbish, CShinyTexts, CBrightLights, CMotionBlurStreaks, CSpecialFX
 2020-04-08 09:12:49 +02:00
Sergeanur 560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
Nikolay Korolev e556ffd3f6 fixes 2020-04-08 01:52:08 +03:00
Nikolay Korolev 48e13ce6c9 Merge branch 'master' into garages_dev 2020-04-07 23:44:30 +03:00
Nikolay Korolev f7ac85e492 weather stuff 2020-04-07 23:43:19 +03:00
aap daaf443cfa finished CMotionBlurStreaks, CSpecialFX 2020-04-07 22:26:01 +02:00
eray orçunus cf8249fa05 Menu map changes 
- new texture by AG
- map now centers when zoomed out too much
- background darkened a bit
- mouse wheel up/down switched
- cross add target on gamepad
- LeftStickY inverted
 2020-04-07 23:20:23 +03:00
erorcun 6a2d675467
Merge pull request #384 from erorcun/erorcun 
Menu map
 2020-04-07 20:37:27 +03:00
eray orçunus 1f8e073c0a Menu map 2020-04-07 20:18:24 +03:00
aap 51512db006 implemented CRubbish 2020-04-07 17:16:58 +02:00
Filip Gawin 95e4466846 Fix CI build 2020-04-07 15:53:51 +02:00
Filip Gawin bf2316bd54 Cleanup audiocode and fix for ComputeDopplerEffectedFrequency 2020-04-07 15:44:31 +02:00
aap 1207c2ce6f implemented CShinyTexts 2020-04-07 12:33:14 +02:00
Sergeanur c9ace44ca8 CFont 2020-04-07 08:20:21 +03:00
aap 2100bdd529 implemented CRubbish 2020-04-07 01:19:24 +02:00
aap f192d7052e finished CCollision 2020-04-06 20:32:44 +02:00
aap de706d1471 fixed typo 2020-04-06 18:49:51 +02:00
aap f2b3be5da2
Merge pull request #379 from erorcun/erorcun 
Frontend (last-3)
 2020-04-06 18:37:17 +02:00
aap f8465e0f66
Merge pull request #381 from aap/master 
PS2 Frontend Controls
 2020-04-06 18:36:19 +02:00
Nikolay Korolev 4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev cf804dee91 Merge remote-tracking branch 'upstream/master' 2020-04-06 19:28:04 +03:00
Nikolay Korolev b991fd9766
Merge branch 'master' into master 2020-04-06 19:26:04 +03:00
Nikolay Korolev e6e51492f0 review fixes 2020-04-06 11:19:29 +03:00
Nikolay Korolev 7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
Nikolay Korolev 7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
aap cbbe722b70 PS2 Frontend Controls 2020-04-05 21:21:53 +02:00
Sergeanur 4fc2f9c359 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 17:03:59 +03:00
aap 27f95d905c fixed look behind bug 2020-04-05 15:27:30 +02:00
aap 5e9ae94298
Merge pull request #378 from aap/master 
finished CCamera
 2020-04-05 14:30:28 +02:00
Nikolay Korolev 9436b5a8a5 Merge branch 'master' into garages_dev 2020-04-05 12:47:27 +03:00
Nikolay Korolev 5cbcaa57d7 Merge remote-tracking branch 'upstream/master' 2020-04-05 12:45:30 +03:00
Nikolay Korolev 30b8d7300b shoreside garage fix 2020-04-05 12:44:58 +03:00
Nikolay Korolev 057b28e39b cranes init 2020-04-05 12:35:51 +03:00
Sergeanur 2aace31b06 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 12:03:13 +03:00
Sergeanur c0c09f2720 Japanese 2020-04-05 12:02:51 +03:00
eray orçunus bd7a59e58e Frontend (last-3) 2020-04-04 14:49:19 +03:00
aap f56909d8b7
Merge pull request #377 from Fire-Head/master 
Glass
 2020-04-03 11:49:08 +02:00
aap db804f99d9
Merge pull request #376 from Nick007J/master 
final vehicles functions, some other fixes
 2020-04-03 11:48:49 +02:00
aap 7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
Sergeanur 92ec403191 Fix CFont type uint16 -> wchar 2020-04-02 09:51:35 +03:00
Sergeanur 6e6912b613 fixes 2020-04-02 09:20:45 +03:00
Fire_Head c394bd2a6e
Glass cosmetic fixes 2020-04-02 05:37:22 +03:00
Fire-Head 13fb853fd8 Glass done 2020-04-02 00:04:56 +03:00
Nikolay Korolev bd0cd13be1 Merge remote-tracking branch 'upstream/master' 2020-04-01 23:47:57 +03:00
Sergeanur 62ae7245ab AudioScriptObject finished 2020-04-01 06:09:25 +03:00
Nikolay Korolev 347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
Nikolay Korolev e34631adce review fixes 2020-04-01 00:07:09 +03:00
Nikolay Korolev e2ed468018 Merge remote-tracking branch 'upstream/master' 2020-03-31 23:54:39 +03:00
Sergeanur 409663adb8 timebars 2020-03-31 16:11:45 +03:00
aap a57d9b6797
Merge pull request #373 from erorcun/erorcun 
Mouse free cam for peds&cars (under FREE_CAM)
 2020-03-31 10:29:35 +02:00
eray orçunus 5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05:49 +03:00
Nikolay Korolev 357d88a4a8 fix 2020-03-31 01:00:06 +03:00
Nikolay Korolev b3bfde0db0 added forgotten function 2020-03-31 00:53:51 +03:00
Nikolay Korolev 24e4ecf5bb bug fixes, reorganisation 2020-03-31 00:46:44 +03:00
Nikolay Korolev 1b0368ee7d Merge branch 'master' into garages_dev 2020-03-31 00:01:52 +03:00
Nikolay Korolev 50b43b680e finished garages 2020-03-31 00:01:03 +03:00
Sergeanur 2607a91d87 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-03-30 20:10:12 +03:00
Sergeanur bb8868eba7 Add russian lang support 2020-03-30 14:50:14 +03:00
aap 8e3ee096e2
Merge pull request #366 from Nick007J/master 
Garage part 1
 2020-03-29 19:12:53 +02:00
erorcun 6704a62b32
Merge pull request #369 from erorcun/erorcun 
CShotInfo, CWanted done, Frontend fix
 2020-03-29 19:03:59 +03:00
eray orçunus a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
Nikolay Korolev 23c6a28324 Merge branch 'master' into garages_dev 2020-03-29 18:54:26 +03:00
Nikolay Korolev 3a4e2275de fixed PS2 build 2020-03-29 18:53:58 +03:00
Nikolay Korolev 24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
Nikolay Korolev 0db35f8275 more garages 2020-03-29 18:48:57 +03:00
Fire_Head a0b077574e
Merge branch 'master' into master 2020-03-29 18:39:47 +03:00
aap 82dcc34296
Merge pull request #367 from Sergeanur/wrappers_cleanup 
Wrappers cleanup
 2020-03-29 16:27:42 +02:00
Fire-Head 7b95dcc219 style & cosmetic fixes 2020-03-29 16:35:50 +03:00
Fire-Head d53c151ffc style & cosmetic fixes 2020-03-29 16:32:11 +03:00
aap ac097e6fc7 rotating FollowPed cam (disabled by default for now) 2020-03-29 14:07:38 +02:00
Sergeanur 97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
Sergeanur db92864fe2 Fire and PlayerSkin fix 2020-03-29 08:51:30 +03:00
Nikolay Korolev 02615ccd98 fix 2020-03-29 02:09:02 +03:00
Nikolay Korolev 38c2f8fbb0 fixes 2020-03-29 01:48:49 +03:00
Fire-Head 194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00
Nikolay Korolev 92edf92570 Merge branch 'master' into garages_dev 2020-03-28 23:42:11 +03:00
Nikolay Korolev 93417853ed fixes 2020-03-28 23:41:37 +03:00
erorcun 7242d8a440
Merge pull request #364 from erorcun/erorcun 
Limit frontend FPS to 100
 2020-03-28 23:29:28 +03:00
eray orçunus 39c9a05827 Limit frontend FPS to 100 2020-03-28 23:28:36 +03:00
Filip Gawin d13afe5cc1 audio16 fixes for review 2020-03-28 20:18:54 +01:00
Filip Gawin 58ec4b2157 ProcessVehicleEngine and ProcessActiveQueues 
Also some smaller fixes, thx erorcun for help.
 2020-03-28 20:18:54 +01:00
aap 8623bc9752
Merge pull request #360 from ShFil119/impr/assembly 
Cleanup patching system
 2020-03-28 20:01:18 +01:00
Filip Gawin b235c35834 Cleanup patching system 2020-03-28 19:46:09 +01:00
Nikolay Korolev 101c21e064 merge with master 2020-03-28 20:55:15 +03:00
Nikolay Korolev 775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
erorcun c056871e07
Merge pull request #363 from erorcun/erorcun 
CCopPed done and #include cleanup
 2020-03-28 19:12:22 +03:00
eray orçunus 112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap a58bceb1a7
Merge pull request #362 from Fire-Head/master 
WaterCannon done, resource ico
 2020-03-28 16:47:20 +01:00
aap 2833a08b96 CCam fix 2020-03-28 16:29:34 +01:00
Fire-Head a81233429d WaterCannon uv macros 2020-03-28 18:24:21 +03:00
Fire-Head 3366cd0ff8 WaterCannon done, resource ico 2020-03-28 17:02:44 +03:00
Nikolay Korolev 9fb101fdd9 Merge branch 'master' into garages_dev 2020-03-28 15:24:55 +03:00
Nikolay Korolev 268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
aap 739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
aap 6a14457614 Merge branch 'master' of github.com:gtamodding/re3 2020-03-28 09:34:25 +01:00
aap f5195ca185 CCam fix 2020-03-28 09:34:04 +01:00
Sergeanur cd913404a3 Fix Text n Pager 2020-03-28 04:58:58 +02:00
Sergeanur c953230237 Set Xinput version to 9.1.0 + vibration set 2020-03-28 04:53:42 +02:00
Filip Gawin 184a80cc3b Remove assembly from patcher.h 2020-03-27 21:25:39 +01:00
aap e7c18fc17f removed windows.h for most .cpps 2020-03-27 20:53:47 +01:00
Sergeanur 43b092033c XInput 2020-03-27 21:20:57 +02:00
aap 29f69f6216
Merge pull request #357 from aap/master 
Finished CCam; various smaller things
 2020-03-27 18:41:22 +01:00
aap 22e022cc9f implemented some unused PS2 cams 2020-03-27 18:21:46 +01:00
aap f0dfaac838 Finished CCam; various smaller things 2020-03-27 10:04:45 +01:00
erorcun 9e49e5c2bd
Merge pull request #356 from blingu/master 
CFire and CFireManager classes nearly done
 2020-03-26 19:30:34 +03:00
blingu 79822e3f7c
Update Fire.cpp 2020-03-26 17:11:04 +01:00
blingu 853b2d0c78
Update Fire.cpp 2020-03-26 17:05:01 +01:00
blingu edc92a7bcc
Update Fire.cpp 2020-03-26 17:00:58 +01:00
eray orçunus 0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
blingu 0e91015940
Update Vehicle.cpp 2020-03-26 14:19:55 +01:00
blingu a66db9efcb
Update Fire.cpp 2020-03-25 23:01:22 +01:00
blingu be2aca47cf
added InflictDamage() declaration 2020-03-25 22:58:20 +01:00
blingu 93a4bc31fa
added wrapper for InflictDamage() 2020-03-25 22:57:34 +01:00
blingu 09af0bcaf8
Update Fire.cpp 2020-03-25 22:54:14 +01:00
blingu c3841fe5b4
m_snTimeInMilliseconds to GetTimeInMilliseconds() 2020-03-25 21:24:32 +01:00
blingu 96802f9b95
Update Fire.cpp 2020-03-25 21:13:06 +01:00
blingu 08e1c869a4
renamed field_24 to m_nNextTimeToAddFlames 2020-03-25 21:09:27 +01:00
blingu e22ce9404c
Update Fire.cpp 2020-03-25 21:07:07 +01:00
blingu 0605e704ca
Update Fire.h 2020-03-25 21:01:38 +01:00
blingu 834f4f6d4c
Update Fire.h 2020-03-25 21:01:10 +01:00
blingu ea9e45fcda
Update Fire.cpp 2020-03-25 21:00:38 +01:00
aap 8703758a7b
Merge pull request #353 from Sergeanur/Debug 
obrstr + Debug
 2020-03-25 09:08:33 +01:00
PerikiyoXD 1622973ffa Implement Init for Stats 2020-03-24 19:50:08 +01:00
blingu c03bae46ea
Update Fire.cpp 2020-03-24 18:12:53 +01:00
blingu 1680d11dae
Update Fire.h 2020-03-24 17:25:14 +01:00
blingu 43fb59e356
Update Fire.h 2020-03-24 17:24:47 +01:00
aap 4e7c186285 change default script to story 2020-03-24 11:58:09 +01:00
aap c7bdecdd90 fix and cleanup in AddToPopulation 2020-03-24 09:02:41 +01:00
Sergeanur a12c01e10a obrstr + Debug 2020-03-24 09:56:37 +02:00
aap 55b62e2134 added an assert to CPed::BuildPedLists, but too many peds still crash the game 2020-03-24 08:49:55 +01:00
aap 4070cad4a7
Merge pull request #352 from Nick007J/master 
CGame::Initialise
 2020-03-23 00:34:41 +01:00
Filip Gawin da2d25c020
Fix order of math operations on integers (fires) 2020-03-22 19:32:01 +01:00
Nikolay Korolev 861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin 0e817230af Remove all constexpr 2020-03-22 17:30:54 +01:00
Filip Gawin b57e4febb0 fix include 2020-03-22 17:30:54 +01:00
Filip Gawin 39462a3865 Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin a097f225bc Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin 337924c794 Cleanup audio code + fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
Filip Gawin 8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
Filip Gawin 7c425ac4ac Implement ProcessGarages + small cleanup 2020-03-22 17:30:54 +01:00
Filip Gawin 3b8a177470 Implement SetupJumboEngineSound 2020-03-22 17:30:54 +01:00
Filip Gawin 67398809a3 Implement ProcessFires 2020-03-22 17:30:54 +01:00
Filip Gawin 0d1f42add1 Implement ProcessCrane 2020-03-22 17:30:54 +01:00
Filip Gawin 31382bc22c Implement ProcessCesna 2020-03-22 17:30:54 +01:00
Nikolay Korolev d1d123dc6a missing endlines 2020-03-22 19:19:07 +03:00
Nikolay Korolev c29a85a443 console init 2020-03-22 18:48:16 +03:00
Nikolay Korolev 360d9cf889 merge with master 2020-03-22 17:26:18 +03:00
Nikolay Korolev 34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
Sergeanur 5e37c3e805 Console 2020-03-22 16:19:10 +02:00
aap f9342c7e83
Merge pull request #350 from Nick007J/master 
bullet traces
 2020-03-22 14:41:03 +01:00
aap 398cc6bbec fixed vehicle rendering bug 2020-03-22 11:40:18 +01:00
Nikolay Korolev 7d213a1f32 bullet traces fixes 2020-03-22 13:20:36 +03:00
Nikolay Korolev 65e8558794 Merge remote-tracking branch 'upstream/master' 2020-03-22 13:09:18 +03:00
erorcun b17935b89e
Merge branch 'master' into erorcun 2020-03-22 04:49:24 +03:00
Nikolay Korolev c2f5dfdb1e bullet traces 2020-03-21 20:14:29 +03:00
Nikolay Korolev ac610b7e6e fixed erroneous assumption 2020-03-21 15:13:38 +03:00
eray orçunus d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
Nikolay Korolev 795e07c882 purple nines glitch fix 2020-03-21 14:29:03 +03:00
erorcun 53e65a32cd
Merge branch 'master' into Radar2 2020-03-17 20:46:37 +03:00
erorcun 7aa5d16b53
Merge pull request #347 from Nick007J/master 
replay fixes + script crash fix
 2020-03-17 20:41:59 +03:00
erorcun 1ab6702ea6
Merge pull request #345 from whampson/save-stuff 
GenericSave() done
 2020-03-17 20:35:18 +03:00
Sergeanur e57ad65d05 Finished CRadar, a bit of CExplosion 2020-03-17 00:22:43 +02:00