Commit graph

143 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
c4e129509b Peds & fixes continues 2020-06-15 23:43:20 +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
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
d0213e466c more script commands 2020-06-07 15:49:25 +03:00
eray orçunus
d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +03:00
eray orçunus
096ecc1d14 Some wait states 2020-06-06 22:16:59 +03:00
eray orçunus
f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +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
eray orçunus
5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
Nikolay Korolev
607175f02a set pieces 2020-05-23 20:06:52 +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
46d1889344 slightly restructured ped flags for convenience 2020-05-19 21:34:28 +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
Nikolay Korolev
d5d2f6a822 sync with upstream 2020-05-17 21:48:21 +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
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
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
d031943f2a more pedattractor 2020-05-14 13:46:11 +03:00
Nikolay Korolev
81ea6f0258 ped attractor: start 2020-05-13 11:38:05 +03:00
Sergeanur
0aa7f13c32 Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimBlendAssociation.h
#	src/animation/AnimBlendClumpData.h
#	src/animation/AnimManager.h
#	src/animation/FrameUpdate.cpp
#	src/control/AutoPilot.h
#	src/control/PathFind.h
#	src/core/PlayerInfo.h
#	src/entities/Building.h
#	src/entities/Dummy.h
#	src/entities/Entity.h
#	src/entities/Physical.h
#	src/entities/Treadable.h
#	src/modelinfo/BaseModelInfo.h
#	src/modelinfo/ClumpModelInfo.cpp
#	src/modelinfo/ClumpModelInfo.h
#	src/modelinfo/PedModelInfo.h
#	src/modelinfo/SimpleModelInfo.h
#	src/modelinfo/TimeModelInfo.h
#	src/modelinfo/VehicleModelInfo.h
#	src/objects/CutsceneHead.h
#	src/objects/CutsceneObject.h
#	src/objects/DummyObject.h
#	src/objects/Object.h
#	src/peds/DummyPed.h
#	src/peds/PedIK.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Boat.h
#	src/vehicles/Heli.h
#	src/vehicles/Plane.h
#	src/vehicles/Train.h
#	src/vehicles/Vehicle.h
2020-05-11 21:07:12 +03:00
bigbossbro08
b4abb6ddd8 fixed few more typos 2020-05-10 22:04:36 +06:00
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
aap
f7300c7a27 CPedModelInfo 2020-05-10 13:08:02 +02:00
Nikolay Korolev
7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00