571 commits

Author	SHA1	Message	Date
Nikolay Korolev	a827f0dd55	sync with upstream	2020-05-10 12:26:32 +03:00
Nikolay Korolev	2f7d2fa3ad	more car control	2020-05-10 12:25:30 +03:00
Sergeanur	35c41208f5	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h	2020-05-10 01:26:12 +03:00
Sergeanur	d9a3533438	Small unification	2020-05-10 01:14:00 +03:00
Nikolay Korolev	9fce6c4ed3	car control fixes	2020-05-09 22:24:31 +03:00
Nikolay Korolev	3de003a8e7	new curves + boat fix	2020-05-09 22:11:40 +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	e30b538cd3	fix	2020-05-09 00:07:35 +03:00
Nikolay Korolev	46d891b745	fix	2020-05-09 00:00:06 +03:00
Nikolay Korolev	7e753c2596	CCarCtrl::GenerateOneRandomCar	2020-05-08 23:29:43 +03:00
Nikolay Korolev	f902136b6a	fix	2020-05-08 18:50:16 +03:00
Nikolay Korolev	75943a57b2	gang	2020-05-08 18:48:44 +03:00
Nikolay Korolev	6065f5e52b	fix	2020-05-08 17:05:54 +03:00
Nikolay Korolev	c11a20cb4f	zone info commands + fix	2020-05-08 16:16:46 +03:00
Nikolay Korolev	fb1f51241d	fix	2020-05-08 13:41:28 +03:00
Nikolay Korolev	db26700352	final fix	2020-05-08 11:49:40 +03:00
Nikolay Korolev	49cf53644a	reasonable spawns	2020-05-08 11:43:27 +03:00
Nikolay Korolev	44c5cdf453	tmp stuff	2020-05-08 11:11:09 +03:00
Nikolay Korolev	b99346e6ca	sync with upstream	2020-05-07 23:22:15 +03:00
Nikolay Korolev	2dc818e4d2	intermediate changes	2020-05-07 23:21:36 +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
Nikolay Korolev	5780b4503e	sync with upstream	2020-05-07 16:59:40 +03:00
Nikolay Korolev	40888e9486	car control and friends	2020-05-07 16:57:49 +03:00
aap	5c30b3a188	got rid of superfluous enum; update librw	2020-05-07 12:48:57 +02:00
Sergeanur	bef436400d	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/modelinfo/ModelIndices.h	2020-05-07 13:42:50 +03:00
aap	05a1d64fbb	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
aap	876e402d1e	dont hardcode first vehicle ID; little fix for roadblocks	2020-05-07 09:38:07 +02:00
aap	a8d8c0690d	changed default ID ranges. old default.ide incompatible now	2020-05-06 23:39:38 +02:00
Nikolay Korolev	a7c17a329a	fixed lane offset	2020-05-07 00:27:10 +03:00
aap	a1c229784f	Merge pull request #518 from Nick007J/miami ... script stubs + REQUEST_COLLISION	2020-05-06 21:55:10 +02:00
aap	965ea93a61	checked some of streaming for VC changes	2020-05-06 21:54:43 +02:00
Nikolay Korolev	599b7301c8	script stubs + REQUEST_COLLISION	2020-05-06 21:15:58 +03:00
Nikolay Korolev	d5e76471ae	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 19:04:52 +03:00
aap	f1c1f56b12	CSphere and CBox for CColModel	2020-05-06 17:56:38 +02: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
Nikolay Korolev	f45ea0a1cf	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-05 20:22:17 +03:00
Nikolay Korolev	918d6dbf56	some more miami	2020-05-05 20:22:13 +03:00
aap	e81652c2fc	cleaned up MIAMI ifdefs	2020-05-05 18:06:38 +02:00
Nikolay Korolev	6b4b708fa7	skipped one def	2020-05-05 19:06:24 +03:00