1879 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nikolay Korolev	fb1f51241d	fix	2020-05-08 13:41:28 +03:00
aap	2171ebe2da	Merge pull request #521 from Nick007J/miami ... miami car control init	2020-05-08 11:04:00 +02:00
Nikolay Korolev	db26700352	final fix	2020-05-08 11:49:40 +03:00
Nikolay Korolev	09dc1f9e1e	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-08 11:44:21 +03:00
Nikolay Korolev	49cf53644a	reasonable spawns	2020-05-08 11:43:27 +03:00
Nikolay Korolev	44c5cdf453	tmp stuff	2020-05-08 11:11:09 +03:00
Sergeanur	a483243c52	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/core/FileLoader.cpp	2020-05-08 00:58:39 +03:00
Nikolay Korolev	b99346e6ca	sync with upstream	2020-05-07 23:22:15 +03:00
Nikolay Korolev	2dc818e4d2	intermediate changes	2020-05-07 23:21:36 +03:00
aap	a8f1505517	small fixes	2020-05-07 21:56:09 +02:00
aap	c715569d1d	CBaseModelInfo done	2020-05-07 21:55:54 +02:00
aap	f80474f590	little script change	2020-05-07 18:08:17 +02:00
aap	19b21cafcd	CZoneInfo mostly done; not its dependencies	2020-05-07 17:53:38 +02:00
aap	3ae10c93ac	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-07 17:31:32 +02:00
Nikolay Korolev	5780b4503e	sync with upstream	2020-05-07 16:59:40 +03:00
Nikolay Korolev	40888e9486	car control and friends	2020-05-07 16:57:49 +03:00
aap	8bb22b2ad8	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-07 14:41:43 +02:00
aap	6a7d08ecc2	some quick cosmetic fixes	2020-05-07 14:41:35 +02:00
Sergeanur	f13c4e6aca	Merge branch 'master' into miami	2020-05-07 14:49:29 +03:00
Sergeanur	0b848bc147	Fix looping collision sound	2020-05-07 14:48:53 +03:00
aap	54662674e6	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-07 13:38:22 +02:00
aap	dbbf390983	use water color and new water texture	2020-05-07 13:38:14 +02:00
Sergeanur	7dc649ede6	Merge branch 'master' into miami	2020-05-07 14:32:41 +03:00
Sergeanur	1ac6bea590	Fix GetDistanceSquared	2020-05-07 14:32:00 +03:00
Sergeanur	ed1bb7236f	Fixed arguments for sound collisions	2020-05-07 14:10:56 +03:00
aap	5c30b3a188	got rid of superfluous enum; update librw	2020-05-07 12:48:57 +02:00
aap	f5c0bf3b60	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-07 12:48:57 +02:00
aap	152c7c452c	few changes for vehicle model info	2020-05-07 12:48:09 +02:00
Sergeanur	bef436400d	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/modelinfo/ModelIndices.h	2020-05-07 13:42:50 +03:00
aap	aff89c6f5c	typo	2020-05-07 11:47:08 +02:00
aap	05a1d64fbb	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
aap	876e402d1e	dont hardcode first vehicle ID; little fix for roadblocks	2020-05-07 09:38:07 +02:00
aap	a8d8c0690d	changed default ID ranges. old default.ide incompatible now	2020-05-06 23:39:38 +02:00
Nikolay Korolev	a7c17a329a	fixed lane offset	2020-05-07 00:27:10 +03:00
aap	3931dc795f	waterlevel with offset (from Fire_Head)	2020-05-06 23:13:12 +02:00
aap	a1c229784f	Merge pull request #518 from Nick007J/miami ... script stubs + REQUEST_COLLISION	2020-05-06 21:55:10 +02:00
aap	965ea93a61	checked some of streaming for VC changes	2020-05-06 21:54:43 +02:00
Nikolay Korolev	31ebbf348f	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 21:16:38 +03:00
Nikolay Korolev	599b7301c8	script stubs + REQUEST_COLLISION	2020-05-06 21:15:58 +03:00
Nikolay Korolev	03cecb6f1c	Merge pull request #516 from Nick007J/miami ... miami (script + other) stuff	2020-05-06 19:43:45 +03:00
Nikolay Korolev	f34431a506	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 19:34:36 +03:00
Sergeanur	6ad66fb2d7	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/render/Renderer.cpp	2020-05-06 19:32:57 +03:00
Nikolay Korolev	53107d3b71	added flag	2020-05-06 19:24:33 +03:00
Nikolay Korolev	0930d70134	IsStatic	2020-05-06 19:20:45 +03:00
Nikolay Korolev	3895853fe7	Merge pull request #517 from Nick007J/master ... IsStatic	2020-05-06 19:18:44 +03:00
Nikolay Korolev	a24b65cbde	IsStatic	2020-05-06 19:17:47 +03:00
Nikolay Korolev	d5e76471ae	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 19:04:52 +03:00
aap	f1c1f56b12	CSphere and CBox for CColModel	2020-05-06 17:56:38 +02:00
Sergeanur	fc8c28722f	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/objects/Object.h	2020-05-06 18:24:31 +03:00
aap	a76b88da08	fixed object collision stuff at least somewhat	2020-05-06 17:17:07 +02:00