Commit Graph

59 Commits

Author SHA1 Message Date
eray orçunus
db6110e996 Peds, mission switcher & fixes 2020-06-14 22:57:26 +03:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
eray orçunus
529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
eray orçunus
e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +03:00
Nikolay Korolev
ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03: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
Nikolay Korolev
510261cb05 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 23:54:22 +03:00
Nikolay Korolev
d84650fbe5 script revision 2020-05-20 20:40:04 +03:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
Nikolay Korolev
4c822e8375 script revision 2020-05-19 20:54:05 +03:00
Nikolay Korolev
6510b15704 script revision 2020-05-19 01:49:09 +03:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +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
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Nikolay Korolev
599b7301c8 script stubs + REQUEST_COLLISION 2020-05-06 21:15:58 +03:00
Nikolay Korolev
0b104a59fe script colstore stuff 2020-05-06 01:11:06 +03:00
Nikolay Korolev
1291dd534b script stuff 2020-05-05 21:45:43 +03: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
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Nikolay Korolev
fa29804c49 script compatibility 2020-05-03 01:42:46 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Fire-Head
590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
Nikolay Korolev
7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
Fire-Head
194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00
Nikolay Korolev
90ff2f73eb Merge branch 'master' into script_dev 2020-03-01 17:44:37 +03:00
Nikolay Korolev
5eccf44e7a review fixes 2020-03-01 17:42:47 +03:00
Nikolay Korolev
64b28c0730 save/load 2020-03-01 14:18:10 +03:00
Nikolay Korolev
56c83dfaae more stuff + intro fix 2020-02-24 21:17:15 +03:00
Nikolay Korolev
1721a74466 stuff 2020-02-23 13:30:37 +03:00
Nikolay Korolev
1ba696f5fc some changes 2020-02-23 13:12:44 +03:00
Nikolay Korolev
aa5266b1b3 some cosmetic stuff 2020-02-23 02:29:38 +03:00
Nikolay Korolev
1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev
a36da99798 review fixes 2020-02-16 12:44:33 +03:00
Nikolay Korolev
043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
Sergeanur
79d2ab7619 More fixes 2020-01-31 19:16:13 +02: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
c78fff8d54 script 400-499 start 2019-10-12 22:00:31 +03:00
Nikolay Korolev
345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
Nikolay Korolev
5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
Nikolay Korolev
ef831a491e fixed script issues 2019-07-20 16:30:11 +03:00
Nikolay Korolev
11ae1b06ae RunningScript: 1/12 2019-07-09 23:38:05 +03:00
aap
a2cecd4e97
Merge pull request #122 from Nick007J/master
More script stuff
2019-07-08 21:38:06 +02:00
aap
12af85ca3d cleaned up patching of virtual functions; started CAutomobile 2019-07-08 08:46:42 +02:00
Nikolay Korolev
4f3d17a81c More script 2019-07-08 00:05:24 +03:00