| 
							
							
								 shfil | 7794cca429 | Merge pull request #477 from ShFil119/mingw Try to make code working on more platforms | 2020-04-20 19:50:12 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 35a7f89f73 | Merge remote-tracking branch 'upstream/master' | 2020-04-20 19:41:49 +03:00 |  | 
			
				
					| 
							
							
								 Filip Gawin | 370c4e48cd | Try to build with mingw | 2020-04-20 18:18:46 +02:00 |  | 
			
				
					| 
							
							
								 Fire_Head | c9920b6a2d | Merge pull request #480 from Fire-Head/master camerapickup ps2 code | 2020-04-20 08:21:27 +03:00 |  | 
			
				
					| 
							
							
								 Fire-Head | 556a6df401 | camerapickup ps2 code | 2020-04-20 08:17:08 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 7e4c683824 | fixes | 2020-04-20 01:04:57 +03:00 |  | 
			
				
					| 
							
							
								 Sergeanur | 8e9c9fa445 | Fix CPickups::GenerateNewOne loop | 2020-04-20 00:14:48 +03:00 |  | 
			
				
					| 
							
							
								 erorcun | 0f07a323c9 | Merge pull request #474 from Nick007J/master Bug fixes, mostly replay; added RegisterReference for player ped pointer | 2020-04-19 16:56:39 +03:00 |  | 
			
				
					| 
							
							
								 eray orçunus | 1ffc37735e | Struct cleanup, various fixes, enable PS2 rand | 2020-04-19 16:44:35 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | c4cd45d47c | replays bug fix | 2020-04-18 23:50:37 +03:00 |  | 
			
				
					| 
							
							
								 Filip Gawin | d6314f9564 | Revert "Part one" This reverts commit 63951d9b95. | 2020-04-18 12:29:28 +02:00 |  | 
			
				
					| 
							
							
								 Filip Gawin | 2b1570de70 | Merge branch 'master' of https://github.com/GTAmodding/re3 | 2020-04-18 12:08:38 +02:00 |  | 
			
				
					| 
							
							
								 eray orçunus | 812b9e7eda | Various fixes | 2020-04-18 05:58:43 +03:00 |  | 
			
				
					| 
							
							
								 Filip Gawin | 63951d9b95 | Part one | 2020-04-17 19:30:57 +02:00 |  | 
			
				
					| 
							
							
								 Sergeanur | 599164006a | Remove patches | 2020-04-17 16:31:11 +03:00 |  | 
			
				
					| 
							
							
								 Sergeanur | b9c8ce0d37 | Merge remote-tracking branch 'Fire-Head/master' into Standalone # Conflicts:
#	src/render/Coronas.cpp | 2020-04-17 10:17:38 +03:00 |  | 
			
				
					| 
							
							
								 Sergeanur | 881d61f811 | Merge remote-tracking branch 'samler/world' into Standalone | 2020-04-17 10:16:30 +03:00 |  | 
			
				
					| 
							
							
								 Fire-Head | a4922d5cb7 | rem refs | 2020-04-17 08:54:14 +03:00 |  | 
			
				
					| 
							
							
								 eray orçunus | 2c2da558ca | Some refs removed, little fixes and teleport | 2020-04-16 22:19:56 +03:00 |  | 
			
				
					| 
							
							
								 saml1er | e52a02fb9e | Merge branch 'master' into world # Conflicts:
#	src/core/World.cpp
#	src/core/World.h | 2020-04-17 00:01:53 +05:00 |  | 
			
				
					| 
							
							
								 saml1er | 52d0d811b7 | Reverse CWorld | 2020-04-16 23:46:08 +05:00 |  | 
			
				
					| 
							
							
								 aap | 89b7085353 | Merge branch 'master' of github.com:gtamodding/re3 | 2020-04-16 09:23:31 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 1fd7b0288c | fix Bait crash | 2020-04-16 01:19:08 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 3517f3f1a1 | fix script crash | 2020-04-16 00:31:57 +03:00 |  | 
			
				
					| 
							
							
								 aap | afce2e1bb3 | Merge branch 'master' of github.com:gtamodding/re3 | 2020-04-15 22:36:21 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 5cb7e2e42a | Merge pull request #440 from Fire-Head/master CWeapon done, fixes | 2020-04-15 23:28:09 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | a43ca86542 | Merge pull request #429 from Nick007J/master Scene edit | 2020-04-15 23:27:23 +03:00 |  | 
			
				
					| 
							
							
								 erorcun | e132c3fada | Merge pull request #416 from saml1er/PedPath CPedPath complete | 2020-04-15 19:29:17 +03:00 |  | 
			
				
					| 
							
							
								 erorcun | 647cfbfd45 | Merge pull request #446 from erorcun/erorcun Many fixes and cleanup | 2020-04-15 19:22:28 +03:00 |  | 
			
				
					| 
							
							
								 eray orçunus | 4da1879975 | Many fixes and cleanup | 2020-04-15 19:19:45 +03:00 |  | 
			
				
					| 
							
							
								 aap | 90be379bed | implemented most of librw wrapper | 2020-04-15 14:05:40 +02:00 |  | 
			
				
					| 
							
							
								 Sergeanur | 27c9f7bc88 | Merge remote-tracking branch 'origin/master' into MoreLanguages | 2020-04-15 10:54:15 +03:00 |  | 
			
				
					| 
							
							
								 Fire-Head | daed13485e | CWeapon done, ps2 cheats fix | 2020-04-15 08:03:53 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | b354a72de1 | Merge remote-tracking branch 'upstream/master' | 2020-04-15 01:06:56 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 70b51d42f4 | fixed crash | 2020-04-15 00:33:55 +03:00 |  | 
			
				
					| 
							
							
								 Sergeanur | e373d0526e | Merge branch 'master' into MoreLanguages # Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp | 2020-04-15 00:10:50 +03:00 |  | 
			
				
					| 
							
							
								 saml1er | 6d5464b6bb | CPedPath improvements | 2020-04-14 23:32:15 +05:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | f35d2721f5 | fix | 2020-04-14 20:16:02 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | f2c78e4bfb | Merge branch 'master' into game_dev | 2020-04-14 20:10:39 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 21a11fd343 | scene edit | 2020-04-14 20:09:42 +03:00 |  | 
			
				
					| 
							
							
								 saml1er | bf040c7cd1 | Remove float casts | 2020-04-14 17:05:51 +05:00 |  | 
			
				
					| 
							
							
								 saml1er | 8bb23ca5d4 | Refactor CPedPath::CalcPedRoute | 2020-04-14 16:57:28 +05:00 |  | 
			
				
					| 
							
							
								 saml1er | b4d5d5249c | CPedPath complete | 2020-04-14 15:45:47 +05:00 |  | 
			
				
					| 
							
							
								 Sergeanur | a19fa8764f | CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement | 2020-04-14 13:08:03 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | f54c83c0b5 | Merge branch 'master' into game_dev | 2020-04-14 01:18:53 +03:00 |  | 
			
				
					| 
							
							
								 Filip Gawin | 2e20e040cc | Merge pull request #403 from saml1er/roadblocks CRoadBlocks complete | 2020-04-14 00:11:39 +02:00 |  | 
			
				
					| 
							
							
								 saml1er | 60eb60de4e | Use NUMROADBLOCKS enum member in CRoadBlocks | 2020-04-14 02:13:00 +05:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | 906133d3be | fix garages | 2020-04-13 22:43:41 +03:00 |  | 
			
				
					| 
							
							
								 Sergeanur | 304b574eba | added missing break | 2020-04-13 22:25:24 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Korolev | c21529467a | fixed record | 2020-04-13 22:16:51 +03:00 |  |