Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						85e899c1a5
					 | 
					
						
						
							
							fixed typo
						
						
						
						
						
						
					 | 
					
						2020-07-03 15:15:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						48ebbb7292
					 | 
					
						
						
							
							ice cream attractor + bike respray
						
						
						
						
						
						
					 | 
					
						2020-07-03 11:08:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						ed036df3ce
					 | 
					
						
						
							
							Re-enable console for debugging frontend
						
						
						
						
						
						
					 | 
					
						2020-07-03 05:40:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						d4004805f5
					 | 
					
						
						
							
							miami pobj
						
						
						
						
						
						
					 | 
					
						2020-07-03 02:18:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						01b15fe807
					 | 
					
						
						
							
							reenabled script logging
						
						
						
						
						
						
					 | 
					
						2020-07-03 01:28:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Filip Gawin
							
						 
					 | 
					
						
						
							
						
						bf2624692c
					 | 
					
						
						
							
							Fix displaying stats
						
						
						
						
						
						
					 | 
					
						2020-07-03 00:04:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						c4cd210ae0
					 | 
					
						
						
							
							Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes
						
						
						
						
						
						
					 | 
					
						2020-07-02 16:01:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						2141247e08
					 | 
					
						
						
							
							CBoat and friends
						
						
						
						
						
						
					 | 
					
						2020-07-01 18:04:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						575f35f2c4
					 | 
					
						
						
							
							fixes to CBoat
						
						
						
						
						
						
					 | 
					
						2020-07-01 18:03:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						389123cff3
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2020-07-01 16:06:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						ade5dff217
					 | 
					
						
						
							
							script logging for miami
						
						
						
						
						
						
					 | 
					
						2020-07-01 15:43:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						a1356f1001
					 | 
					
						
						
							
							copypaste bug
						
						
						
						
						
						
					 | 
					
						2020-07-01 15:38:32 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erorcun
							
						 
					 | 
					
						
						
							
						
						eda50bc32b
					 | 
					
						
						
							
							Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)
						
						
						
						
						
						
					 | 
					
						2020-07-01 15:28:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						779d4e02a4
					 | 
					
						
						
							
							little fix
						
						
						
						
						
						
					 | 
					
						2020-07-01 15:12:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						8045bec6a5
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h 
						
						
					 | 
					
						2020-06-30 19:12:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						da93b0a078
					 | 
					
						
						
							
							Audio fixes
						
						
						
						
						
						
					 | 
					
						2020-06-30 19:06:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						cbed027c0e
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
					 | 
					
						2020-06-30 08:24:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						a15f3ddb8b
					 | 
					
						
						
							
							Fix glfw build
						
						
						
						
						
						
					 | 
					
						2020-06-30 08:08:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						87fa69385c
					 | 
					
						
						
							
							remove TheText.Load() from CGame::Initialise
						
						
						
						
						
						
					 | 
					
						2020-06-30 07:48:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						1d2d5fe6ae
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/render/MBlur.cpp
#	src/render/MBlur.h 
						
						
					 | 
					
						2020-06-30 07:45:54 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						6f81e84bd4
					 | 
					
						
						
							
							Restore original code of CControllerState::CheckForInput
						
						
						
						
						
						
					 | 
					
						2020-06-30 07:44:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						c80bdf3a2a
					 | 
					
						
						
							
							Rename IsAnyButtonPressed to CheckForInput
						
						
						
						
						
						
					 | 
					
						2020-06-30 07:43:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						6d396ba73b
					 | 
					
						
						
							
							Fix MBlur
						
						
						
						
						
						
					 | 
					
						2020-06-30 07:43:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Filip Gawin
							
						 
					 | 
					
						
						
							
						
						6cf698badd
					 | 
					
						
						
							
							Fix glfw.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-29 16:24:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						b072cbca93
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2020-06-29 12:12:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						94ce376a76
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2020-06-29 12:12:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						b26eec5daf
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp 
						
						
					 | 
					
						2020-06-29 12:56:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire_Head
							
						 
					 | 
					
						
						
							
						
						7b22b7e2af
					 | 
					
						
						
							
							Update MemoryCard.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-29 11:38:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire_Head
							
						 
					 | 
					
						
						
							
						
						a01fe76db7
					 | 
					
						
						
							
							Merge pull request #640 from Fire-Head/ps2menu
						
						
						
						
						
						
						
						ps2 menu, memorycard, pad and god knows what else 
						
						
					 | 
					
						2020-06-29 11:23:02 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						3b3324de38
					 | 
					
						
						
							
							Update MBlur.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-29 11:14:00 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						d9cb9583bf
					 | 
					
						
						
							
							update glfw.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-29 11:04:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						2f12d0e231
					 | 
					
						
						
							
							Update MBlur.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-29 10:40:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						fcac1f9a34
					 | 
					
						
						
							
							fix linux build?
						
						
						
						
						
						
					 | 
					
						2020-06-29 10:36:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						63fdcf7e64
					 | 
					
						
						
							
							menu fixes
						
						
						
						
						
						
					 | 
					
						2020-06-29 10:29:02 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire_Head
							
						 
					 | 
					
						
						
							
						
						0cd2ac7e5e
					 | 
					
						
						
							
							Update AudioLogic.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-29 09:41:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire_Head
							
						 
					 | 
					
						
						
							
						
						860f75d66c
					 | 
					
						
						
							
							Merge branch 'master' into ps2menu
						
						
						
						
						
						
					 | 
					
						2020-06-29 09:37:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						209b7891d1
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2020-06-28 16:24:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						920bc0a1bf
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2020-06-28 16:24:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						3370ae04cb
					 | 
					
						
						
							
							renamed 2dfx shadowRange to Size
						
						
						
						
						
						
					 | 
					
						2020-06-28 12:08:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						418bee9c22
					 | 
					
						
						
							
							renamed 2dfx shadowRange to Size
						
						
						
						
						
						
					 | 
					
						2020-06-28 12:05:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						d6e111bb67
					 | 
					
						
						
							
							script logging fixes
						
						
						
						
						
						
					 | 
					
						2020-06-28 11:59:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						1f1782c587
					 | 
					
						
						
							
							restore Text.cpp
						
						
						
						
						
						
					 | 
					
						2020-06-28 08:32:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						b8f633de24
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2020-06-28 01:57:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						233792e2b8
					 | 
					
						
						
							
							fixfixfix
						
						
						
						
						
						
					 | 
					
						2020-06-28 00:31:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						1c11a8081f
					 | 
					
						
						
							
							mips overdose
						
						
						
						
						
						
					 | 
					
						2020-06-28 00:01:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						c72fab15b4
					 | 
					
						
						
							
							fix anims again
						
						
						
						
						
						
					 | 
					
						2020-06-25 16:20:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						592a6aef0b
					 | 
					
						
						
							
							Merge pull request #638 from erorcun/miami
						
						
						
						
						
						
						
						CWanted, anim fix, ped objs renaming, remove III beta features 
						
						
					 | 
					
						2020-06-25 15:15:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						2b21f92347
					 | 
					
						
						
							
							rename attractor flag to type
						
						
						
						
						
						
					 | 
					
						2020-06-25 15:13:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						cafe4d6f0c
					 | 
					
						
						
							
							rename attractor flag to type
						
						
						
						
						
						
					 | 
					
						2020-06-25 15:13:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						077bcf1c82
					 | 
					
						
						
							
							CPad fix
						
						
						
						
						
						
					 | 
					
						2020-06-24 19:11:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |