a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-14 06:29:17 +00:00
Code Issues Projects Releases Wiki Activity
1888 commits 4 branches 2 tags 50 MiB
Commit graph

1532 commits

Author SHA1 Message Date
Sergeanur 4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
aap fd462c9b55 implemented most of streamed collisions and big buildings 2020-05-05 14:00:20 +02:00
Sergeanur e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
Nikolay Korolev ee261c996b Merge remote-tracking branch 'upstream/master' 2020-05-05 14:40:56 +03:00
Nikolay Korolev ae0c83fa01 CAutoPilot + CCarAI + fixes 2020-05-05 14:40:35 +03:00
aap b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Sergeanur 84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
Nikolay Korolev 131e8af174
Merge pull request #508 from Nick007J/master 
Scripts compatible saving + CCarCtrl bug + crusher coach bug
 2020-05-04 19:52:26 +03:00
Nikolay Korolev 3554ec58bb
Merge pull request #507 from aap/master 
implemented most of vice city path system, conditionals for train, bridge, cullzones
 2020-05-04 19:51:56 +03:00
Nikolay Korolev 11c7050dfb deny coach in crusher 2020-05-04 15:02:46 +03:00
Nikolay Korolev 20ffccbe2a Merge remote-tracking branch 'upstream/master' 2020-05-04 14:58:12 +03:00
Nikolay Korolev d1a46c35ce fixed spawn bug 2020-05-04 14:57:49 +03:00
aap f027c3afed fixed fog color for librw 2020-05-04 13:41:17 +02:00
aap a073dda5ec GTA_ZONECULL define 2020-05-03 17:44:10 +02:00
aap 67467f15d1 GTA_BRIDGE and GTA_TRAIN defines 2020-05-03 17:28:54 +02:00
aap 702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Nikolay Korolev 926e216dd4 Merge remote-tracking branch 'upstream/master' 2020-05-03 01:43:12 +03:00
Nikolay Korolev fa29804c49 script compatibility 2020-05-03 01:42:46 +03:00
Sergeanur ff4af35292 Fix pad Y axis 2020-05-03 01:42:05 +03:00
Sergeanur dcd1ba6578 Fix CMessages::InsertStringInString 2020-05-03 01:40:37 +03:00
Sergeanur 6a40c03442 Put camera modes compatibility under COMPATIBLE_SAVES 2020-05-03 00:15:28 +03:00
Sergeanur 7fc33d85f7
Merge pull request #504 from Sergeanur/PadInputSwitch 
Switching pad modes and cheats when player is switching between controller and kb&m
 2020-05-03 00:12:54 +03:00
Sergeanur d2712afc78 Add CURMODE macro 2020-05-03 00:11:02 +03:00
Sergeanur 9d600802fa Revert "Disable PED_SKIN for now" 
This reverts commit d51bf48dcd.
 2020-05-02 23:52:41 +03:00
Sergeanur 4448156e29
Merge pull request #494 from Nick007J/master 
pools compatibility
 2020-05-02 23:48:17 +03:00
Sergeanur 89961325b2 Ceil health and armor values in hud (fix 99 health) 2020-05-02 23:38:52 +03:00
Sergeanur c62d35fed0 Adding sound intensity consts 2020-05-02 23:31:45 +03:00
Nikolay Korolev b095bc1b5a Merge remote-tracking branch 'upstream/master' 2020-05-02 21:31:41 +03:00
Sergeanur 52a13e3301 Fix number of unique jumps in stat menu 2020-05-02 21:28:44 +03:00
Sergeanur fc85bb710b Fix COMMAND_GET_CONTROLLER_MODE 2020-05-02 19:39:36 +03:00
Sergeanur ba8aa38654 Switching pad modes and cheats when player is switching between controller and kb&m 2020-05-02 19:39:36 +03:00
Sergeanur d51bf48dcd Disable PED_SKIN for now 2020-05-02 19:13:51 +03:00
Sergeanur 271517915f Cleanup cAudioManager::ProcessVehicleSkidding 2020-05-02 18:23:48 +03:00
Nikolay Korolev 7d067684ff Merge remote-tracking branch 'upstream/master' 2020-05-02 18:02:45 +03:00
Nikolay Korolev f372ce156d changed saving compatibility 2020-05-02 18:02:17 +03:00
Sergeanur 7ba5b3c353 A bit more audio cleanup 2020-05-02 17:10:51 +03:00
Sergeanur 853dab23f5 cleanup cAudioManager::UpdateReflections 2020-05-02 16:45:24 +03:00
Sergeanur 8d0b0051b4 AudioManager.cpp autoformat 2020-05-02 16:27:40 +03:00
Sergeanur 05b2ae10c6 Replacing >> and << to / and * in AudioManager 2020-05-02 15:56:59 +03:00
Sergeanur 52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03:00
Sergeanur d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
rollschuh2282 ccf7ebca9a
fixed the CIRCLE_BACK_BUTTON define. 2020-05-02 12:58:12 +02:00
Nikolay Korolev 5a916c16b7 Merge remote-tracking branch 'upstream/master' 2020-05-02 11:26:26 +03:00
aap 339365806a update librw (vsynch) 2020-05-02 10:08:58 +02:00
Nikolay Korolev 026ed72bfc Merge remote-tracking branch 'upstream/master' 2020-05-01 21:23:09 +03:00
erorcun 90f5a8fa8e
Merge pull request #501 from erorcun/erorcun 
Screen mode selector and persistent map target fix
 2020-05-01 21:21:05 +03:00
eray orçunus 97b288c1e4 Screen mode selector and persistent map target fix 2020-05-01 21:16:02 +03:00
aap 59bfbaddfb implemented debugmenu shutdown 2020-05-01 17:31:29 +02:00
Nikolay Korolev 0d5f56cacc Merge remote-tracking branch 'upstream/master' 2020-05-01 15:22:56 +03:00
aap 1ef67aee22 update librw 2020-05-01 14:22:23 +02:00
Nikolay Korolev 79d66b7910 Merge remote-tracking branch 'upstream/master' 2020-05-01 13:46:36 +03:00
aap 56cb586f15
Merge pull request #499 from aap/master 
Better handling of video modes, windowed mode, fixes to glfw
 2020-05-01 08:43:35 +02:00
Nikolay Korolev 063bf51bf1 updated get/set 2020-04-30 22:04:07 +03:00
Nikolay Korolev dc12718fc2 Merge remote-tracking branch 'upstream/master' 2020-04-30 21:41:20 +03:00
Sergeanur e14733367e Rename m_phy_flagA80 to bSkipLineCol 2020-04-30 18:58:15 +03:00
Sergeanur 81094f2cd7 Rename m_ped_flagA2 into bWasStanding 2020-04-30 18:13:38 +03:00
Sergeanur 94acee8580 Fix MakeSureSlotInObjectPoolIsEmpty 2020-04-30 16:52:37 +03:00
Sergeanur 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap 1b40693f80 improved video modes for glfw 2020-04-30 15:38:25 +02:00
aap b714103703 fixed CVector != 2020-04-30 11:31:49 +02:00
aap 9950d105f7 Merge branch 'master' of github.com:gtamodding/re3 2020-04-30 10:17:26 +02:00
Sergeanur 080689589c Jap fixes 2020-04-30 02:27:15 +03:00
Nikolay Korolev 38655693f5 Merge remote-tracking branch 'upstream/master' 2020-04-29 21:56:25 +03:00
aap 3580e31ce0 Merge branch 'master' of github.com:gtamodding/re3 2020-04-29 20:53:54 +02:00
aap 804b022e67 implemented improved video modes for win.cpp 2020-04-29 18:24:25 +02:00
eray orçunus fdb1580e15 Mouse wheel fix 2020-04-29 18:53:05 +03:00
Nikolay Korolev 1e78278b5a Merge remote-tracking branch 'upstream/master' 2020-04-29 11:44:33 +03:00
aap 4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages 
Japanese support
 2020-04-29 10:26:36 +02:00
Nikolay Korolev 7608174224 Merge remote-tracking branch 'upstream/master' 2020-04-28 15:11:22 +03:00
Sergeanur 299bbc47ec Changing prefixes for some audio fields 2020-04-28 14:00:38 +03:00
Nikolay Korolev d8371dcf80 Merge remote-tracking branch 'upstream/master' 2020-04-28 12:16:50 +03:00
Nikolay Korolev d921871a88
Allow keyboard controls for flying cheats 2020-04-28 12:05:52 +03:00
aap c7e2845602 removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp? 2020-04-28 10:56:30 +02:00
Nikolay Korolev fcf9011601 Merge remote-tracking branch 'upstream/master' 2020-04-28 00:47:47 +03:00
Sergeanur fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
aap 1180cc2947 Merge branch 'master' of github.com:gtamodding/re3 2020-04-27 20:56:53 +02:00
aap f399fd1050 little support for gl3 textures; txd.img enabled again 2020-04-27 20:56:44 +02:00
Sergeanur 64e6af1db8 Fix tVehicleSampleData struct 2020-04-27 20:26:24 +03:00
Sergeanur c94ccce6d6 Audio structs moved to their AudioManager.h 2020-04-27 20:06:54 +03:00
aap d397a59951 Merge branch 'master' of github.com:gtamodding/re3 2020-04-27 12:31:49 +02:00
aap d9c987bd8c fix (temporary?) for black bullet traces 2020-04-27 12:31:38 +02:00
Sergeanur 7bf45124e6 Fix use of integers instead of enum/bool/nil 2020-04-27 12:41:34 +03:00
Nikolay Korolev 9df04961ce Merge remote-tracking branch 'upstream/master' 2020-04-27 12:20:28 +03:00
Sergeanur 81fce4edab Audio fixes 2020-04-27 02:49:07 +03:00
Sergeanur 669bbe3cc7 Workaround for a crash on release 2020-04-27 01:55:06 +03:00
Nikolay Korolev a38a867cc5 sync with upstream 2020-04-27 00:55:22 +03:00
Nikolay Korolev 74fde1397e pools compatibility 2020-04-27 00:54:43 +03:00
Nikolay Korolev 68bf239868
Merge pull request #489 from Nick007J/master 
1.1 patch stuff + flying controls
 2020-04-27 00:53:54 +03:00
aap e467cb08b8 Merge branch 'master' of github.com:gtamodding/re3 2020-04-26 21:51:11 +02:00
aap 1b5616688e tried to fix some half-pixel bugs 2020-04-26 21:50:52 +02:00
Sergeanur f0890b1112 Merge branch 'master' into MoreLanguages 
# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
 2020-04-26 22:03:15 +03:00
Sergeanur 4dc2f30791 Remove little hack 2020-04-26 21:58:12 +03:00
aap 41586c7cda fixes for glfw 2020-04-26 20:16:31 +02:00
Sergeanur b7ee3792df Remove struct workaround in CControllerConfigManager 2020-04-26 20:11:19 +03:00
Sergeanur 1a44bcccd5 A few fixes 2020-04-26 14:18:34 +03:00
Sergeanur 4f763cba49 Fix compilation error 2020-04-26 13:59:06 +03:00
eray orçunus 6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
Nikolay Korolev fbca45239d Merge remote-tracking branch 'upstream/master' 2020-04-25 21:46:15 +03:00
Nikolay Korolev ae8deff131 helis done + cheats 2020-04-25 21:25:14 +03:00
aap ea79cc4469 update librw 2020-04-25 15:56:20 +02:00
Nikolay Korolev 7ddfc40675 Merge remote-tracking branch 'upstream/master' 2020-04-25 16:48:03 +03:00
Nikolay Korolev 40ec636291 fixed flight control code 2020-04-25 16:47:39 +03:00
aap 8289b42c9e fixed shooting target 2020-04-25 14:37:58 +02:00
aap 241352e312 real names (from LCS) 2020-04-25 14:03:20 +02:00
aap f15a5ac0f9 using librw GS alpha test emulation 2020-04-25 12:16:50 +02:00
Nikolay Korolev bb14d9689f Merge remote-tracking branch 'upstream/master' 2020-04-25 12:26:37 +03:00
aap 05bba73225 Merge branch 'master' of github.com:gtamodding/re3 2020-04-25 11:26:05 +02:00
Nikolay Korolev 2be2899034 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:25:40 +03:00
aap ad9ebbd390
Merge pull request #490 from aap/debugmenu 
implemented debugmenu
 2020-04-25 11:25:19 +02:00
Nikolay Korolev 34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
Nikolay Korolev f3ae4fa184 undo 2020-04-25 12:14:51 +03:00
Nikolay Korolev c8fd0385cf flying control 2020-04-25 12:14:21 +03:00
aap ac19de45b8 few fixes 2020-04-25 00:41:17 +02:00
Nikolay Korolev 4b883f2b40
disable mouse steering by default 2020-04-24 20:50:00 +03:00
aap 5bb4e99926 implemented debugmenu 2020-04-24 14:08:06 +02:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev bed41e1bec removed redundant checks 2020-04-24 01:40:12 +03:00
Nikolay Korolev 0fc505926f fix annoying bug 2020-04-24 01:32:17 +03:00
Nikolay Korolev 0b12cacf15 more 1.1 patch 2020-04-24 01:01:41 +03:00
aap 6467e2003a Merge branch 'master' of github.com:gtamodding/re3 2020-04-23 22:10:46 +02:00
Nikolay Korolev 05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
Nikolay Korolev 458eb3a4f0
removed fix that made no sense 2020-04-23 16:40:19 +03:00
Fire_Head ff46dc1c6c
Merge branch 'master' into master 2020-04-23 11:50:06 +03:00
Fire-Head 2925b7e0c3 fix #ifdef 2020-04-23 11:35:42 +03:00
Fire-Head 75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
erorcun 9660594634
Merge pull request #481 from erorcun/erorcun 
Crossplatform work continues
 2020-04-22 14:08:01 +03:00
eray orçunus c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Nikolay Korolev 78d6ad7348 Merge remote-tracking branch 'upstream/master' 2020-04-21 23:41:04 +03:00
Fire_Head 828dc85be5
fix RenderExtraPlayerShadows 2 2020-04-21 22:53:55 +03:00
Fire_Head fba4c51f6b
fix RenderExtraPlayerShadows 2020-04-21 22:52:42 +03:00
aap 959f84ff95 fixed extra directory issues 2020-04-21 13:56:33 +02:00
Nikolay Korolev 7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00
shfil 7794cca429
Merge pull request #477 from ShFil119/mingw 
Try to make code working on more platforms
 2020-04-20 19:50:12 +02:00
Nikolay Korolev 35a7f89f73 Merge remote-tracking branch 'upstream/master' 2020-04-20 19:41:49 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
aap 98fc8ecef0 update librw (matfx) 2020-04-20 16:05:39 +02:00
Fire_Head c9920b6a2d
Merge pull request #480 from Fire-Head/master 
camerapickup ps2 code
 2020-04-20 08:21:27 +03:00
Fire-Head 556a6df401 camerapickup ps2 code 2020-04-20 08:17:08 +03:00
Fire_Head 0a07a2233b
Merge pull request #479 from Fire-Head/master 
OddJob sliding text
 2020-04-20 07:46:44 +03:00
Fire-Head 83810168ee beta OddJob(unique jump etc) sliding text 2020-04-20 07:45:17 +03:00
Nikolay Korolev b8c34f6654 Merge remote-tracking branch 'upstream/master' 2020-04-20 01:05:20 +03:00
Nikolay Korolev 7e4c683824 fixes 2020-04-20 01:04:57 +03:00
Sergeanur 8e9c9fa445 Fix CPickups::GenerateNewOne loop 2020-04-20 00:14:48 +03:00
Fire-Head 36f08269a5 MenuScreens.h fix 2020-04-19 22:38:02 +03:00
Fire-Head 4c5edda82e MenuScreens.h fix 2020-04-19 22:37:20 +03:00
Fire-Head 2308321805 Add polish lang support 2020-04-19 22:32:59 +03:00
Nikolay Korolev df376a13ea sync with master 2020-04-19 17:38:48 +03:00
Nikolay Korolev 9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +03:00
erorcun 0f07a323c9
Merge pull request #474 from Nick007J/master 
Bug fixes, mostly replay; added RegisterReference for player ped pointer
 2020-04-19 16:56:39 +03:00
erorcun f9ed50e178
Merge pull request #475 from erorcun/erorcun 
Struct cleanup, various fixes, enable PS2 rand
 2020-04-19 16:54:05 +03:00
eray orçunus 1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev bcc3a8b6c7 missing ifded 2020-04-19 01:20:14 +03:00
Sergeanur fce2e02444 Fix savename buffer overflow 2020-04-18 23:58:43 +03:00
Nikolay Korolev 4c133a95bd Merge remote-tracking branch 'upstream/master' 2020-04-18 23:50:58 +03:00
Nikolay Korolev c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
eray orçunus 9bfcaff849 slider fix 2020-04-18 22:56:49 +03:00
eray orçunus 5320bf7964 RpClumpRemoveAtomic update 2020-04-18 21:44:07 +03:00
erorcun 6e24cb28ad
Merge pull request #472 from gennariarmando/master 
Hide Vehicle/Zone name during Wasted/Busted...
 2020-04-18 21:38:33 +03:00
eray orçunus 2f63e5e751 Vc ped ports and Frontend fixes 2020-04-18 21:30:03 +03:00
gennariarmando ffe5dce7f5 Hide Vehicle/Zone name during Wasted/Busted... 
Fixed little mistake in my latest commit.
 2020-04-18 18:14:38 +02:00
gennariarmando 522d14814f Changed extraOffset value. 2020-04-18 16:14:48 +03:00
erorcun 70ccd4c187
Merge pull request #464 from gennariarmando/master 
Fixed menu radio icons.
 2020-04-18 16:14:26 +03:00
Nikolay Korolev 89688843ec bug fixes 2020-04-18 13:56:21 +03:00
Filip Gawin d6314f9564 Revert "Part one" 
This reverts commit 63951d9b95.
 2020-04-18 12:29:28 +02:00
Filip Gawin 3f32b69a79 Fix crash in cAudioManager::ServicePoliceRadio 2020-04-18 12:20:20 +02:00
Filip Gawin 2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
Sergeanur eadb5a16aa Zones save/load 2020-04-18 12:24:44 +03:00
Sergeanur 555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
gennariarmando e41c32df43 Fixed menu radio icons. 2020-04-18 05:52:33 +02:00
eray orçunus 812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
aap bdf9fa2f01 implemented librw alphatest setting 2020-04-17 23:55:20 +02:00
aap 5c474b9c68 Merge branch 'master' of github.com:gtamodding/re3 2020-04-17 21:45:25 +02:00
aap 886d73b123 fixed raster from image conversion 2020-04-17 21:45:02 +02:00
Filip Gawin 63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur 64cf568691 We don't need rw.cpp anymore 2020-04-17 18:46:43 +03:00
Sergeanur 941c50ee25 Merge remote-tracking branch 'origin/master' into Standalone 2020-04-17 16:31:43 +03:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
aap 6ef7924e01 implemented CVector2D::NormaliseSafe for SkidMarks 2020-04-17 15:15:42 +02:00
Sergeanur c8af08330a Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 15:06:49 +03:00
saml1er ac61da3feb Fix CWorld::FindObjectsOfTypeInRangeSectorList bug 2020-04-17 17:04:09 +05:00
Sergeanur 4ecf56a2d7 Merge remote-tracking branches 'origin/master' and 'samler/world' into Standalone 2020-04-17 15:03:00 +03:00
saml1er 2a4717fa41 Apply clang format to CWorld 2020-04-17 16:14:59 +05:00
saml1er ce7d6848ba CWorld fixes 2020-04-17 16:13:55 +05:00
Sergeanur b9c8ce0d37 Merge remote-tracking branch 'Fire-Head/master' into Standalone 
# Conflicts:
#	src/render/Coronas.cpp
 2020-04-17 10:17:38 +03:00
Sergeanur 881d61f811 Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 10:16:30 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
eray orçunus 425395ad25 Ped fixes and ref removal 2020-04-17 07:01:54 +03:00
saml1er e777f24064 More CWorld fixes 2020-04-17 05:38:05 +05:00
saml1er 03247ce98f Fix CWorld::RepositionOneObject bugs 2020-04-17 03:54:22 +05:00
saml1er 6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05:00
eray orçunus 2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
saml1er e52a02fb9e Merge branch 'master' into world 
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
 2020-04-17 00:01:53 +05:00
saml1er 52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Sergeanur 83cbe4e39e More refs removed 2020-04-16 15:30:47 +03:00
aap 7bd12f4a48 add textures in correct order 2020-04-16 13:33:32 +02:00
Sergeanur 552f8c864f
Merge pull request #448 from Nick007J/master 
CBulletInfo
 2020-04-16 12:57:58 +03:00
Sergeanur 69c32376fe Increase alpha entity list capacity for wide screen 2020-04-16 12:44:04 +03:00
Sergeanur b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
aap 4b602940eb first fake RW implementation working 2020-04-16 10:26:16 +02:00
aap 89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00