Commit graph

380 commits

Author SHA1 Message Date
Nikolay Korolev
f5cba0ce89 script logging 2020-06-21 13:46:23 +03:00
Nikolay Korolev
144f12525e fix 2020-06-20 13:51:39 +03:00
Nikolay Korolev
eab6741afe fix 2020-06-20 13:26:27 +03:00
Nikolay Korolev
e9e533b0cb bikes in garages + bugfix 2020-06-18 00:03:43 +03:00
eray orçunus
e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
eray orçunus
c6bb1f5d0d some cutscene opcodes and heli guns 2020-06-16 20:35:09 +03:00
eray orçunus
2d976827dd much better mission switcher 2020-06-15 00:26:19 +03:00
eray orçunus
db6110e996 Peds, mission switcher & fixes 2020-06-14 22:57:26 +03:00
Nikolay Korolev
f78f707935 script fix 2020-06-13 02:02:59 +03:00
Nikolay Korolev
d415c4edd3
minor fix 2020-06-13 00:16:10 +03:00
Sergeanur
95e9fe7693 fixes 2020-06-08 16:22:49 +03:00
Sergeanur
36a6d124aa Mission audio slots 2020-06-08 10:34:31 +03:00
Nikolay Korolev
16a5c2f676 fixes 2020-06-08 01:21:49 +03:00
Nikolay Korolev
af564d865c fixes 2020-06-08 01:16:21 +03:00
eray orçunus
a77b181e32 CarCtrl fixes 2020-06-08 00:59:43 +03:00
Nikolay Korolev
23f20ceaf8 fix 2020-06-07 19:35:05 +03:00
Nikolay Korolev
2f9becbac6 fix 2020-06-07 19:31:15 +03:00
Nikolay Korolev
d0213e466c more script commands 2020-06-07 15:49:25 +03:00
Nikolay Korolev
0b156f1d26 some stats tweaks; saves dead again 2020-06-07 15:23:52 +03:00
Nikolay Korolev
c50a61d52a fixed some arithmetic 2020-06-07 15:08:58 +03:00
Nikolay Korolev
be2291e44c fixed some arithmetic 2020-06-07 15:07:36 +03:00
eray orçunus
de4323f949 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 12:46:15 +03:00
eray orçunus
d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Nikolay Korolev
3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
eray orçunus
f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +03:00
Nikolay Korolev
83e4023dc0 fix 2020-06-05 12:59:27 +03:00
Nikolay Korolev
d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
eray orçunus
5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +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
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
Nikolay Korolev
09c9e16cb1 roadblocks 2020-05-30 20:08:31 +03:00
eray orçunus
dd162c3aa0 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-29 22:05:52 +03:00
eray orçunus
529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
Nikolay Korolev
627ffb0f82 fix 2020-05-29 16:52:02 +03:00
eray orçunus
e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +03:00
eray orçunus
98fec63ca7 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-28 11:40:56 +03:00
eray orçunus
329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
aap
9bcec54291
Merge pull request #599 from Nick007J/master
Mission replay
2020-05-28 10:25:14 +02:00
Nikolay Korolev
d9d57f12fc
crash fix 2020-05-28 01:00:49 +03:00
Sergeanur
408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
Nikolay Korolev
ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
Sergeanur
0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
aap
800d706935
Merge pull request #588 from blingu/miami
fixed compiler errors
2020-05-26 11:39:16 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
blingu
79c652e115
Ped.h include not needed 2020-05-24 17:48:13 +02:00
nrb
d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Nikolay Korolev
8c510a8d5b script fix 2020-05-24 15:00:45 +03:00
Nikolay Korolev
e95de89c9a script fix 2020-05-24 12:01:07 +03:00
Nikolay Korolev
2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
Nikolay Korolev
607175f02a set pieces 2020-05-23 20:06:52 +03:00
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev
9c6046455e fixed script 2020-05-23 12:17:05 +03:00
Nikolay Korolev
7b7b0fb5f2 removed debug 2020-05-23 02:18:16 +03:00
Nikolay Korolev
f8a509ffb3 fixes 2020-05-23 02:17:27 +03:00
Nikolay Korolev
7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
Nikolay Korolev
e18eb0ce01
script fix 2020-05-23 00:50:15 +03:00
Nikolay Korolev
6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +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
73ff01e35b
script fix 2020-05-21 00:18:13 +03:00
Nikolay Korolev
0085ed894f script revision 2020-05-20 23:47:44 +03:00
Nikolay Korolev
b7c1784dd2
script fix 2020-05-20 23:25:01 +03:00
Nikolay Korolev
f33a01e8c8 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 20:40:36 +03:00
Nikolay Korolev
d84650fbe5 script revision 2020-05-20 20:40:04 +03:00
Sergeanur
c53b23cff0 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
2020-05-20 14:39:36 +03:00
aap
fd4cd3e8f1
Merge pull request #569 from aap/miami
CEntity and friends
2020-05-20 12:41:12 +02:00
Nikolay Korolev
1b96e6c378
fixed script bug 2020-05-19 23:49:28 +03:00
Nikolay Korolev
fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02: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
c47292b518
script fix 2020-05-19 00:10:45 +03:00
Nikolay Korolev
746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
Nikolay Korolev
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
Nikolay Korolev
ad8a8913d9 a few more stubs 2020-05-18 00:20:26 +03:00
Nikolay Korolev
39931a5284 some more script stubs 2020-05-17 23:31:16 +03:00
eray orçunus
7bd6c70318 just in case 2020-05-17 22:17:43 +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
aap
8a7210cad1
Merge pull request #555 from erorcun/miami
Weapon fixes and thingies
2020-05-17 20:20:14 +02:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap
72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
Nikolay Korolev
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev
e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
aap
c54d3ba2ab fixes for 64 bit build 2020-05-16 14:34:51 +02:00
Nikolay Korolev
4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
eray orçunus
acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Sergeanur
24875f34d0 Merge branch 'master' into miami
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
2020-05-14 17:05:42 +03:00
Nikolay Korolev
b01987719e
fixed script error 2020-05-14 15:26:59 +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
Nikolay Korolev
3e64274f6b more script 2020-05-12 01:59:35 +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
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +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
Nikolay Korolev
61eb361d26 script changes 2020-05-10 15:23:56 +03:00
Nikolay Korolev
2f7d2fa3ad more car control 2020-05-10 12:25:30 +03:00
Nikolay Korolev
609caad7a4 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-09 20:21:36 +03:00
Nikolay Korolev
a55e738dfa ccarctrl big fix 2020-05-09 20:21:13 +03:00
aap
97d5698e0c peds starting to work 2020-05-09 17:05:26 +02:00
aap
989ded6052 removed cutscene heads 2020-05-09 13:00:39 +02:00
Nikolay Korolev
7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
Nikolay Korolev
c11a20cb4f zone info commands + fix 2020-05-08 16:16:46 +03:00
aap
f80474f590 little script change 2020-05-07 18:08:17 +02:00
aap
19b21cafcd CZoneInfo mostly done; not its dependencies 2020-05-07 17:53:38 +02:00
aap
05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap
a8d8c0690d changed default ID ranges. old default.ide incompatible now 2020-05-06 23:39:38 +02:00
Nikolay Korolev
599b7301c8 script stubs + REQUEST_COLLISION 2020-05-06 21:15:58 +03:00
Nikolay Korolev
8c036ec671 sync with master 2020-05-06 14:42:41 +03:00
aap
e0568a19d5 new zone stuff 2020-05-06 12:23:57 +02:00
aap
cbfc45b3f7 some work on zones 2020-05-06 12:23:26 +02:00
Nikolay Korolev
e5da4c2b4d Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 01:11:18 +03:00
Nikolay Korolev
0b104a59fe script colstore stuff 2020-05-06 01:11:06 +03:00
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
Nikolay Korolev
35bf340401 colstore support in script 2020-05-06 00:21:26 +03:00
Nikolay Korolev
1291dd534b script stuff 2020-05-05 21:45:43 +03:00
Sergeanur
4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
Nikolay Korolev
131e8af174
Merge pull request #508 from Nick007J/master
Scripts compatible saving + CCarCtrl bug + crusher coach bug
2020-05-04 19:52:26 +03:00
aap
702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Nikolay Korolev
926e216dd4 Merge remote-tracking branch 'upstream/master' 2020-05-03 01:43:12 +03:00
Nikolay Korolev
fa29804c49 script compatibility 2020-05-03 01:42:46 +03:00
Sergeanur
d2712afc78 Add CURMODE macro 2020-05-03 00:11:02 +03:00
Sergeanur
fc85bb710b Fix COMMAND_GET_CONTROLLER_MODE 2020-05-02 19:39:36 +03:00
Sergeanur
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Nikolay Korolev
34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev
bed41e1bec removed redundant checks 2020-04-24 01:40:12 +03:00
Nikolay Korolev
0b12cacf15 more 1.1 patch 2020-04-24 01:01:41 +03:00
Nikolay Korolev
05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
eray orçunus
c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Nikolay Korolev
7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Nikolay Korolev
7e4c683824 fixes 2020-04-20 01:04:57 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
eray orçunus
812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Nikolay Korolev
1fd7b0288c
fix Bait crash 2020-04-16 01:19:08 +03:00
Nikolay Korolev
3517f3f1a1
fix script crash 2020-04-16 00:31:57 +03:00
erorcun
647cfbfd45
Merge pull request #446 from erorcun/erorcun
Many fixes and cleanup
2020-04-15 19:22:28 +03:00