erorcun
							
						 
					 | 
					
						
						
							
						
						df89e5091e
					 | 
					
						
						
							
							Revert "map memory usage high default"
						
						
						
						
						
						
						
						This reverts commit b7c7c883d7. 
						
						
					 | 
					
						2021-08-13 00:16:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								withmorten
							
						 
					 | 
					
						
						
							
						
						81c6c5e47a
					 | 
					
						
						
							
							map memory usage high default
						
						
						
						
						
						
					 | 
					
						2021-08-12 23:08:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								withmorten
							
						 
					 | 
					
						
						
							
						
						b7c7c883d7
					 | 
					
						
						
							
							map memory usage high default
						
						
						
						
						
						
					 | 
					
						2021-08-12 23:07:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						0a2df3ca4c
					 | 
					
						
						
							
							Fix sampman_null
						
						
						
						
						
						
					 | 
					
						2021-08-12 15:03:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						8759c2edf0
					 | 
					
						
						
							
							Sync fixes from miami
						
						
						
						
						
						
					 | 
					
						2021-08-12 15:01:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						92c5cf1877
					 | 
					
						
						
							
							Sync audio changes from master
						
						
						
						
						
						
					 | 
					
						2021-08-12 14:57:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						43fbf297c8
					 | 
					
						
						
							
							Waypoint text fix
						
						
						
						
						
						
					 | 
					
						2021-08-12 14:15:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						033d89a9ab
					 | 
					
						
						
							
							Refactor cAudioManager::ProcessActiveQueues, fix doppler effect
						
						
						
						
						
						
					 | 
					
						2021-08-12 13:01:07 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						f1545daeae
					 | 
					
						
						
							
							Rename unused audio member
						
						
						
						
						
						
					 | 
					
						2021-08-12 11:46:10 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						4f8993e19b
					 | 
					
						
						
							
							Replace static_assert with #error
						
						
						
						
						
						
					 | 
					
						2021-08-12 11:39:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						2ef43e8d1a
					 | 
					
						
						
							
							Fix sampman_null
						
						
						
						
						
						
					 | 
					
						2021-08-12 11:39:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						ce78081a7f
					 | 
					
						
						
							
							Put more things under ifdef
						
						
						
						
						
						
					 | 
					
						2021-08-12 11:39:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						6c2d179aad
					 | 
					
						
						
							
							Add define to enable/disable external 3d audio simulation
						
						
						
						
						
						
					 | 
					
						2021-08-12 11:39:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						b99edf9a6b
					 | 
					
						
						
							
							mission retry fix
						
						
						
						
						
						
					 | 
					
						2021-08-12 11:23:10 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						2eb0390dc9
					 | 
					
						
						
							
							Fix unset emitting volume for sawmill
						
						
						
						
						
						
					 | 
					
						2021-08-11 13:35:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						f131f70761
					 | 
					
						
						
							
							Fix unset emitting volume for moan sound
						
						
						
						
						
						
					 | 
					
						2021-08-11 12:10:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						75f812cfcd
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/RoadBlocks.cpp
#	src/core/Radar.cpp
#	src/core/Radar.h
#	src/peds/Ped.cpp
#	src/peds/Population.cpp
#	src/renderer/Renderer.cpp
#	src/vehicles/CarGen.cpp 
						
						
					 | 
					
						2021-08-11 09:32:59 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Barracuda6
							
						 
					 | 
					
						
						
							
						
						42ad9c4378
					 | 
					
						
						
							
							Comment out text following #endif
						
						
						
						
						
						
					 | 
					
						2021-08-08 18:09:56 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						e947081622
					 | 
					
						
						
							
							Merge pull request #1266 from Nick007J/miami
						
						
						
						
						
						
						
						Mission replay 
						
						
					 | 
					
						2021-08-07 18:47:28 +03: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						4a047f56bc
					 | 
					
						
						
							
							CPhysical fixes and cleanup
						
						
						
						
						
						
					 | 
					
						2021-08-02 20:02:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |