5619 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sergeanur	0544beb00d	Add sprite to the waypoint marker	2021-08-11 08:15:30 +03:00
Sergeanur	1f98f01dcb	Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls	2021-08-09 18:14:19 +03:00
Sergeanur	8ea411e4c5	Add sprite to the waypoint marker	2021-08-09 18:07:42 +03:00
withmorten	ab5965cc8d	fix steam saves	2021-08-09 16:36:15 +02:00
withmorten	858f913fac	small fix	2021-08-09 16:34:05 +02:00
Nikolay Korolev	e042ba6f24	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-08-09 00:57:35 +03:00
Nikolay Korolev	4b7dc08bf5	debug func fix	2021-08-09 00:57:18 +03:00
Nikolay Korolev	c851d9a6ba	Merge branch 'miami' into lcs	2021-08-09 00:08:42 +03:00
Nikolay Korolev	3869369703	Merge remote-tracking branch 'upstream/miami' into miami	2021-08-09 00:07:50 +03:00
Nikolay Korolev	2ee32abf84	fix bug in CCurves	2021-08-09 00:07:02 +03:00
Nikolay Korolev	c5af250959	debug func	2021-08-08 23:48:07 +03:00
Barracuda6	42ad9c4378	Comment out text following #endif	2021-08-08 18:09:56 +03:00
Sergeanur	26a9ac91ee	Merge branch 'miami' into lcs	2021-08-08 18:02:45 +03:00
Sergeanur	76a22c0d13	Fix	2021-08-08 18:02:23 +03:00
Sergeanur	f887d515fa	Sync fix from miami	2021-08-08 17:53:01 +03:00
Nikolay Korolev	729ef37040	merge	2021-08-08 17:44:38 +03:00
Nikolay Korolev	e17504a36a	Merge branch 'master' into miami	2021-08-08 17:43:07 +03:00
Nikolay Korolev	4673f509f6	Revert "small fix" ... This reverts commit bd96584433.	2021-08-08 17:42:32 +03:00
Nikolay Korolev	35dd465c19	Revert "small fix" ... This reverts commit bd96584433.	2021-08-08 17:41:35 +03:00
Nikolay Korolev	7b9d8c5a1f	merge	2021-08-08 17:36:08 +03:00
Nikolay Korolev	8d9508bda4	Merge branch 'master' into miami	2021-08-08 17:34:28 +03:00
Nikolay Korolev	bd96584433	small fix	2021-08-08 17:34:03 +03:00
Nikolay Korolev	68db861c45	merge	2021-08-08 17:29:57 +03:00
Nikolay Korolev	873840a6a5	merge	2021-08-08 17:19:49 +03:00
Nikolay Korolev	947f67dfb7	small fix	2021-08-08 17:17:20 +03:00
Nikolay Korolev	478bdcc1ca	merge	2021-08-08 17:14:21 +03:00
Nikolay Korolev	63046894b0	small refactoring	2021-08-08 16:57:37 +03:00
Nikolay Korolev	74f00c3c63	merge	2021-08-08 15:46:47 +03:00
Nikolay Korolev	668311a444	Merge branch 'master' into miami	2021-08-08 15:44:18 +03:00
Nikolay Korolev	15f770531c	fixed tab	2021-08-08 15:42:44 +03:00
Nikolay Korolev	88b4c7b50b	merge	2021-08-08 15:34:02 +03:00
Nikolay Korolev	9cc1201892	merge	2021-08-08 13:38:21 +03:00
Nikolay Korolev	e6b1a0691b	lcs bridge	2021-08-08 13:08:47 +03:00
Nikolay Korolev	0c4ab5b609	disable mission replay for lcs	2021-08-08 10:51:04 +03:00
Nikolay Korolev	2672504e8a	more cherry-pick fix	2021-08-07 20:40:27 +03:00
Nikolay Korolev	a7e86e0510	cherrypick fixes	2021-08-07 20:40:18 +03:00
Nikolay Korolev	827f0ffbb6	move debug	2021-08-07 20:35:01 +03:00
Nikolay Korolev	883e8390c9	move debug script stuff to a separate file	2021-08-07 20:26:33 +03:00
Nikolay Korolev	c69edce800	mission replay	2021-08-07 20:24:01 +03:00
Nikolay Korolev	747705d430	lcs specific hack	2021-08-07 20:03:45 +03:00
Nikolay	e947081622	Merge pull request #1266 from Nick007J/miami ... Mission replay	2021-08-07 18:47:28 +03:00
aap	621f941ff7	CVehicle done	2021-08-04 13:56:29 +02:00
aap	1cfd4f741e	Merge pull request #1276 from aap/lcs ... CPhysical almost done	2021-08-04 13:56:22 +02:00
aap	bec1cbc1cb	CVehicle fixes and cleanup	2021-08-04 13:54:26 +02:00
aap	4f461bd7be	CVehicle fixes and cleanup	2021-08-04 13:54:04 +02:00
Nikolay Korolev	80d00fe31a	more cherry-pick fix	2021-08-03 22:20:14 +03:00
Nikolay Korolev	6fbb7da82d	cherrypick fixes	2021-08-03 22:14:58 +03:00
Nikolay Korolev	5a22896197	move debug	2021-08-03 21:53:45 +03:00
Nikolay Korolev	8bcbee4ea7	move debug script stuff to a separate file	2021-08-03 21:53:42 +03:00
Nikolay Korolev	5999ddc76d	Merge remote-tracking branch 'upstream/miami' into miami	2021-08-03 21:44:18 +03:00