Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						6a7bd0e330
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-24 00:19:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						ac208ce02c
					 | 
					
						
						
							
							Even more small audio cleanup
						
						
						
						
						
						
					 | 
					
						2020-05-23 23:25:14 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						f2790f610b
					 | 
					
						
						
							
							More audio cleanup
						
						
						
						
						
						
					 | 
					
						2020-05-23 22:48:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						88b6168f1c
					 | 
					
						
						
							
							Merge branch 'master' into miami
						
						
						
						
						
						
						
						# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h 
						
						
					 | 
					
						2020-05-23 21:14:16 +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
							
						 
					 | 
					
						
						
							
						
						5276abb0fb
					 | 
					
						
						
							
							Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-05-23 18:04:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						c3b41d79a2
					 | 
					
						
						
							
							Cleanup and one needed function
						
						
						
						
						
						
					 | 
					
						2020-05-23 18:04:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erorcun
							
						 
					 | 
					
						
						
							
						
						530b5ff58d
					 | 
					
						
						
							
							Merge pull request #581 from erorcun/miami
						
						
						
						
						
						
						
						Compatibility with VC weapon.dat + new shotguns 
						
						
					 | 
					
						2020-05-23 17:15:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						5357957fe1
					 | 
					
						
						
							
							Compatibility with VC weapon.dat + new shotguns
						
						
						
						
						
						
					 | 
					
						2020-05-23 16:53:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						100e59886d
					 | 
					
						
						
							
							cranes fix
						
						
						
						
						
						
					 | 
					
						2020-05-23 16:14:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						9313bfa155
					 | 
					
						
						
							
							skeleton typos
						
						
						
						
						
						
					 | 
					
						2020-05-23 11:34:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						e2d3ef449c
					 | 
					
						
						
							
							skeleton typos
						
						
						
						
						
						
					 | 
					
						2020-05-23 11:34:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						9c6046455e
					 | 
					
						
						
							
							fixed script
						
						
						
						
						
						
					 | 
					
						2020-05-23 12:17:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						df763bdb98
					 | 
					
						
						
							
							Merge pull request #580 from Nick007J/miami
						
						
						
						
						
						
						
						script fixes + a bit of CControllerConfigManager 
						
						
					 | 
					
						2020-05-23 01:19:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						7b7b0fb5f2
					 | 
					
						
						
							
							removed debug
						
						
						
						
						
						
					 | 
					
						2020-05-23 02:18:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						f8a509ffb3
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2020-05-23 02:17:27 +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
							
						 
					 | 
					
						
						
							
						
						b105403dc7
					 | 
					
						
						
							
							Merge pull request #578 from aap/miami
						
						
						
						
						
						
						
						CPhysical 
						
						
					 | 
					
						2020-05-23 00:12:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						a1e4b15bcc
					 | 
					
						
						
							
							Merge branch 'miami' of github.com:GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-05-22 23:58:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						8fb72afac9
					 | 
					
						
						
							
							Merge pull request #576 from Nick007J/miami
						
						
						
						
						
						
						
						new script commands - mostly stubs 
						
						
					 | 
					
						2020-05-22 23:55:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						e18eb0ce01
					 | 
					
						
						
							
							script fix
						
						
						
						
						
						
					 | 
					
						2020-05-23 00:50:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						6e51ed3c53
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-22 23:35:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						c993e99e00
					 | 
					
						
						
							
							Fix linux build
						
						
						
						
						
						
					 | 
					
						2020-05-22 22:49:54 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						a9f332f2d9
					 | 
					
						
						
							
							Possibly fix travis
						
						
						
						
						
						
					 | 
					
						2020-05-22 21:26:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						efe52dbbbc
					 | 
					
						
						
							
							I am an idiot
						
						
						
						
						
						
					 | 
					
						2020-05-22 21:14:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						38a09c6e9b
					 | 
					
						
						
							
							Fix linux build
						
						
						
						
						
						
					 | 
					
						2020-05-22 21:00:59 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						e858314a9f
					 | 
					
						
						
							
							OpenAL configs
						
						
						
						
						
						
					 | 
					
						2020-05-22 18:01:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						97b058d0fa
					 | 
					
						
						
							
							more checks in premake
						
						
						
						
						
						
					 | 
					
						2020-05-22 17:43:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						a705fc7eb8
					 | 
					
						
						
							
							fix eax
						
						
						
						
						
						
					 | 
					
						2020-05-22 17:41:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						ab161d12d8
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into opus
						
						
						
						
						
						
					 | 
					
						2020-05-22 17:41:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						0af4d57408
					 | 
					
						
						
							
							opus support
						
						
						
						
						
						
					 | 
					
						2020-05-22 17:40:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergeanur
							
						 
					 | 
					
						
						
							
						
						aba523d14e
					 | 
					
						
						
							
							submodules
						
						
						
						
						
						
					 | 
					
						2020-05-22 17:24:54 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erorcun
							
						 
					 | 
					
						
						
							
						
						4b99d7127f
					 | 
					
						
						
							
							Merge pull request #579 from Xinerki/miami
						
						
						
						
						
						
						
						InitAfterFocusLoss compile fix 
						
						
					 | 
					
						2020-05-22 16:10:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xin
							
						 
					 | 
					
						
						
							
						
						a878e09f0f
					 | 
					
						
						
							
							InitAfterFocusLoss compile fix
						
						
						
						
						
						
					 | 
					
						2020-05-22 16:04:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erorcun
							
						 
					 | 
					
						
						
							
						
						8b82e9c40f
					 | 
					
						
						
							
							Merge pull request #574 from Xinerki/miami
						
						
						
						
						
						
						
						many additions 
						
						
					 | 
					
						2020-05-22 15:49:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						21071edbfe
					 | 
					
						
						
							
							fixes for CPhysical and friends
						
						
						
						
						
						
					 | 
					
						2020-05-22 14:34:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						a53ca58e56
					 | 
					
						
						
							
							CPhysical
						
						
						
						
						
						
					 | 
					
						2020-05-22 14:27:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aap
							
						 
					 | 
					
						
						
							
						
						380f7bc417
					 | 
					
						
						
							
							Merge branch 'miami' of github.com:GTAmodding/re3 into miami
						
						
						
						
						
						
					 | 
					
						2020-05-22 14:25:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erorcun
							
						 
					 | 
					
						
						
							
						
						4fd1771f71
					 | 
					
						
						
							
							Merge pull request #577 from erorcun/miami
						
						
						
						
						
						
						
						VC CMenuManager struct, ctor etc. 
						
						
					 | 
					
						2020-05-22 15:24:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eray orçunus
							
						 
					 | 
					
						
						
							
						
						a5f23a0342
					 | 
					
						
						
							
							VC CMenuManager struct, ctor etc.
						
						
						
						
						
						
					 | 
					
						2020-05-22 03:48:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						5a18e69425
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/miami' into miami
						
						
						
						
						
						
					 | 
					
						2020-05-22 02:42:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Korolev
							
						 
					 | 
					
						
						
							
						
						864847a6fe
					 | 
					
						
						
							
							new script commands - mostly stubs
						
						
						
						
						
						
					 | 
					
						2020-05-22 02:42:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xinerki
							
						 
					 | 
					
						
						
							
						
						900d5a4ce0
					 | 
					
						
						
							
							focus loss improvement
						
						
						
						
						
						
						
						for u aap 
						
						
					 | 
					
						2020-05-21 21:48:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xinerki
							
						 
					 | 
					
						
						
							
						
						e0345732c0
					 | 
					
						
						
							
							wasted/busted text color
						
						
						
						
						
						
						
						how did nobody change it yet 
						
						
					 | 
					
						2020-05-21 17:50:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xinerki
							
						 
					 | 
					
						
						
							
						
						0db3d03c3c
					 | 
					
						
						
							
							sorry my bad
						
						
						
						
						
						
					 | 
					
						2020-05-21 17:36:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xinerki
							
						 
					 | 
					
						
						
							
						
						1c00e3cf2c
					 | 
					
						
						
							
							vehicle cheats and debug cheat string display
						
						
						
						
						
						
					 | 
					
						2020-05-21 17:28:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xinerki
							
						 
					 | 
					
						
						
							
						
						6692f5b2aa
					 | 
					
						
						
							
							make reloadables optional
						
						
						
						
						
						
					 | 
					
						2020-05-21 16:47:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xinerki
							
						 
					 | 
					
						
						
							
						
						6912cfe98a
					 | 
					
						
						
							
							menu map color change
						
						
						
						
						
						
					 | 
					
						2020-05-21 16:26:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |