33 commits

Author	SHA1	Message	Date
withmorten	feb993e751	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
aap	e906a807f1	moved new renderer	2021-01-09 18:22:09 +01:00
Nikolay Korolev	9fd93e8e57	merge master to miami	2021-01-01 14:53:20 +03:00
Fire-Head	140fa2a21c	restore original code, fixes, ps2 font	2020-12-19 21:25:45 +03:00
aap	a7050458ae	little cleanup and synch on templates and config	2020-12-18 13:50:26 +01:00
Nikolay Korolev	fda58fb1df	added GTA_SCENE_EDIT	2020-12-02 02:34:51 +03:00
Nikolay Korolev	c4d4821327	Control updates	2020-10-11 12:56:33 +03:00
eray orçunus	15548758ac	Bettah car enter canceling, fix CFO crash, ped objs. renaming	2020-07-03 16:51:33 +03:00
eray orçunus	f3ed6659c3	CWanted, anim fix, ped objs renaming, remove III beta features	2020-06-22 04:20:56 +03:00
Fire-Head	9c0adf6a8f	Revert "FONT_BANK renamed to FONT_STANDARD" ... This reverts commit 552205dfba.	2020-06-07 05:03:06 +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
Sergeanur	552205dfba	FONT_BANK renamed to FONT_STANDARD	2020-06-07 04:10:06 +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
Filip Gawin	c2ac6b3759	Fix linux warnings	2020-05-12 23:18:54 +02: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	bd302ecca1	Merge remote-tracking branch 'upstream/master'	2020-05-10 22:05:45 +06:00
bigbossbro08	c798e1bacd	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
aap	5b605c1271	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
aap	97d5698e0c	peds starting to work	2020-05-09 17:05:26 +02:00
Sergeanur	4cc1bb92e7	Make CBaseModelInfo fields protected	2020-05-05 15:06:55 +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
Filip Gawin	370c4e48cd	Try to build with mingw	2020-04-20 18:18:46 +02:00
Sergeanur	599164006a	Remove patches	2020-04-17 16:31:11 +03:00
Nikolay Korolev	f35d2721f5	fix	2020-04-14 20:16:02 +03:00
Nikolay Korolev	21a11fd343	scene edit	2020-04-14 20:09:42 +03:00
Nikolay Korolev	cb85091d34	scene edit	2020-04-13 21:50:56 +03:00
Nikolay Korolev	04c9affe2e	scene init	2020-04-12 12:06:33 +03:00
aap	7ff5a3a65c	CCamera fixes	2020-04-03 09:26:10 +02:00
aap	22e022cc9f	implemented some unused PS2 cams	2020-03-27 18:21:46 +01: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
nmzik	f56684d04e	CGame::Process() && CGame::ReloadIPLs	2019-10-19 01:23:40 +03:00