1859 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
aap	c11912a8ec	sorted out object collision enums	2020-05-06 17:14:34 +02:00
aap	aa12251c6b	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-06 17:13:53 +02:00
aap	a2b89c6a18	sorted out object collision enums	2020-05-06 17:13:46 +02:00
Sergeanur	d015e09c92	Merge branch 'master' into miami	2020-05-06 18:03:36 +03:00
Sergeanur	b633288d1b	Merge remote-tracking branch 'origin/master'	2020-05-06 18:02:16 +03:00
Sergeanur	daa3b20477	Fix cAudioManager::ProcessActiveQueues loop	2020-05-06 18:01:52 +03:00
aap	224727c14d	got rid of superfluous enum	2020-05-06 16:58:57 +02:00
aap	b4bbd91921	got rid of superfluous enum	2020-05-06 16:56:59 +02:00
Nikolay Korolev	bd4d5d7c47	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 16:55:45 +03:00
Nikolay Korolev	15520fe77d	fix memory corruption	2020-05-06 16:55:04 +03:00
Nikolay Korolev	3b08efa2ad	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 16:46:33 +03:00
Sergeanur	bb55430f75	Merge remote-tracking branch 'origin/master' into miami	2020-05-06 16:44:30 +03:00
aap	13522259b8	fix for radar	2020-05-06 15:41:40 +02:00
Nikolay Korolev	88076a0050	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 15:45:13 +03:00
aap	25a4091fa8	setting some areas so objects dont disappear	2020-05-06 14:43:23 +02:00
Nikolay Korolev	4d06271a29	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 15:30:56 +03:00
aap	600cbee7d4	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-06 14:28:05 +02:00
aap	13c24a310d	little cworld bugfix	2020-05-06 14:27:57 +02:00
aap	7c356b08e6	little cworld bugfix	2020-05-06 14:27:41 +02:00
Nikolay Korolev	8c036ec671	sync with master	2020-05-06 14:42:41 +03:00