aap
							
						 
					 | 
					
						
						
							
						
						7428590457
					 | 
					
						
						
							
							some miami limits
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:31:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						e81652c2fc
					 | 
					
						
						
							
							cleaned up MIAMI ifdefs
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:06:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						6b4b708fa7
					 | 
					
						
						
							
							skipped one def
						
						
						
						
						
						
					 | 
					
						2020-05-05 19:06:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						22e8b0e419
					 | 
					
						
						
							
							Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"
						
						
						
						
						
						
						
						This reverts commit 1eb817de77.
# Conflicts:
#	src/core/Game.cpp 
						
						
					 | 
					
						2020-05-05 18:34:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						12fbf8cede
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/core/Game.cpp 
						
						
					 | 
					
						2020-05-05 18:33:32 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						1eb817de77
					 | 
					
						
						
							
							Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:32:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						edeb8736f1
					 | 
					
						
						
							
							remove ifdefs
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:20:10 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						0163a7bc46
					 | 
					
						
						
							
							Remove ColStore
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:13:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						cb8ffbac73
					 | 
					
						
						
							
							Revert "Remove #endif"
						
						
						
						
						
						
						
						This reverts commit 7200a783ee. 
						
						
					 | 
					
						2020-05-05 18:07:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						74b522af71
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:07:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						7200a783ee
					 | 
					
						
						
							
							Remove #endif
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:07:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						c2b9ddc5b8
					 | 
					
						
						
							
							Revert "Remove Miami stuff"
						
						
						
						
						
						
						
						This reverts commit 9960c41193. 
						
						
					 | 
					
						2020-05-05 18:04:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						9960c41193
					 | 
					
						
						
							
							Remove Miami stuff
						
						
						
						
						
						
					 | 
					
						2020-05-05 18:04:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						dfe0642195
					 | 
					
						
						
							
							Merge pull request #512 from Nick007J/master
						
						
						
						
						
						
						
						MIAMI CAutoPilot + CCarAI + multiple fixes 
						
						
					 | 
					
						2020-05-05 17:14:13 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						fcd386f55d
					 | 
					
						
						
							
							Merge pull request #510 from aap/master
						
						
						
						
						
						
						
						implemented most of streamed collisions and big buildings 
						
						
					 | 
					
						2020-05-05 17:14:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						fc81a8cbe2
					 | 
					
						
						
							
							fixed traffic lights
						
						
						
						
						
						
					 | 
					
						2020-05-05 16:10:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						b3b9be5e8c
					 | 
					
						
						
							
							merged master
						
						
						
						
						
						
					 | 
					
						2020-05-05 14:21:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						5580eb21a4
					 | 
					
						
						
							
							ModeInfoType -> ModelInfoType
						
						
						
						
						
						
					 | 
					
						2020-05-05 15:13:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						4cc1bb92e7
					 | 
					
						
						
							
							Make CBaseModelInfo fields protected
						
						
						
						
						
						
					 | 
					
						2020-05-05 15:06:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						fd462c9b55
					 | 
					
						
						
							
							implemented most of streamed collisions and big buildings
						
						
						
						
						
						
					 | 
					
						2020-05-05 14:00:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						e9b334d7bf
					 | 
					
						
						
							
							More use of GetModelIndex
						
						
						
						
						
						
					 | 
					
						2020-05-05 14:48:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						ee261c996b
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2020-05-05 14:40:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						ae0c83fa01
					 | 
					
						
						
							
							CAutoPilot + CCarAI + fixes
						
						
						
						
						
						
					 | 
					
						2020-05-05 14:40:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						b44df26d3e
					 | 
					
						
						
							
							implemented most of streamed collisions and big buildings
						
						
						
						
						
						
					 | 
					
						2020-05-05 13:02:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						84c9484e55
					 | 
					
						
						
							
							SetPosition, final part
						
						
						
						
						
						
					 | 
					
						2020-05-05 04:45:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						73c809f616
					 | 
					
						
						
							
							bb std::string
						
						
						
						
						
						
					 | 
					
						2020-05-04 22:02:54 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						6382b6d2fc
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2020-05-04 21:32:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						0abd0c659b
					 | 
					
						
						
							
							openal-soft added
						
						
						
						
						
						
					 | 
					
						2020-05-04 21:06:14 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						8aac6060d3
					 | 
					
						
						
							
							oal upd
						
						
						
						
						
						
					 | 
					
						2020-05-04 20:33:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						131e8af174
					 | 
					
						
						
							
							Merge pull request #508 from Nick007J/master
						
						
						
						
						
						
						
						Scripts compatible saving + CCarCtrl bug + crusher coach bug 
						
						
					 | 
					
						2020-05-04 19:52:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						3554ec58bb
					 | 
					
						
						
							
							Merge pull request #507 from aap/master
						
						
						
						
						
						
						
						implemented most of vice city path system, conditionals for train, bridge, cullzones 
						
						
					 | 
					
						2020-05-04 19:51:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						11c7050dfb
					 | 
					
						
						
							
							deny coach in crusher
						
						
						
						
						
						
					 | 
					
						2020-05-04 15:02:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						20ffccbe2a
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2020-05-04 14:58:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						d1a46c35ce
					 | 
					
						
						
							
							fixed spawn bug
						
						
						
						
						
						
					 | 
					
						2020-05-04 14:57:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						f027c3afed
					 | 
					
						
						
							
							fixed fog color for librw
						
						
						
						
						
						
					 | 
					
						2020-05-04 13:41:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						a073dda5ec
					 | 
					
						
						
							
							GTA_ZONECULL define
						
						
						
						
						
						
					 | 
					
						2020-05-03 17:44:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						67467f15d1
					 | 
					
						
						
							
							GTA_BRIDGE and GTA_TRAIN defines
						
						
						
						
						
						
					 | 
					
						2020-05-03 17:28:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						702da55ec9
					 | 
					
						
						
							
							implemented most of vice city path system
						
						
						
						
						
						
					 | 
					
						2020-05-03 16:09:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						926e216dd4
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2020-05-03 01:43:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						fa29804c49
					 | 
					
						
						
							
							script compatibility
						
						
						
						
						
						
					 | 
					
						2020-05-03 01:42:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						ff4af35292
					 | 
					
						
						
							
							Fix pad Y axis
						
						
						
						
						
						
					 | 
					
						2020-05-03 01:42:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						dcd1ba6578
					 | 
					
						
						
							
							Fix CMessages::InsertStringInString
						
						
						
						
						
						
					 | 
					
						2020-05-03 01:40:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						6a40c03442
					 | 
					
						
						
							
							Put camera modes compatibility under COMPATIBLE_SAVES
						
						
						
						
						
						
					 | 
					
						2020-05-03 00:15:28 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						7fc33d85f7
					 | 
					
						
						
							
							Merge pull request #504 from Sergeanur/PadInputSwitch
						
						
						
						
						
						
						
						Switching pad modes and cheats when player is switching between controller and kb&m 
						
						
					 | 
					
						2020-05-03 00:12:54 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						d2712afc78
					 | 
					
						
						
							
							Add CURMODE macro
						
						
						
						
						
						
					 | 
					
						2020-05-03 00:11:02 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						9d600802fa
					 | 
					
						
						
							
							Revert "Disable PED_SKIN for now"
						
						
						
						
						
						
						
						This reverts commit d51bf48dcd. 
						
						
					 | 
					
						2020-05-02 23:52:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						4448156e29
					 | 
					
						
						
							
							Merge pull request #494 from Nick007J/master
						
						
						
						
						
						
						
						pools compatibility 
						
						
					 | 
					
						2020-05-02 23:48:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						89961325b2
					 | 
					
						
						
							
							Ceil health and armor values in hud (fix 99 health)
						
						
						
						
						
						
					 | 
					
						2020-05-02 23:38:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						c62d35fed0
					 | 
					
						
						
							
							Adding sound intensity consts
						
						
						
						
						
						
					 | 
					
						2020-05-02 23:31:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						b095bc1b5a
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
					 | 
					
						2020-05-02 21:31:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |