aap
							
						 
					 | 
					
						
						
							
						
						ef4f8ec713
					 | 
					
						
						
							
							more CBike functions
						
						
						
						
						
						
					 | 
					
						2020-06-06 14:42:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						c0481e7207
					 | 
					
						
						
							
							CBike::KnockOffRider
						
						
						
						
						
						
					 | 
					
						2020-06-06 13:22:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						afa4fa6510
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/soundlist.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/peds/Ped.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Vehicle.h 
						
						
					 | 
					
						2020-06-06 08:42:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						d3736ccb17
					 | 
					
						
						
							
							Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-06-05 23:20:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						f045ce4386
					 | 
					
						
						
							
							Bike riding anims, SA bike/heli cam
						
						
						
						
						
						
					 | 
					
						2020-06-05 23:13:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						1bfb01d5f5
					 | 
					
						
						
							
							a bit more CBike
						
						
						
						
						
						
					 | 
					
						2020-06-05 15:09:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						147dca44fa
					 | 
					
						
						
							
							ProcessTrainAnnouncements
						
						
						
						
						
						
					 | 
					
						2020-06-05 11:27:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						d325a3d247
					 | 
					
						
						
							
							basic bike support in traffic, script and car gen; some heli AI
						
						
						
						
						
						
					 | 
					
						2020-06-05 11:22:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						647fd951ec
					 | 
					
						
						
							
							more CBike
						
						
						
						
						
						
					 | 
					
						2020-06-05 00:24:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						95e96c86a1
					 | 
					
						
						
							
							minor stuff
						
						
						
						
						
						
					 | 
					
						2020-06-04 17:39:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						3e36428568
					 | 
					
						
						
							
							more CBike and fixes
						
						
						
						
						
						
					 | 
					
						2020-06-04 17:38:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						016ebc0b00
					 | 
					
						
						
							
							fixes, mostly from miami
						
						
						
						
						
						
					 | 
					
						2020-06-04 06:03:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						a6e4619378
					 | 
					
						
						
							
							Revert "fix accident~"
						
						
						
						
						
						
						
						This reverts commit 04de93796b. 
						
						
					 | 
					
						2020-06-04 04:42:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						07d336ddf0
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/peds/Ped.cpp
#	src/peds/Ped.h 
						
						
					 | 
					
						2020-06-04 04:32:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						5dc410a999
					 | 
					
						
						
							
							Peds, eSound and PedState enum, fixes
						
						
						
						
						
						
					 | 
					
						2020-06-03 17:01:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						c498af29aa
					 | 
					
						
						
							
							get rid of III code
						
						
						
						
						
						
					 | 
					
						2020-06-03 09:24:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						04de93796b
					 | 
					
						
						
							
							fix accident~
						
						
						
						
						
						
					 | 
					
						2020-06-03 09:24:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						ad03d9543b
					 | 
					
						
						
							
							Merge branch 'miami' of github.com:GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-06-03 08:26:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						b73e42346e
					 | 
					
						
						
							
							forgot the fucking file
						
						
						
						
						
						
					 | 
					
						2020-06-03 08:26:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						509ca11d76
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h 
						
						
					 | 
					
						2020-06-03 01:24:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						2ca3c50463
					 | 
					
						
						
							
							some CBike code; vehicle cleanup
						
						
						
						
						
						
					 | 
					
						2020-06-02 23:35:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						04a91761df
					 | 
					
						
						
							
							some vehicle cleanup
						
						
						
						
						
						
					 | 
					
						2020-06-02 23:34:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						06c761e9ac
					 | 
					
						
						
							
							few bike things
						
						
						
						
						
						
					 | 
					
						2020-06-02 15:26:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						575c5466df
					 | 
					
						
						
							
							renamed a vehicle thing
						
						
						
						
						
						
					 | 
					
						2020-06-02 14:38:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						dbeaafbe99
					 | 
					
						
						
							
							initial CBike struct
						
						
						
						
						
						
					 | 
					
						2020-06-02 14:38:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						fdf8f35049
					 | 
					
						
						
							
							CTimer fix
						
						
						
						
						
						
					 | 
					
						2020-06-01 20:51:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						de1018d7a6
					 | 
					
						
						
							
							gravity
						
						
						
						
						
						
					 | 
					
						2020-06-01 10:56:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						bae3a3e72f
					 | 
					
						
						
							
							fixed to CAutomobile and friends
						
						
						
						
						
						
					 | 
					
						2020-05-31 17:45:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						21ce0a4b28
					 | 
					
						
						
							
							CAutomobile done
						
						
						
						
						
						
					 | 
					
						2020-05-31 17:05:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						00dc86917e
					 | 
					
						
						
							
							some more CAutomobile
						
						
						
						
						
						
					 | 
					
						2020-05-31 17:05:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						c1e13177a1
					 | 
					
						
						
							
							some CAutomobile
						
						
						
						
						
						
					 | 
					
						2020-05-31 17:05:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						0bc6eef55d
					 | 
					
						
						
							
							bla
						
						
						
						
						
						
					 | 
					
						2020-05-27 22:34:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						2a1b9281e4
					 | 
					
						
						
							
							automobile fixes
						
						
						
						
						
						
					 | 
					
						2020-05-27 22:32:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire_Head
							
						 
					 | 
					
						
						
							
						
						e4649b41e1
					 | 
					
						
						
							
							Merge pull request #2 from GTAmodding/miami
						
						
						
						
						
						
						
						Miami 
						
						
					 | 
					
						2020-05-27 21:51:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						63d0bdc863
					 | 
					
						
						
							
							VC Water
						
						
						
						
						
						
					 | 
					
						2020-05-27 21:50:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						d71cbae9df
					 | 
					
						
						
							
							CVehicle loose ends
						
						
						
						
						
						
					 | 
					
						2020-05-27 07:43:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fire-Head
							
						 
					 | 
					
						
						
							
						
						6a32981ba5
					 | 
					
						
						
							
							VC CParticle done
						
						
						
						
						
						
					 | 
					
						2020-05-27 02:16:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						4f1ce8bd42
					 | 
					
						
						
							
							added some unused enums
						
						
						
						
						
						
					 | 
					
						2020-05-26 20:44:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						0ce2af7a0d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h 
						
						
					 | 
					
						2020-05-26 17:24:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						f40677c7a4
					 | 
					
						
						
							
							fixed crash
						
						
						
						
						
						
					 | 
					
						2020-05-26 16:17:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						314e56b7b9
					 | 
					
						
						
							
							fix2
						
						
						
						
						
						
					 | 
					
						2020-05-26 12:11:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						7e5dde1f1a
					 | 
					
						
						
							
							eSurfaceType
						
						
						
						
						
						
					 | 
					
						2020-05-26 11:37:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						d8528ebbbe
					 | 
					
						
						
							
							eSurfaceType
						
						
						
						
						
						
					 | 
					
						2020-05-26 11:34:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						15a99da50e
					 | 
					
						
						
							
							cranes fix
						
						
						
						
						
						
					 | 
					
						2020-05-25 23:34:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						3c3b1aadc0
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2020-05-25 20:36:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						7bf8337854
					 | 
					
						
						
							
							CVehicle
						
						
						
						
						
						
					 | 
					
						2020-05-25 18:33:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						3fdd352ca2
					 | 
					
						
						
							
							CVehicle fixes
						
						
						
						
						
						
					 | 
					
						2020-05-24 15:14:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						19a0c8b462
					 | 
					
						
						
							
							Merge pull request #583 from erorcun/miami
						
						
						
						
						
						
						
						Menu borders and weapon fixes 
						
						
					 | 
					
						2020-05-24 10:47:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						4870d9a31b
					 | 
					
						
						
							
							Menu borders and weapon fixes
						
						
						
						
						
						
					 | 
					
						2020-05-24 03:05:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						6a7bd0e330
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-24 00:19:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |