1155 commits

Author	SHA1	Message	Date
Nikolay Korolev	d7bd0be53e	garage stuff	2021-01-26 02:23:55 +03:00
Nikolay Korolev	8cdc6b5d7c	fix merge failure	2021-01-23 23:53:59 +03:00
Nikolay Korolev	c4f0b4fb6d	mission cleanup fix	2021-01-23 23:20:22 +03:00
Nikolay Korolev	d28e9a7b62	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-01-23 23:04:38 +03:00
Nikolay Korolev	37d1aa4129	script fixes	2021-01-23 23:04:24 +03:00
Sergeanur	defbb01aaa	Merge remote-tracking branch 'origin/lcs' into lcs ... * origin/lcs: Remove size assert Add TXD mid field Enable GTA_BRIDGE LCS model indices	2021-01-23 15:14:24 +02:00
Sergeanur	904090cbb6	Merge remote-tracking branch 'origin/miami' into lcs ... # Conflicts: # src/modelinfo/BaseModelInfo.cpp	2021-01-23 15:14:15 +02:00
Sergeanur	4bde3366c1	Merge pull request #980 from Sergeanur/lcsMID ... LCS model indices	2021-01-23 15:09:54 +02:00
Nikolay Korolev	3326603265	added some missing functions	2021-01-23 15:33:01 +03:00
Nikolay Korolev	b5c4866964	added some missing functions	2021-01-23 15:32:07 +03:00
aap	a22b6168c6	wrong path node array	2021-01-23 12:50:46 +01:00
aap	2814f2e8cf	wrong path node array	2021-01-23 12:49:54 +01:00
aap	20bcd4bd69	colstore done	2021-01-23 12:40:23 +01:00
Nikolay Korolev	552497d71b	fix	2021-01-23 14:11:57 +03:00
Nikolay Korolev	8d0100f100	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-01-23 12:54:27 +03:00
Nikolay Korolev	a105003a7a	I hate GetATanOfXY	2021-01-23 12:54:08 +03:00
Sergeanur	e03aaec030	Add (Don't) walk lights	2021-01-23 04:07:50 +02:00
Sergeanur	b35b0c598d	Enable GTA_BRIDGE	2021-01-23 03:09:15 +02:00
Sergeanur	6b54d04bfc	LCS model indices	2021-01-23 02:56:48 +02:00
erorcun	f85b5e99ed	Includes overhaul, fix some compiler warnings	2021-01-23 03:23:16 +03:00
Nikolay Korolev	965a3d6eec	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-01-23 02:36:34 +03:00
Nikolay Korolev	917cf44def	script coronas	2021-01-23 02:36:13 +03:00
Sergeanur	c884edd923	cSmallHeap	2021-01-23 00:03:12 +02:00
Nikolay Korolev	bdb216bf7c	fix	2021-01-22 20:59:57 +03:00
Sergeanur	cea6b20c09	Merge remote-tracking branch 'origin/miami' into lcs ... # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp	2021-01-22 15:04:09 +02:00
withmorten	feb993e751	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
withmorten	d1317f8fa6	m_nWantedLevel -> GetWantedLevel()	2021-01-22 00:20:51 +01:00
Nikolay Korolev	46ae5700ee	a few fixes	2021-01-21 23:51:15 +03:00
Nikolay Korolev	a5be17d941	Merge branch 'lcs-dev' into lcs	2021-01-20 21:15:03 +03:00
Nikolay Korolev	23831e38e6	sync	2021-01-20 21:14:12 +03:00
Nikolay Korolev	ad745aae63	some more script	2021-01-20 21:12:42 +03:00
Sergeanur	cc94419a72	Merge branch 'miami' into lcs ... # Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp	2021-01-20 19:32:03 +02:00
Sergeanur	c7c7eff918	Get rid of bitfields in CPool ... # Conflicts: # src/core/templates.h	2021-01-20 19:24:08 +02:00
Sergeanur	3b52b683e3	Sync matrix with master	2021-01-20 19:20:11 +02:00
Nikolay Korolev	aa0f77043c	script fixes	2021-01-20 12:12:26 +03:00
Nikolay Korolev	dac4dd560a	saves	2021-01-19 23:34:37 +03:00
Nikolay Korolev	061fd25c61	fixes	2021-01-19 02:38:02 +03:00
Nikolay Korolev	03cf1e7535	Merge remote-tracking branch 'upstream/miami' into miami	2021-01-19 00:00:12 +03:00
Nikolay Korolev	8b80a8803b	fix	2021-01-18 23:59:54 +03:00
Nikolay Korolev	47c697feca	fixes	2021-01-18 23:58:26 +03:00
Nikolay Korolev	14a1d3d251	Merge branch 'lcs' into lcs-dev	2021-01-18 22:20:27 +03:00
Nikolay Korolev	c09297997e	script full	2021-01-18 22:19:30 +03:00
aap	2b4b00b388	Merge pull request #960 from withmorten/miami ... add the bad crack "features" behind SECUROM define	2021-01-17 20:06:25 +01:00
Nikolay Korolev	5e1113d884	fix attempt	2021-01-17 18:46:49 +03:00
Nikolay Korolev	9001a64ef9	Merge branch 'lcs' into lcs-dev	2021-01-17 16:02:56 +03:00
Nikolay Korolev	186441e7f5	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-01-17 16:02:38 +03:00
Nikolay Korolev	e5af1edcb9	script until 1497	2021-01-17 16:02:19 +03:00
Fire_Head	6075bf3fc2	Merge pull request #959 from Fire-Head/lcs ... Lcs Particle	2021-01-16 22:00:02 +03:00
Nikolay Korolev	e99cd8052c	sync	2021-01-16 20:06:55 +03:00
Nikolay Korolev	d25420a33b	fix	2021-01-16 20:06:10 +03:00