22 Commits

Author	SHA1	Message	Date
Sergeanur	29383a6a11	Merge branch 'miami' into lcs ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/sampman_miles.cpp	2021-09-01 17:09:12 +03:00
Fire-Head	4b747e567a	replace ugly else if with switch	2021-08-30 23:34:06 +03:00
Nikolay Korolev	9187873396	Onscreen timer	2021-08-26 00:34:31 +03:00
Sergeanur	e1286fcb04	Fix clock	2021-08-25 09:18:24 +03:00
aap	aed313d81c	CAutomobile done	2021-08-20 10:33:02 +02:00
Sergeanur	2c79080e1b	Merge branch 'miami' into lcs ... # Conflicts: # src/core/Radar.cpp # src/core/Radar.h	2021-08-11 09:36:58 +03:00
Sergeanur	463fdab6a4	Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2	2021-08-11 08:42:26 +03:00
Sergeanur	d7a28c4d2b	Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls	2021-08-11 08:35:01 +03:00
Nikolay Korolev	74f00c3c63	merge	2021-08-08 15:46:47 +03:00
Nikolay Korolev	88b4c7b50b	merge	2021-08-08 15:34:02 +03:00
aap	3f3e258d77	CVisibilityPlugins, CRenderer, some fixes	2021-07-29 19:59:34 +02:00
aap	3c5bae164f	CVisibilityPlugins and CRenderer fixes	2021-07-29 19:43:47 +02:00
aap	30061396e8	CVisibilityPlugins and CRenderer fixes; pulled MLO back in	2021-07-29 19:43:06 +02:00
Nikolay Korolev	c7d3b88cb7	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-07-25 21:44:31 +03:00
Nikolay Korolev	bf4b39781b	low effort save support	2021-07-25 21:44:21 +03:00
Sergeanur	d83b8cf940	Merge branch 'miami' into lcs ... # Conflicts: # src/renderer/Hud.cpp	2021-07-25 21:01:00 +03:00
Sergeanur	5032d24ad8	Fix	2021-07-25 19:59:02 +03:00
Sergeanur	601f63f4fb	Sync fix from master	2021-07-25 19:50:00 +03:00
Nikolay Korolev	dc729009ac	Merge remote-tracking branch 'upstream/lcs' into lcs	2021-07-24 01:02:23 +03:00
Sergeanur	7a034142c9	Merge branch 'miami' into lcs ... # Conflicts: # premake5.lua	2021-07-18 00:05:51 +03:00
Sergeanur	d0404cbdb7	render -> renderer (original name)	2021-07-18 00:04:26 +03:00
Sergeanur	c937bdbfea	render -> renderer (original name)	2021-07-18 00:03:57 +03:00