Commit Graph

37 Commits

Author SHA1 Message Date
Nikolay Korolev
7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
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
Nikolay Korolev
2f979a8cde some changes 2020-05-11 01:00:41 +03:00
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Nikolay Korolev
00cdcef36a some updates for script 2020-05-10 17:54:13 +03:00
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Sergeanur
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
eray orçunus
2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
Nikolay Korolev
7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
Nikolay Korolev
7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
aap
7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
Nikolay Korolev
e34631adce review fixes 2020-04-01 00:07:09 +03:00
Nikolay Korolev
24e4ecf5bb bug fixes, reorganisation 2020-03-31 00:46:44 +03:00
Nikolay Korolev
50b43b680e finished garages 2020-03-31 00:01:03 +03:00
Nikolay Korolev
0db35f8275 more garages 2020-03-29 18:48:57 +03:00
Nikolay Korolev
93417853ed fixes 2020-03-28 23:41:37 +03:00
Nikolay Korolev
775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
Nikolay Korolev
268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
Wes Hampson
28342405d3 Add Load/Save functions 2020-03-10 20:26:07 -07:00
Nikolay Korolev
1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev
043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
Nikolay Korolev
0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev
80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
Nikolay Korolev
5e77e9d0ea script 600-699 2019-10-27 12:51:09 +03:00
Nikolay Korolev
3dee880c29 merge 2019-10-26 17:20:31 +03:00
Nikolay Korolev
d579ee1b64 script 500-599 plus bugfix 2019-10-22 00:39:59 +03:00
nmzik
f56684d04e CGame::Process() && CGame::ReloadIPLs 2019-10-19 01:23:40 +03:00
Sergeanur
69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
eray orçunus
0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
Filip Gawin
2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
Nikolay Korolev
14b945ba08 more CCarCtrl 2019-08-11 20:11:54 +03:00
Nikolay Korolev
345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
aap
0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00
_AG
f299e9ebd5 Update HUD stuff, bug and format fixes.
Added environment variables to premake5.lua.
Update README.md
2019-06-17 02:11:30 +02:00
aap
188aab4196 implemented some higher level functions; added lots of stubs; switched top and bottom in CRect 2019-05-30 21:24:47 +02:00