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
3894 commits 4 branches 2 tags 50 MiB
Commit graph

376 commits

Author SHA1 Message Date
eray orçunus fd3cd2c26a Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-20 16:23:42 +03:00
eray orçunus 0625954bb7 Ducking, shooting vehicle occupants and weapon fixes 2020-06-20 16:23:32 +03:00
aap c5205a89ee CCamera done 2020-06-20 14:54:11 +02:00
eray orçunus e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
erorcun d322a8033e
Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
eray orçunus 3a600b4684 Bike anim. fix 2020-06-16 00:20:08 +03:00
eray orçunus c4e129509b Peds & fixes continues 2020-06-15 23:43:20 +03:00
erorcun f64d3ad7de
Merge pull request #631 from erorcun/miami 
Peds, mission switcher & fixes
 2020-06-14 22:59:02 +03:00
eray orçunus db6110e996 Peds, mission switcher & fixes 2020-06-14 22:57:26 +03:00
majestic 015921522d fixed condition in CBoat::ProcessControl and changed enum 2020-06-14 07:53:45 -07:00
aap c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
Nikolay Korolev f78f707935 script fix 2020-06-13 02:02:59 +03:00
majestic 2cc8ecbb90 removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun 2020-06-11 01:36:45 -07:00
majestic 94e3c30054 original multiplying rotational cords for minigun 2020-06-11 00:59:23 -07:00
majestic 669db1a293 minigun rotation fix 2020-06-10 23:26:51 -07:00
eray orçunus dba2b052a6 Peds, bike center of mass and reversing fixes 2020-06-09 01:29:55 +03:00
eray orçunus e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Nikolay Korolev 1748aabd69 fix 2020-06-07 18:19:44 +03:00
Nikolay Korolev d0213e466c more script commands 2020-06-07 15:49:25 +03:00
eray orçunus de4323f949 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 12:46:15 +03:00
eray orçunus d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +03:00
Sergeanur 1c01899799 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
 2020-06-07 04:15:10 +03:00
aap 5711159e68 CBike done 2020-06-07 00:01:59 +02:00
eray orçunus db9057f5a8 fix 2020-06-06 22:24:30 +03:00
eray orçunus 096ecc1d14 Some wait states 2020-06-06 22:16:59 +03:00
eray orçunus fc0498b3a8 CFont crash workaround 2020-06-06 19:25:37 +03:00
eray orçunus 4e4a3489ef Use KnockOffRider 2020-06-06 17:19:36 +03:00
Nikolay Korolev e099aaaa6b minor fixes 2020-06-06 16:36:26 +03:00
Nikolay Korolev 3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
Sergeanur afa4fa6510 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/soundlist.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/peds/Ped.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Vehicle.h
 2020-06-06 08:42:58 +03:00
eray orçunus f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +03:00
aap 98de658c8f
Merge pull request #619 from ShFil119/heads 
Fix collision with peds heads
 2020-06-05 13:43:07 +02:00
Nikolay Korolev d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
eray orçunus 016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
Sergeanur 07c6752cf7 Merge branch 'master' into miami 
# Conflicts:
#	src/peds/Ped.cpp
 2020-06-04 05:10:50 +03:00
Sergeanur 2578880e1c PedChat & PedDebug 2020-06-04 05:04:00 +03:00
Sergeanur 07d336ddf0 Merge branch 'master' into miami 
# Conflicts:
#	src/peds/Ped.cpp
#	src/peds/Ped.h
 2020-06-04 04:32:49 +03:00
Sergeanur 12717917cc Restore original logic of CPed::WanderRange 2020-06-04 04:31:04 +03:00
aap e1201fc6e2 fixed CPed::AddInCarAnims 2020-06-03 16:55:23 +02:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap 2ca3c50463 some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
aap 04a91761df some vehicle cleanup 2020-06-02 23:34:53 +02:00
Filip Gawin 5d90e4b2f0 Fix collision with peds heads 2020-06-01 22:10:11 +02:00
eray orçunus abef04c637 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-01 18:35:04 +03:00
aap 25273485d9 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 18:05:24 +02:00
eray orçunus d930a25d94 DrawStandardMenus, VC menu array and minor fixes 2020-06-01 18:32:34 +03:00
Nikolay Korolev c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap 21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
eray orçunus 529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
Fire_Head e4649b41e1
Merge pull request #2 from GTAmodding/miami 
Miami
 2020-05-27 21:51:40 +03:00
Fire-Head 63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
Sergeanur 408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
aap 800d706935
Merge pull request #588 from blingu/miami 
fixed compiler errors
 2020-05-26 11:39:16 +02:00
aap 7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
aap 3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
nrb d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Nikolay Korolev 2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
Nikolay Korolev 607175f02a set pieces 2020-05-23 20:06:52 +03:00
eray orçunus c3b41d79a2 Cleanup and one needed function 2020-05-23 18:04:33 +03:00
eray orçunus 5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev b9115b4429 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 01:43:17 +03:00
Nikolay Korolev 7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
aap a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
aap a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
Nikolay Korolev 864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
Nikolay Korolev 7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
eray orçunus 2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
Nikolay Korolev fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
Nikolay Korolev 4c822e8375 script revision 2020-05-19 20:54:05 +03:00
eray orçunus 99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
Nikolay Korolev 6510b15704 script revision 2020-05-19 01:49:09 +03:00
aap 2d4861454c
Merge pull request #557 from Nick007J/miami 
script and script stubs
 2020-05-18 13:08:24 +02:00
eray orçunus 96151ec0f0 TransformToNode crash fix? 2020-05-18 00:27:04 +03:00
Nikolay Korolev 3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
eray orçunus 84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
eray orçunus 40ee29fb99 Weapon fixes 2020-05-16 15:07:09 +03:00
aap 0c23166318 changed CPedIK names 2020-05-16 10:33:19 +02:00
Nikolay Korolev 5abd466b5d Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 10:52:58 +03:00
Sergeanur 76dd769085 Merge branch 'master' into miami 2020-05-16 05:07:39 +03:00
Sergeanur ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
Nikolay Korolev f864698696 ped attractors 2020-05-16 02:10:23 +03:00
Nikolay Korolev 21329b8440 sync with upstream 2020-05-16 01:50:45 +03:00
Nikolay Korolev 08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
erorcun 8ff72f0728
Merge pull request #550 from erorcun/miami 
Weapon layer in Peds
 2020-05-15 21:30:57 +03:00
eray orçunus acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
aap 1fde2ba468 CPedIK 2020-05-15 19:41:44 +02:00
Nikolay Korolev 09a0207e55 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-14 22:29:23 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
Nikolay Korolev 9d4d83db0d some fixes 2020-05-14 14:01:24 +03:00
Nikolay Korolev d031943f2a more pedattractor 2020-05-14 13:46:11 +03:00
Nikolay Korolev d426588496 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-13 17:55:12 +03:00
Sergeanur 3f1001b86b More save/load alignment fixes 2020-05-13 16:24:00 +03:00
Nikolay Korolev 81ea6f0258 ped attractor: start 2020-05-13 11:38:05 +03:00
Sergeanur 7c2b9478d5 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
 2020-05-13 00:55:52 +03:00
Sergeanur 33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
 2020-05-13 00:27:15 +03:00
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
eray orçunus 8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap f7300c7a27 CPedModelInfo 2020-05-10 13:08:02 +02:00
Sergeanur 35c41208f5 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
 2020-05-10 01:26:12 +03:00
aap 97d5698e0c peds starting to work 2020-05-09 17:05:26 +02:00
Sergeanur 1b599b2d35 Fix compilation error 2020-05-09 15:41:00 +03:00
aap ea053467b5 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-09 12:45:27 +02:00
aap e8c0619226 named anim assoc flags 2020-05-09 09:51:31 +02:00
aap 3f09ec0744 named anim assoc flags 2020-05-09 09:50:00 +02:00
Nikolay Korolev 7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
Sergeanur 6ad66fb2d7 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/render/Renderer.cpp
 2020-05-06 19:32:57 +03:00
Nikolay Korolev a24b65cbde IsStatic 2020-05-06 19:17:47 +03:00
aap c11912a8ec sorted out object collision enums 2020-05-06 17:14:34 +02:00
aap a2b89c6a18 sorted out object collision enums 2020-05-06 17:13:46 +02:00
aap e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
Sergeanur c2b9ddc5b8 Revert "Remove Miami stuff" 
This reverts commit 9960c41193.
 2020-05-05 18:04:43 +03:00
Sergeanur 9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
aap b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur 4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur e9b334d7bf More use of GetModelIndex 2020-05-05 14:48: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
aap 702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02: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 d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +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 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Fire-Head 75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
eray orçunus 1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
eray orçunus 2f63e5e751 Vc ped ports and Frontend fixes 2020-04-18 21:30:03 +03:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
eray orçunus 425395ad25 Ped fixes and ref removal 2020-04-17 07:01:54 +03:00
aap afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02:00
Nikolay Korolev 5cb7e2e42a
Merge pull request #440 from Fire-Head/master 
CWeapon done, fixes
 2020-04-15 23:28:09 +03:00
eray orçunus 4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
aap 90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Fire-Head daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +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
saml1er a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
aap 6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
aap 7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
eray orçunus 5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05: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