Commit Graph

52 Commits

Author SHA1 Message Date
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Sergeanur
cfda5eb148 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:58:09 +02:00
Sergeanur
f3e9c82432 Pool fixes from master 2020-12-08 07:52:03 +02:00
Nikolay Korolev
35874b5fd2 fix 2020-11-11 12:27:40 +03:00
Nikolay Korolev
ef2089cafb CWorld done 2020-11-11 00:08:32 +03:00
Fire-Head
a38702a7d2 weapons 2020-08-27 19:52:43 +03:00
aap
0741fd5b1d some more camera stuff 2020-06-14 23:15:56 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
Nikolay Korolev
08b2138c7e ped attractors done 2020-05-16 01:49:30 +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
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
aap
f1c1f56b12 CSphere and CBox for CColModel 2020-05-06 17:56:38 +02:00
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
Sergeanur
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
saml1er
6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05:00
saml1er
e52a02fb9e Merge branch 'master' into world
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
2020-04-17 00:01:53 +05:00
saml1er
52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Nikolay Korolev
5cb7e2e42a
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
eray orçunus
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
Fire-Head
daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
aap
8e3ee096e2
Merge pull request #366 from Nick007J/master
Garage part 1
2020-03-29 19:12:53 +02:00
erorcun
6704a62b32
Merge pull request #369 from erorcun/erorcun
CShotInfo, CWanted done, Frontend fix
2020-03-29 19:03:59 +03:00
eray orçunus
a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
Nikolay Korolev
24b8c7819c merge with upstream 2020-03-29 18:51:18 +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
9fb101fdd9 Merge branch 'master' into garages_dev 2020-03-28 15:24:55 +03:00
Nikolay Korolev
268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
aap
f0dfaac838 Finished CCam; various smaller things 2020-03-27 10:04:45 +01:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03: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
dc2516896f script 900-999 init 2020-02-02 14:47:03 +03:00
Nikolay Korolev
0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +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
eray orçunus
14c7c1d7ca World and Peds 2019-09-12 03:46:15 +03:00
eray orçunus
5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
aap
a3e3527a3b implemented CHeli 2019-08-04 00:31:00 +02:00
Nikolay Korolev
345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
aap
9477aca836
Merge branch 'master' into erorcun 2019-07-16 18:31:18 +02:00
eray orçunus
2c138b2b77 Phone, World, Ped 2019-07-15 15:11:40 +03:00
Nikolay Korolev
41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00