Nikolay Korolev
9b23e33c36
sync with upstream
2020-05-11 21:21:09 +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
Nikolay Korolev
8fae2dcc26
garages + script
2020-05-11 21:04:35 +03:00
bigbossbro08
c798e1bacd
Fixed typos and made all assert functions optional
2020-05-10 21:49:33 +06:00
bigbossbro08
af6e132b37
defined out asserts.
2020-05-10 19:54:37 +06:00
Nikolay Korolev
7e753c2596
CCarCtrl::GenerateOneRandomCar
2020-05-08 23:29:43 +03:00
Filip Gawin
370c4e48cd
Try to build with mingw
2020-04-20 18:18:46 +02:00
Filip Gawin
d6314f9564
Revert "Part one"
...
This reverts commit 63951d9b95
2020-04-18 12:29:28 +02:00
Filip Gawin
63951d9b95
Part one
2020-04-17 19:30:57 +02:00
Fire-Head
a4922d5cb7
rem refs
2020-04-17 08:54:14 +03:00
eray orçunus
a3b519ea64
CShotInfo, CWanted done, Frontend fix
2020-03-29 19:02:26 +03:00
eray orçunus
f307839a2b
CPlayerPed done
2020-02-13 22:02:45 +03:00
Sergeanur
da253837d1
audio stuff
...
Collision audio and police radio stuff moved to a separate cpp's like in the original code
cPoliceRadioQueue added, code refactored correspondingly
cAudioManager::ServiceCollisions reversed
PlayOneShotScriptObject reversed
cAudioScriptObject moved to AudioScriptObject.cpp
Fixed use of numbers on non-integer types (bools, pointers)
enum is now used for ped audio calculation
Added fixes for vehicle description in the police radio (missing vehicles and wrong colors)
2020-01-25 12:48:27 +02:00
Sergeanur
3ff7fc8355
Fixed nasty warnings
2019-10-17 17:28:24 +03:00
Sergeanur
69963cea68
Full CGameLogic
2019-10-08 17:13:23 +03:00
aap
a3e3527a3b
implemented CHeli
2019-08-04 00:31:00 +02:00
eray orçunus
875cdd845d
The Peds
2019-08-02 01:30:40 +03:00
aap
60711154ba
more CWanted; added CEventList
2019-07-12 18:01:22 +02:00
aap
a65dd41da7
yet more CAutomobile
2019-07-09 18:50:35 +02:00
_AG
d1c6a6aaa6
Merge branch 'master' of https://github.com/gtamodding/re3
2019-07-07 15:16:54 +02:00
aap
53023eb65b
the great reorganization
2019-07-07 13:09:11 +02:00
