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

242 commits

Author SHA1 Message Date
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
eray orçunus 112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap 739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
aap 29f69f6216
Merge pull request #357 from aap/master 
Finished CCam; various smaller things
 2020-03-27 18:41:22 +01:00
aap f0dfaac838 Finished CCam; various smaller things 2020-03-27 10:04:45 +01:00
eray orçunus 0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03: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
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
eray orçunus d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
eray orçunus 934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
eray orçunus a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
eray orçunus ae523a09a7 fixes 2020-03-01 04:44:58 +03:00
eray orçunus 750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00
eray orçunus ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
eray orçunus 89be27734b a fix 2020-02-13 23:34:36 +03:00
eray orçunus 9896217608 few little things 2020-02-04 00:27:48 +03:00
eray orçunus ce0687db27 A bug fix and VC ports for veh. enter/exit 2020-02-03 21:03:48 +03:00
eray orçunus 03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Sergeanur 8a6cec8bed CPedIK finished 2020-01-29 01:53:58 +02:00
erorcun d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
erorcun 18de44e038
Merge pull request #285 from Nick007J/script_dev 
600-799 script commands; bug fixes
 2020-01-07 17:08:51 +03:00
Sergeanur 71889de1be Use CGeneral::faststricmp in CPed::ServiceTalking 2020-01-07 15:43:56 +02:00
Nikolay Korolev 5b0cf80a76 merge with upstream 2020-01-01 02:42:00 +03:00
Nikolay Korolev 80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
eray orçunus bb5e31470d CPlayerPed & fixes 2019-12-28 23:05:49 +03:00
eray orçunus 6cbf1db519 CPlayerInfo done 2019-12-16 07:48:44 +03:00
eray orçunus dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
eray orçunus 6496143022 Shadow/blood fade and scale fix 2019-11-28 00:22:38 +03:00
eray orçunus 680fe0f7e6 CCivilianPed done & restore peds running to phone 2019-11-26 02:35:05 +03:00
eray orçunus bd68b56b5d CPed completed! 
And a few fixes
 2019-11-21 00:05:10 +03:00
eray orçunus 030f64daf1 Frontend, Peds & logic and overflow fixes 2019-11-13 01:16:23 +03:00
eray orçunus d5619fb5ae Peds & a few fixes 2019-11-05 03:52:06 +03:00
eray orçunus ad69a319cb The Peds 2019-10-30 02:41:47 +03:00
eray orçunus 36e136a06c Fall damage fix 2019-10-27 18:00:31 +03:00