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
							
						 
					 | 
					
						
						
							
						
						2966be41ba
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-23 20:07:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						607175f02a
					 | 
					
						
						
							
							set pieces
						
						
						
						
						
						
					 | 
					
						2020-05-23 20:06:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						c3b41d79a2
					 | 
					
						
						
							
							Cleanup and one needed function
						
						
						
						
						
						
					 | 
					
						2020-05-23 18:04:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						5357957fe1
					 | 
					
						
						
							
							Compatibility with VC weapon.dat + new shotguns
						
						
						
						
						
						
					 | 
					
						2020-05-23 16:53:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						b9115b4429
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-23 01:43:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						7bf561d440
					 | 
					
						
						
							
							some fixes
						
						
						
						
						
						
					 | 
					
						2020-05-23 01:43:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						a1e4b15bcc
					 | 
					
						
						
							
							Merge branch 'miami' of github.com:GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-05-22 23:58:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						a53ca58e56
					 | 
					
						
						
							
							CPhysical
						
						
						
						
						
						
					 | 
					
						2020-05-22 14:27:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						864847a6fe
					 | 
					
						
						
							
							new script commands - mostly stubs
						
						
						
						
						
						
					 | 
					
						2020-05-22 02:42:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						7e5342e9f0
					 | 
					
						
						
							
							script revision
						
						
						
						
						
						
					 | 
					
						2020-05-21 11:22:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						2ab3fb5dd0
					 | 
					
						
						
							
							Fixes for melees and various things
						
						
						
						
						
						
					 | 
					
						2020-05-20 20:21:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						fd4cd3e8f1
					 | 
					
						
						
							
							Merge pull request #569 from aap/miami
						
						
						
						
						
						
						
						CEntity and friends 
						
						
					 | 
					
						2020-05-20 12:41:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						fec0028e12
					 | 
					
						
						
							
							sync with upstream
						
						
						
						
						
						
					 | 
					
						2020-05-19 23:27:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						0b0ba49abc
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2020-05-19 21:42:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						bdbe5d1080
					 | 
					
						
						
							
							CEntity and friends
						
						
						
						
						
						
					 | 
					
						2020-05-19 20:56:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						46d1889344
					 | 
					
						
						
							
							slightly restructured ped flags for convenience
						
						
						
						
						
						
					 | 
					
						2020-05-19 21:34:28 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						4c822e8375
					 | 
					
						
						
							
							script revision
						
						
						
						
						
						
					 | 
					
						2020-05-19 20:54:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						99574ebfc6
					 | 
					
						
						
							
							Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-05-19 17:46:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						a6972714b7
					 | 
					
						
						
							
							Melee weapons(half-working), Ped and Hud bits
						
						
						
						
						
						
					 | 
					
						2020-05-19 17:43:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						6510b15704
					 | 
					
						
						
							
							script revision
						
						
						
						
						
						
					 | 
					
						2020-05-19 01:49:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						2d4861454c
					 | 
					
						
						
							
							Merge pull request #557 from Nick007J/miami
						
						
						
						
						
						
						
						script and script stubs 
						
						
					 | 
					
						2020-05-18 13:08:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						96151ec0f0
					 | 
					
						
						
							
							TransformToNode crash fix?
						
						
						
						
						
						
					 | 
					
						2020-05-18 00:27:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						d5d2f6a822
					 | 
					
						
						
							
							sync with upstream
						
						
						
						
						
						
					 | 
					
						2020-05-17 21:48:21 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						3cc20d7962
					 | 
					
						
						
							
							sync with upstream
						
						
						
						
						
						
					 | 
					
						2020-05-17 21:48:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						a5b84eb9fe
					 | 
					
						
						
							
							full script basic support
						
						
						
						
						
						
					 | 
					
						2020-05-17 21:43:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						8a7210cad1
					 | 
					
						
						
							
							Merge pull request #555 from erorcun/miami
						
						
						
						
						
						
						
						Weapon fixes and thingies 
						
						
					 | 
					
						2020-05-17 20:20:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						84f8312b86
					 | 
					
						
						
							
							Weapon fixes and thingies
						
						
						
						
						
						
					 | 
					
						2020-05-17 21:01:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						b587d835e8
					 | 
					
						
						
							
							more script stuff
						
						
						
						
						
						
					 | 
					
						2020-05-16 23:06:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						e3291b0cb1
					 | 
					
						
						
							
							gangs, script and replay fixes
						
						
						
						
						
						
					 | 
					
						2020-05-16 17:00:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						40ee29fb99
					 | 
					
						
						
							
							Weapon fixes
						
						
						
						
						
						
					 | 
					
						2020-05-16 15:07:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						0c23166318
					 | 
					
						
						
							
							changed CPedIK names
						
						
						
						
						
						
					 | 
					
						2020-05-16 10:33:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						9067469f7c
					 | 
					
						
						
							
							more attractor fixes
						
						
						
						
						
						
					 | 
					
						2020-05-16 11:30:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						cf5db73117
					 | 
					
						
						
							
							a few fixes
						
						
						
						
						
						
					 | 
					
						2020-05-16 11:22:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						03c4a979c8
					 | 
					
						
						
							
							removed duplicate code
						
						
						
						
						
						
					 | 
					
						2020-05-16 10:53:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						5abd466b5d
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-16 10:52:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						5491a51daa
					 | 
					
						
						
							
							remove debug
						
						
						
						
						
						
					 | 
					
						2020-05-16 10:39:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						76dd769085
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-16 05:07:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						ec1b91e527
					 | 
					
						
						
							
							Remove unused audio enum
						
						
						
						
						
						
					 | 
					
						2020-05-16 05:06:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						a4562c5720
					 | 
					
						
						
							
							fixed spaces/tabs
						
						
						
						
						
						
					 | 
					
						2020-05-16 02:15:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						f864698696
					 | 
					
						
						
							
							ped attractors
						
						
						
						
						
						
					 | 
					
						2020-05-16 02:10:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						21329b8440
					 | 
					
						
						
							
							sync with upstream
						
						
						
						
						
						
					 | 
					
						2020-05-16 01:50:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						08b2138c7e
					 | 
					
						
						
							
							ped attractors done
						
						
						
						
						
						
					 | 
					
						2020-05-16 01:49:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erorcun
							
						 
					 | 
					
						
						
							
						
						8ff72f0728
					 | 
					
						
						
							
							Merge pull request #550 from erorcun/miami
						
						
						
						
						
						
						
						Weapon layer in Peds 
						
						
					 | 
					
						2020-05-15 21:30:57 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						acd1ea9909
					 | 
					
						
						
							
							Weapon layer in Peds
						
						
						
						
						
						
					 | 
					
						2020-05-15 21:21:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						1fde2ba468
					 | 
					
						
						
							
							CPedIK
						
						
						
						
						
						
					 | 
					
						2020-05-15 19:41:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						09a0207e55
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-14 22:29:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						ede6b7db6a
					 | 
					
						
						
							
							Fix compilation
						
						
						
						
						
						
					 | 
					
						2020-05-14 17:15:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						24875f34d0
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp 
						
						
					 | 
					
						2020-05-14 17:05:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |