2340 commits

Author	SHA1	Message	Date
aap	2e3cb77702	fixed radar rendering	2020-06-02 22:49:57 +02:00
aap	06c761e9ac	few bike things	2020-06-02 15:26:11 +02:00
aap	575c5466df	renamed a vehicle thing	2020-06-02 14:38:57 +02:00
aap	dbeaafbe99	initial CBike struct	2020-06-02 14:38:30 +02:00
erorcun	03d9525eb6	Merge pull request #611 from erorcun/miami ... DrawStandardMenus, VC menu array and minor fixes	2020-06-02 00:21:07 +03:00
Filip Gawin	5d90e4b2f0	Fix collision with peds heads	2020-06-01 22:10:11 +02:00
aap	bfd13d58e0	add freeroam; clean up debug menu	2020-06-01 22:02:22 +02:00
aap	fdf8f35049	CTimer fix	2020-06-01 20:51:18 +02:00
aap	c00f7a8d22	CTimer fix	2020-06-01 20:50:26 +02:00
aap	d8272b8812	hanim fix	2020-06-01 20:32:43 +02:00
aap	8bbb6a2a4a	hanim fix	2020-06-01 20:28:04 +02:00
aap	25273485d9	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-06-01 18:05:24 +02:00
eray orçunus	abef04c637	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-01 18:35:04 +03:00
eray orçunus	d930a25d94	DrawStandardMenus, VC menu array and minor fixes	2020-06-01 18:32:34 +03:00
aap	7c7727e7da	fixed timebar toggle	2020-06-01 13:21:19 +02:00
Nikolay Korolev	0803c821ae	fixed roadblocks	2020-06-01 12:45:03 +03:00
aap	de1018d7a6	gravity	2020-06-01 10:56:15 +02:00
aap	f69313237e	Merge pull request #607 from rollschuh2282/master ... Added toggles for the TimeBars and the "DebugStuffInRelease" to the Debug Menu	2020-06-01 10:44:45 +02:00
aap	c8b93d0575	fixed bumper colmodel	2020-06-01 10:30:01 +02:00
aap	197c49d740	fixed bumper colmodel	2020-06-01 10:29:46 +02:00
aap	12cc0e4132	getting rid of strnicmp	2020-05-31 22:35:29 +02:00
Nikolay Korolev	0631bd9d89	fix	2020-05-31 23:16:24 +03:00
Nikolay Korolev	815d3e0f61	fix	2020-05-31 22:50:32 +03:00
Nikolay Korolev	f945dbc0fb	dumb	2020-05-31 21:01:36 +03:00
Nikolay Korolev	c1c163d78c	game logic	2020-05-31 20:59:01 +03:00
aap	bae3a3e72f	fixed to CAutomobile and friends	2020-05-31 17:45:26 +02:00
aap	21ce0a4b28	CAutomobile done	2020-05-31 17:05:59 +02:00
aap	00dc86917e	some more CAutomobile	2020-05-31 17:05:59 +02:00
aap	218772c296	gahhh	2020-05-31 17:05:59 +02:00
aap	c1e13177a1	some CAutomobile	2020-05-31 17:05:59 +02:00
Nikolay Korolev	49a897c3b3	better name	2020-05-30 20:09:58 +03:00
Nikolay Korolev	09c9e16cb1	roadblocks	2020-05-30 20:08:31 +03:00
Nikolay Korolev	e6b9c20131	fix	2020-05-30 18:07:01 +03:00
eray orçunus	dd162c3aa0	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-05-29 22:05:52 +03:00
eray orçunus	529cec5653	R to freeroam, idle anims, weapon and cam enum fix	2020-05-29 22:05:33 +03:00
eray orçunus	517f0b9189	fix fix fix	2020-05-29 21:31:06 +03:00
eray orçunus	e38f2a7fb2	fix fix	2020-05-29 21:06:08 +03:00
eray orçunus	6438244540	Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun	2020-05-29 20:29:52 +03:00
eray orçunus	9adde91b3a	frontend options fix	2020-05-29 20:29:18 +03:00
Nikolay Korolev	627ffb0f82	fix	2020-05-29 16:52:02 +03:00
rollschuh2282	2d5f7d92e5	Add files via upload	2020-05-29 12:04:20 +02:00
rollschuh2282	20cacb18f0	Add files via upload	2020-05-29 12:03:32 +02:00
erorcun	e65a09ea09	Merge pull request #604 from erorcun/master ... Frontend customization functions, freecam toggle and minor things	2020-05-28 22:06:50 +03:00
eray orçunus	9acf27fc53	remove inlining attempts + reload frontend options for real	2020-05-28 17:42:40 +03:00
Nikolay Korolev	111d23beab	fix	2020-05-28 17:21:00 +03:00
eray orçunus	a61736c51b	theoretically fix linux build	2020-05-28 13:08:21 +03:00
eray orçunus	e6401bce18	Detect R and start game on menu	2020-05-28 12:46:51 +03:00
eray orçunus	98a97a32fa	config reorganization	2020-05-28 11:49:58 +03:00
eray orçunus	98fec63ca7	Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun	2020-05-28 11:40:56 +03:00
eray orçunus	329a387fdf	Frontend customization functions, freecam toggle, minor things	2020-05-28 11:34:12 +03:00
aap	9bcec54291	Merge pull request #599 from Nick007J/master ... Mission replay	2020-05-28 10:25:14 +02:00
aap	ab7a21e017	Merge pull request #603 from Fire-Head/miami ... Miami Water, Seagulls, Ships	2020-05-28 10:23:28 +02:00
Fire-Head	8280e04b23	rem unnecessary asserts	2020-05-28 02:40:23 +03:00
Nikolay Korolev	d9d57f12fc	crash fix	2020-05-28 01:00:49 +03:00
Nikolay Korolev	7e4ef2162a	Merge remote-tracking branch 'upstream/master'	2020-05-28 00:59:03 +03:00
Fire_Head	7f30a2ae1b	cockbuilding ejaculation fix	2020-05-28 00:45:45 +03:00
Fire-Head	fab2c8699c	surfacetable included	2020-05-28 00:36:52 +03:00
Fire-Head	98af5e4ddb	fix SURFACE_SAND	2020-05-28 00:28:36 +03:00
Fire-Head	895580c724	seagulls, ships	2020-05-28 00:15:37 +03:00
aap	0bc6eef55d	bla	2020-05-27 22:34:10 +02:00
aap	2a1b9281e4	automobile fixes	2020-05-27 22:32:57 +02:00
Fire_Head	e4649b41e1	Merge pull request #2 from GTAmodding/miami ... Miami	2020-05-27 21:51:40 +03:00
Fire-Head	63d0bdc863	VC Water	2020-05-27 21:50:01 +03:00
aap	717b0a6514	librw update	2020-05-27 20:42:15 +02:00
aap	d8749c2305	librw update	2020-05-27 20:41:36 +02:00
Sergeanur	53ac163a3e	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/vehicles/Automobile.h	2020-05-27 20:50:40 +03:00
Sergeanur	3a5a122887	Fix city sound playing on restarting a new game	2020-05-27 20:48:47 +03:00
Nikolay Korolev	d4ae40ae99	crash fix	2020-05-27 19:39:04 +03:00
aap	02741dc64f	RwCameraGetCurrentCamera	2020-05-27 09:47:57 +02:00
aap	1af4edd43a	RwCameraGetCurrentCamera	2020-05-27 09:47:21 +02:00
aap	d71cbae9df	CVehicle loose ends	2020-05-27 07:43:38 +02:00
aap	c068570192	Merge pull request #600 from Fire-Head/miami ... Miami Particle	2020-05-27 07:18:47 +02:00
aap	4868bf13a8	Merge pull request #601 from Sergeanur/VC/audio3 ... Support of original mp3/wav/adf	2020-05-27 07:10:36 +02:00
Sergeanur	591c35d51b	OpenAL support	2020-05-27 07:52:45 +03:00
aap	d0d060d321	MT function for fakerw	2020-05-27 06:50:05 +02:00
aap	926281f909	MT function for fakerw	2020-05-27 06:49:38 +02:00
Sergeanur	7a79b74778	Restore original logic	2020-05-27 03:33:27 +03:00
Sergeanur	408faf8a66	Support of original mp3/wav/adf	2020-05-27 03:29:54 +03:00
Fire-Head	90947a608f	fix linux build	2020-05-27 03:18:02 +03:00
Fire-Head	6a32981ba5	VC CParticle done	2020-05-27 02:16:31 +03:00
Nikolay Korolev	9673ecddad	Merge remote-tracking branch 'upstream/master'	2020-05-27 00:25:33 +03:00
Nikolay Korolev	ec1d14971c	mission replay	2020-05-27 00:25:12 +03:00
aap	ea09825d10	Merge pull request #553 from Sergeanur/VC/audio ... Very basic compatibility with original sfx.raw/sdt	2020-05-26 22:02:12 +02:00
aap	4f1ce8bd42	added some unused enums	2020-05-26 20:44:03 +02:00
aap	0ac3477035	fix UB shit	2020-05-26 18:50:27 +02:00
aap	7f60be9814	fix UB shit	2020-05-26 18:50:19 +02:00
Sergeanur	1991aa388b	Very basic compatibility with original sfx.raw/sdt	2020-05-26 18:25:34 +03:00
Sergeanur	0ce2af7a0d	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/core/SurfaceTable.cpp # src/core/SurfaceTable.h # src/core/World.cpp # src/core/main.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/Ped.cpp # src/render/Timecycle.cpp # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/Heli.cpp # src/vehicles/Vehicle.cpp # src/weapons/Weapon.cpp # src/weapons/WeaponInfo.h	2020-05-26 17:24:47 +03:00
Nikolay Korolev	f40677c7a4	fixed crash	2020-05-26 16:17:40 +03:00
aap	314e56b7b9	fix2	2020-05-26 12:11:04 +02:00
aap	dfa95002aa	fix	2020-05-26 12:10:08 +02:00
aap	800d706935	Merge pull request #588 from blingu/miami ... fixed compiler errors	2020-05-26 11:39:16 +02:00
aap	7e5dde1f1a	eSurfaceType	2020-05-26 11:37:46 +02:00
aap	d8528ebbbe	eSurfaceType	2020-05-26 11:34:20 +02:00
aap	0b8f045d36	Merge pull request #586 from aap/miami ... CVehicle	2020-05-26 11:25:23 +02:00
Nikolay Korolev	5ca0d6c6cf	fixed NE bug	2020-05-26 00:45:32 +03:00
Nikolay Korolev	38d2854226	fixed FIX_BUGS	2020-05-26 00:18:04 +03:00
Nikolay Korolev	ad8e8f4341	switch collision with debug menu	2020-05-25 23:59:55 +03:00
Nikolay Korolev	15a99da50e	cranes fix	2020-05-25 23:34:47 +03:00
aap	3c3b1aadc0	small fixes	2020-05-25 20:36:23 +02:00
Sergeanur	52644192e3	Even more audio cleanups	2020-05-25 19:36:09 +03:00
aap	7bf8337854	CVehicle	2020-05-25 18:33:34 +02:00
Sergeanur	ad896d5f81	Ped comments cleanup	2020-05-25 19:10:15 +03:00
Sergeanur	cebc3bbd48	More audio cleanup and bugfixes	2020-05-25 18:39:16 +03:00
Sergeanur	fd06ab4db8	Fix names of static variables	2020-05-25 03:56:17 +03:00
Sergeanur	80c2018b51	cAudioManager::ProcessPlayersVehicleEngine cleanup and fixes	2020-05-25 03:40:47 +03:00
Sergeanur	56683dbed3	Clean cAudioManager::ProcessGarages up a bit	2020-05-24 20:33:30 +03:00
blingu	79c652e115	Ped.h include not needed	2020-05-24 17:48:13 +02:00
Sergeanur	e259bb6609	fixes	2020-05-24 18:43:50 +03:00
blingu	55ece14f42	Update CopPed.cpp	2020-05-24 17:36:37 +02:00
nrb	d59862eb5e	fixed compiler errors	2020-05-24 17:27:12 +02:00
Sergeanur	e4f136344c	Merge remote-tracking branch 'origin/master' into opus	2020-05-24 18:25:53 +03:00
Nikolay Korolev	6235e2140e	fixed filename	2020-05-24 17:23:14 +03:00
eray orçunus	14755a4ff4	all my fixes live in exes	2020-05-24 16:41:29 +03:00
aap	3fdd352ca2	CVehicle fixes	2020-05-24 15:14:56 +02:00
Nikolay Korolev	8705562559	how did saving even work in original III?	2020-05-24 15:58:25 +03:00
Nikolay Korolev	8c510a8d5b	script fix	2020-05-24 15:00:45 +03:00
Nikolay Korolev	e248cbcc7d	say goodbye to your saves	2020-05-24 14:01:01 +03:00
Nikolay Korolev	9c93cc7d6f	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-24 13:48:41 +03:00
Nikolay Korolev	cda3752838	comments	2020-05-24 13:48:17 +03:00
Nikolay Korolev	e95de89c9a	script fix	2020-05-24 12:01:07 +03:00
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
Sergeanur	13a9441d5e	Merge branch 'master' into opus	2020-05-24 01:45:10 +03:00
Sergeanur	f92770f74a	Optimize ALDeviceList	2020-05-24 01:44:10 +03:00
Sergeanur	0c4ce002f1	Merge branch 'master' into opus	2020-05-24 01:07:03 +03:00
Sergeanur	7d30878418	Fix OAL crash	2020-05-24 01:06:19 +03:00
Sergeanur	3a7651e7ab	Cleanup	2020-05-24 00:56:20 +03:00
Sergeanur	bd67db523a	Merge branch 'master' into opus ... # Conflicts: # eax/eax.h # premake5.lua # src/audio/oal/stream.cpp	2020-05-24 00:45:45 +03:00
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	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	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
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	a1e4b15bcc	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-22 23:58:59 +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	e858314a9f	OpenAL configs	2020-05-22 18:01:09 +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
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
eray orçunus	a5f23a0342	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +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
Xinerki	46c6b0d29d	fancy HUD.TXD reloader ... TODO: make optional with defines, also add more reload options	2020-05-21 16:25:46 +03:00
Xinerki	3e75de9709	radardisc shadow ... thank tomasak	2020-05-21 15:46:53 +03:00
Xinerki	1cb7b9876f	scuffed InitAfterFocusLoss implementation	2020-05-21 14:23:12 +03:00
Xinerki	b4060a4789	add freecam toggle in control settings ... comes with a free config save!	2020-05-21 13:06:09 +03:00
Xinerki	2db26d304f	approach separation differently	2020-05-21 12:45:45 +03:00
Xinerki	6d32cf4a11	blip marker colors, also isolate crgba	2020-05-21 12:21:02 +03:00
Nikolay Korolev	7e5342e9f0	script revision	2020-05-21 11:22:25 +03:00
Nikolay Korolev	73ff01e35b	script fix	2020-05-21 00:18:13 +03:00
Nikolay Korolev	510261cb05	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-20 23:54:22 +03:00
Nikolay Korolev	3405cfffb7	fixed dumb	2020-05-20 23:52:17 +03:00
Nikolay Korolev	0085ed894f	script revision	2020-05-20 23:47:44 +03:00
Nikolay Korolev	b7c1784dd2	script fix	2020-05-20 23:25:01 +03:00
eray orçunus	5b953228b4	Pickup and audio fix	2020-05-20 21:22:40 +03:00
aap	71b9b2ecf9	Merge pull request #572 from erorcun/miami ... Fixes for melees and various things	2020-05-20 19:55:05 +02:00
Nikolay Korolev	c0c8278c63	fixed ped comment	2020-05-20 20:45:07 +03:00
Nikolay Korolev	f33a01e8c8	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-20 20:40:36 +03:00
Nikolay Korolev	d84650fbe5	script revision	2020-05-20 20:40:04 +03:00
eray orçunus	2ab3fb5dd0	Fixes for melees and various things	2020-05-20 20:21:27 +03:00
Sergeanur	c53b23cff0	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/core/Radar.h # src/core/World.cpp # src/core/config.h # src/entities/Entity.cpp # src/modelinfo/ModelIndices.h # src/modelinfo/PedModelInfo.cpp # src/peds/Population.cpp # src/render/Clouds.cpp # src/render/Hud.cpp # src/vehicles/HandlingMgr.h	2020-05-20 14:39:36 +03:00
aap	fd4cd3e8f1	Merge pull request #569 from aap/miami ... CEntity and friends	2020-05-20 12:41:12 +02:00
Nikolay Korolev	1b96e6c378	fixed script bug	2020-05-19 23:49:28 +03:00
Nikolay Korolev	fec0028e12	sync with upstream	2020-05-19 23:27:41 +03:00
aap	50f0c7a1dc	bla	2020-05-19 22:01:28 +02: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	e967db4a3c	fixed annoying bug	2020-05-19 21:10:40 +03:00
Nikolay Korolev	41d7b3244b	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-19 20:54:10 +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
aap	8a90e32f1b	Merge pull request #564 from Xinerki/miami ... fix audio menu crash	2020-05-19 13:26:43 +02:00
aap	6b0b984909	Merge pull request #561 from Nick007J/miami ... script revision	2020-05-19 13:26:21 +02:00
Xinerki	ffd175c705	fix frontend control config menu a little ... thank erorcun	2020-05-19 14:23:59 +03:00
aap	0d0f4da27a	little cleanup of handlingmgr	2020-05-19 13:09:20 +02:00
Xinerki	12b48edada	fix audio menu crash	2020-05-19 14:07:24 +03:00
aap	53cdf6ab41	HandlingMgr	2020-05-19 13:07:12 +02:00
aap	401e45d63e	Merge pull request #563 from Xinerki/miami ... match frontend to vc more; isolate crgba	2020-05-19 12:50:47 +02:00
Xinerki	9e14e8553f	match frontend to vc more; isolate crgba	2020-05-19 13:47:55 +03:00
Nikolay Korolev	ff0e039599	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-19 12:44:40 +03:00
aap	9d16df5aa8	Merge pull request #562 from Xinerki/miami ... Load VC frontend textures and use some	2020-05-19 10:41:17 +02:00
Xinerki	00ee82aba6	Zone and Vehicle text slant	2020-05-19 11:36:08 +03:00
aap	62db8cd9b0	finished CFileLoader; some COcclusion stubs	2020-05-19 10:23:08 +02:00
Xinerki	d425358181	Load VC frontend textures and use some	2020-05-19 10:07:15 +03:00
Nikolay Korolev	a27fc8d9d9	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-19 01:49:51 +03:00
Nikolay Korolev	6510b15704	script revision	2020-05-19 01:49:09 +03:00
Nikolay Korolev	c47292b518	script fix	2020-05-19 00:10:45 +03:00
aap	abd230dcdd	some less certainly fps fixes	2020-05-18 22:52:35 +02:00
aap	a8f4f74a76	only one sunbathe anim group	2020-05-18 22:25:06 +02:00
Nikolay Korolev	746f2aa479	script FPS fix	2020-05-18 22:43:06 +03:00
shfil	6bf79120dc	Fix string assignment (aldlist.cpp)	2020-05-18 21:08:01 +02:00
Sergeanur	e891cf858f	Remove MAX_VOLUME dups	2020-05-18 20:17:24 +03:00
aap	b05e6632be	Merge pull request #556 from Fire-Head/master ... nullsampman	2020-05-18 17:08:32 +02:00
aap	2588e69849	some less certainly fps fixes	2020-05-18 16:55:38 +02:00
aap	68f1c03a85	fixes for braking and cloud rotation at high fps	2020-05-18 16:43:40 +02:00
aap	9b09aa3384	fixes for braking and cloud rotation at high fps	2020-05-18 16:40:30 +02:00
aap	2d4861454c	Merge pull request #557 from Nick007J/miami ... script and script stubs	2020-05-18 13:08:24 +02:00
aap	8f9ce275c8	Merge pull request #558 from Sergeanur/VC/text ... CText	2020-05-18 13:07:59 +02:00
Sergeanur	af22bb1495	CText	2020-05-18 01:28:40 +03:00
Nikolay Korolev	5ab2c85e97	some debug changes	2020-05-18 00:34:24 +03:00
eray orçunus	f71cfdf8ef	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-05-18 00:27:36 +03:00
eray orçunus	96151ec0f0	TransformToNode crash fix?	2020-05-18 00:27:04 +03:00
Nikolay Korolev	ad8a8913d9	a few more stubs	2020-05-18 00:20:26 +03:00
Nikolay Korolev	fd2948f045	sync with upstream	2020-05-17 23:32:32 +03:00
Nikolay Korolev	39931a5284	some more script stubs	2020-05-17 23:31:16 +03:00
aap	d4a429d986	little cleanup on radar	2020-05-17 22:24:23 +02:00
aap	13903d7c46	radar sprites	2020-05-17 22:21:39 +02:00
eray orçunus	7bd6c70318	just in case	2020-05-17 22:17:43 +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
Fire-Head	91fbfc1d23	nullsampman	2020-05-17 21:13:25 +03:00
eray orçunus	84f8312b86	Weapon fixes and thingies	2020-05-17 21:01:52 +03:00
aap	a0703fd9e1	loading screens	2020-05-17 19:45:21 +02:00
aap	3f2bdc096d	some HUD colors	2020-05-17 15:57:59 +02:00
aap	4ab49780b5	collect HUD colors at top of file	2020-05-17 15:33:44 +02:00
aap	405a6fcbef	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-17 15:16:27 +02:00
aap	964acba083	fix head/hand atomics	2020-05-17 15:16:12 +02:00
aap	72ccf9a0db	revert accidental commit; also update librw	2020-05-17 14:21:09 +02:00
Sergeanur	37480fb617	Fix compilation errors	2020-05-17 00:33:52 +03:00
Sergeanur	77f97ad2ad	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimManager.cpp # src/audio/AudioManager.cpp	2020-05-16 23:58:44 +03:00
Sergeanur	ad0b99231e	Remove magic consts from ms_aAnimAssocDefinitions	2020-05-16 23:54:44 +03:00
Nikolay Korolev	5c8888d2ed	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 23:09:34 +03:00
Nikolay Korolev	b587d835e8	more script stuff	2020-05-16 23:06:33 +03:00
Sergeanur	4ff0697b4d	More small audio fixes	2020-05-16 21:00:27 +03:00
Sergeanur	13a0bf1c43	Move sound processors to AudioLogic.cpp, plus small fixes	2020-05-16 20:29:13 +03:00
Sergeanur	1a42d62d3a	Merge branch 'master' into miami ... # Conflicts: # premake5.lua # src/peds/Ped.cpp # src/peds/PedIK.cpp # src/peds/PedIK.h	2020-05-16 17:09:13 +03:00
Nikolay Korolev	e3291b0cb1	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
Sergeanur	dc5ece8327	Fix audio use of number instead of enum for CAR_ACCEL	2020-05-16 16:55:37 +03:00
aap	c54d3ba2ab	fixes for 64 bit build	2020-05-16 14:34:51 +02:00
eray orçunus	40ee29fb99	Weapon fixes	2020-05-16 15:07:09 +03:00
aap	793a6a6d7e	bla	2020-05-16 13:07:08 +02:00
Nikolay Korolev	7b89baceaa	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 14:01:58 +03:00
Nikolay Korolev	c33b93793f	new horn	2020-05-16 14:01:32 +03:00
aap	9558baa353	fixed CText to be 64 bit compatible	2020-05-16 12:52:37 +02:00
aap	b21f49ad6b	fixed CText to be 64 bit compatible	2020-05-16 12:51:54 +02:00
Nikolay Korolev	6556cb0db9	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 13:40:00 +03:00
Nikolay Korolev	4defd8b75c	minimal weather stuff + multiple bugfixes	2020-05-16 13:31:23 +03:00
aap	9dc5dca209	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02: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
aap	41e9754338	fixed hanging boot	2020-05-14 15:05:23 +02:00
aap	2fb4305a73	fixed hanging boot	2020-05-14 15:03:13 +02:00
aap	704a5c158f	Merge pull request #547 from Nick007J/master ... a few bugfixes	2020-05-14 14:39:23 +02:00
aap	c21061a199	fixed RotateTorso	2020-05-14 14:29:39 +02:00
Nikolay Korolev	b01987719e	fixed script error	2020-05-14 15:26:59 +03:00
Nikolay Korolev	8e0b132f43	it works differently	2020-05-14 14:03:56 +03:00
Nikolay Korolev	9d4d83db0d	some fixes	2020-05-14 14:01:24 +03:00
Nikolay Korolev	d031943f2a	more pedattractor	2020-05-14 13:46:11 +03:00
aap	9b162554ca	fixed skinned cutscene head	2020-05-14 12:32:51 +02:00
aap	f5345f59ea	blacklist for glfw "joysticks"	2020-05-14 00:09:45 +02:00
shfil	7036e80fc6	Fix calloc in CdStreamPosix	2020-05-13 17:48:07 +02:00
Nikolay Korolev	d426588496	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-13 17:55:12 +03:00
Nikolay Korolev	94bf7d9ea1	Merge remote-tracking branch 'upstream/master'	2020-05-13 17:34:09 +03:00
Nikolay Korolev	1237941180	fixed traffic lights	2020-05-13 17:33:50 +03:00
Sergeanur	3f1001b86b	More save/load alignment fixes	2020-05-13 16:24:00 +03:00
Nikolay Korolev	509d57edcb	car control and cranes fixes	2020-05-13 13:29:17 +03:00
Nikolay Korolev	81ea6f0258	ped attractor: start	2020-05-13 11:38:05 +03:00
Sergeanur	7aeac06fdb	Redoing some pool reading for better alignment	2020-05-13 05:31:14 +03:00
Sergeanur	4ac53960f5	Changing save/load for CPlayerInfo because of alignment crap	2020-05-13 03:43:20 +03:00
Filip Gawin	a0b3117ee4	Revert to memcpy	2020-05-13 02:01:42 +02:00
Sergeanur	7c2b9478d5	Merge branch 'master' into miami ... # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp	2020-05-13 00:55:52 +03:00
Sergeanur	33dfaf7da1	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp	2020-05-13 00:27:15 +03:00
Filip Gawin	c2ac6b3759	Fix linux warnings	2020-05-12 23:18:54 +02:00
Nikolay Korolev	c40fcdf39a	fix shotgun	2020-05-12 22:48:28 +03:00
aap	bcd2f8c64c	remove debug shit	2020-05-12 20:44:37 +02:00
Nikolay Korolev	dc444b9ca0	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-12 20:31:23 +03:00
Nikolay Korolev	180a1dc42b	Merge remote-tracking branch 'upstream/master'	2020-05-12 20:23:03 +03:00
Nikolay Korolev	615bd1e878	garages fix	2020-05-12 20:22:35 +03:00
aap	98a233da43	little fixes to CClouds; disabled object clipping for SA cam	2020-05-12 16:36:23 +02:00
aap	40829b5242	CClouds; disabled object clipping for SA cam	2020-05-12 16:27:39 +02:00
Nikolay Korolev	ca6ed7f00f	fix garages	2020-05-12 16:21:00 +03:00
Nikolay Korolev	4b566c26a3	fix garages	2020-05-12 14:08:42 +03:00
Nikolay Korolev	1afe36d0d0	fix garages	2020-05-12 14:07:47 +03:00
aap	fab453efde	fixed bug in cutscene head	2020-05-12 09:45:01 +02:00
Sergeanur	8f1a2825d4	Remove odd calculations for bullet hit smoke	2020-05-12 04:31:11 +03:00
Nikolay Korolev	9647587447	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-12 02:00:26 +03:00
Nikolay Korolev	3e64274f6b	more script	2020-05-12 01:59:35 +03:00
erorcun	5f40f06bf0	Merge pull request #533 from erorcun/master ... Linux build support	2020-05-12 00:33:13 +03:00
aap	ce2071e1e6	Merge pull request #535 from Nick007J/miami ... garages, carctrl, script	2020-05-11 23:28:52 +02:00
aap	70a8234dad	RenderPedCB from VC	2020-05-11 22:24:53 +02:00
aap	0eb5f93e96	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-11 22:21:26 +02:00
aap	6e4710b717	CVisibilityPlugins	2020-05-11 22:21:18 +02:00
Nikolay Korolev	9b23e33c36	sync with upstream	2020-05-11 21:21:09 +03:00
Sergeanur	5f1c3fa208	Merge remote-tracking branch 'origin/miami' into miami	2020-05-11 21:07:36 +03:00
Sergeanur	0aa7f13c32	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h	2020-05-11 21:07:12 +03:00
Nikolay Korolev	5f5babe7fe	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-11 21:05:01 +03:00
Nikolay Korolev	8fae2dcc26	garages + script	2020-05-11 21:04:35 +03:00
eray orçunus	36e2bc95d3	Fix Windows build and premake	2020-05-11 20:10:01 +03:00
eray orçunus	8a4fa58cd4	Linux build support	2020-05-11 21:00:55 +03:00
aap	95920d54f2	random fixes	2020-05-11 17:04:08 +02:00
aap	d4250fc2c7	CRenderer	2020-05-11 17:03:44 +02:00
aap	b11715608f	few fixes	2020-05-11 09:18:41 +02:00
aap	ad90a06a39	little fix for cam	2020-05-11 09:18:21 +02:00
erorcun	c66c45f4c8	Merge pull request #509 from Fire-Head/master ... OpenAL update	2020-05-11 03:23:36 +03:00
Nikolay Korolev	2f085ea5f5	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-11 01:00:50 +03:00
Nikolay Korolev	2f979a8cde	some changes	2020-05-11 01:00:41 +03:00
aap	198b80f560	RpAnimBlend and frame updates	2020-05-10 23:47:53 +02:00
aap	9e842f1628	vehicle model descriptions; a bit of heli code	2020-05-10 20:51:29 +02:00
aap	7919b92d28	force load weapons as long as we dont stream em yet	2020-05-10 19:09:49 +02:00
aap	d9a8bab631	update file loader for new VC fields	2020-05-10 18:14:14 +02:00
bigbossbro08	bd302ecca1	Merge remote-tracking branch 'upstream/master'	2020-05-10 22:05:45 +06:00
bigbossbro08	b4abb6ddd8	fixed few more typos	2020-05-10 22:04:36 +06:00
bigbossbro08	c798e1bacd	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
Nikolay Korolev	653d808417	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-10 18:26:13 +03:00
aap	5b605c1271	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
aap	0552d49fce	CVehicleModelInfo	2020-05-10 17:09:14 +02:00
Nikolay Korolev	00cdcef36a	some updates for script	2020-05-10 17:54:13 +03:00
bigbossbro08	af6e132b37	defined out asserts.	2020-05-10 19:54:37 +06:00
Nikolay Korolev	512f5657f7	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-10 15:24:09 +03:00
Nikolay Korolev	61eb361d26	script changes	2020-05-10 15:23:56 +03:00
aap	f7aa4e108a	added some anim groups	2020-05-10 14:22:22 +02:00
aap	f7300c7a27	CPedModelInfo	2020-05-10 13:08:02 +02:00
Nikolay Korolev	4b892e9eb9	fix boats	2020-05-10 13:20:01 +03:00
Nikolay Korolev	662246b9e2	fix boat	2020-05-10 12:56:13 +03:00
Nikolay Korolev	1f3f82eedc	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-10 12:37:43 +03:00
aap	58d9e9cd59	CSimpleModelInfo	2020-05-10 11:34:26 +02:00
Nikolay Korolev	a827f0dd55	sync with upstream	2020-05-10 12:26:32 +03:00
Nikolay Korolev	2f7d2fa3ad	more car control	2020-05-10 12:25:30 +03:00
aap	1b936f6ffb	CClumpModelInfo; little fixes	2020-05-10 11:20:27 +02:00
aap	f0442960a2	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-10 10:04:27 +02:00
aap	e9fbd2ccfd	CWeaponModelInfo	2020-05-10 10:04:20 +02:00
Sergeanur	35c41208f5	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h	2020-05-10 01:26:12 +03:00
Sergeanur	d9a3533438	Small unification	2020-05-10 01:14:00 +03:00
Nikolay Korolev	9fce6c4ed3	car control fixes	2020-05-09 22:24:31 +03:00
Nikolay Korolev	3de003a8e7	new curves + boat fix	2020-05-09 22:11:40 +03:00
Nikolay Korolev	5fd8eec42c	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-09 20:30:05 +03:00
aap	c020992e4d	back to ped.ifp	2020-05-09 19:29:31 +02:00
Nikolay Korolev	609caad7a4	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-09 20:21:36 +03:00
Nikolay Korolev	a55e738dfa	ccarctrl big fix	2020-05-09 20:21:13 +03:00
aap	f23ecfbc84	accidentally swapped reft and light	2020-05-09 17:29:13 +02:00
aap	97d5698e0c	peds starting to work	2020-05-09 17:05:26 +02:00
Sergeanur	28103775ba	Place debug menu under ifdef	2020-05-09 16:06:13 +03:00
Sergeanur	1b599b2d35	Fix compilation error	2020-05-09 15:41:00 +03:00
aap	989ded6052	removed cutscene heads	2020-05-09 13:00:39 +02:00
aap	36e1f7b4fb	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-09 13:00:07 +02:00
eray orçunus	b80c4bae6b	Menu map fixes and resizable window on GLFW	2020-05-09 13:58:31 +03:00
aap	ea053467b5	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-09 12:45:27 +02:00
aap	40cfd0576f	Merge pull request #526 from Nick007J/miami ... GenerateOneRandomCar except bikes	2020-05-09 12:45:25 +02:00
erorcun	ce4996b09c	Merge pull request #527 from erorcun/erorcun ... Menu map fixes and resizable window on GLFW	2020-05-09 13:44:43 +03:00
eray orçunus	f754da272f	Menu map fixes and resizable window on GLFW	2020-05-09 13:43:08 +03:00
aap	d26ffdd05f	fixes for anims	2020-05-09 12:04:48 +02:00
aap	e8c0619226	named anim assoc flags	2020-05-09 09:51:31 +02:00
aap	633c2a7aeb	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-09 09:50:08 +02:00
aap	3f09ec0744	named anim assoc flags	2020-05-09 09:50:00 +02:00
Sergeanur	4b8d6a3223	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssocGroup.cpp # src/animation/AnimBlendAssociation.cpp # src/animation/AnimManager.cpp # src/core/Streaming.cpp	2020-05-09 02:56:53 +03:00
Sergeanur	d686f587cc	Merge remote-tracking branch 'origin/master'	2020-05-09 02:51:40 +03:00
Sergeanur	e917cd1f46	Fix corona scaling	2020-05-09 02:50:48 +03:00
Nikolay Korolev	e30b538cd3	fix	2020-05-09 00:07:35 +03:00
Nikolay Korolev	46d891b745	fix	2020-05-09 00:00:06 +03:00
Nikolay Korolev	3d394c2f95	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-08 23:30:04 +03:00
Nikolay Korolev	7e753c2596	CCarCtrl::GenerateOneRandomCar	2020-05-08 23:29:43 +03:00
aap	10cade9f60	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-08 20:58:48 +02:00
aap	f12e76fa13	more small fixes	2020-05-08 20:58:40 +02:00
aap	08de6d487a	anims streaming	2020-05-08 20:56:42 +02:00
Nikolay Korolev	f902136b6a	fix	2020-05-08 18:50:16 +03:00
Nikolay Korolev	75943a57b2	gang	2020-05-08 18:48:44 +03:00
Sergeanur	1ef8d61f36	Merge branch 'master' into miami	2020-05-08 17:49:19 +03:00
Nikolay Korolev	756e4dd068	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-08 17:06:25 +03:00
Nikolay Korolev	6065f5e52b	fix	2020-05-08 17:05:54 +03:00
aap	2eee4c5176	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
Nikolay Korolev	c11a20cb4f	zone info commands + fix	2020-05-08 16:16:46 +03:00
Sergeanur	e0b3418e65	Fix water UV on high FPS and inverted free camera	2020-05-08 14:34:21 +03:00
Nikolay Korolev	fb1f51241d	fix	2020-05-08 13:41:28 +03:00
Nikolay Korolev	db26700352	final fix	2020-05-08 11:49:40 +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
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
Fire-Head	875c77e8b1	oal update	2020-05-07 10:13:59 +03:00
Fire-Head	12a3499ca3	oal wav/mp3 stream update	2020-05-07 09:26:16 +03: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	599b7301c8	script stubs + REQUEST_COLLISION	2020-05-06 21:15:58 +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	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
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
Sergeanur	c0488d9ecf	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/User.cpp # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/core/Zones.h # src/entities/Entity.cpp	2020-05-06 14:10:52 +03:00
aap	e0568a19d5	new zone stuff	2020-05-06 12:23:57 +02:00
aap	cbfc45b3f7	some work on zones	2020-05-06 12:23:26 +02:00
Nikolay Korolev	98177f27ba	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 11:38:02 +03:00
aap	edd9301d7f	reverting fuckup	2020-05-06 09:59:04 +02:00
aap	8e84728f41	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-06 09:24:18 +02:00
aap	bb0541404d	updated librw	2020-05-06 09:24:12 +02:00
aap	ed021431e9	updated librw	2020-05-06 09:23:31 +02:00
aap	31f9bb566b	implemented most of timecycle and mblur	2020-05-06 00:53:26 +02:00
Nikolay Korolev	a7036475c3	not needed	2020-05-06 01:16:54 +03:00
Nikolay Korolev	e5da4c2b4d	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 01:11:18 +03:00
Nikolay Korolev	0b104a59fe	script colstore stuff	2020-05-06 01:11:06 +03:00
aap	68d3ea9c42	getting the vice city map to work	2020-05-05 23:27:43 +02:00
Nikolay Korolev	35bf340401	colstore support in script	2020-05-06 00:21:26 +03:00
Nikolay Korolev	1291dd534b	script stuff	2020-05-05 21:45:43 +03:00
Nikolay Korolev	f45ea0a1cf	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-05 20:22:17 +03:00
Nikolay Korolev	918d6dbf56	some more miami	2020-05-05 20:22:13 +03:00
aap	7428590457	some miami limits	2020-05-05 18:31:53 +02:00
aap	e81652c2fc	cleaned up MIAMI ifdefs	2020-05-05 18:06:38 +02:00
Nikolay Korolev	6b4b708fa7	skipped one def	2020-05-05 19:06:24 +03:00
Sergeanur	22e8b0e419	Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL" ... This reverts commit 1eb817de77. # Conflicts: # src/core/Game.cpp	2020-05-05 18:34:46 +03:00
Sergeanur	12fbf8cede	Merge branch 'master' into miami ... # Conflicts: # src/core/Game.cpp	2020-05-05 18:33:32 +03:00
Sergeanur	1eb817de77	Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL	2020-05-05 18:32:46 +03:00
Nikolay Korolev	edeb8736f1	remove ifdefs	2020-05-05 18:20:10 +03:00
Sergeanur	0163a7bc46	Remove ColStore	2020-05-05 18:13:46 +03:00
Sergeanur	cb8ffbac73	Revert "Remove #endif" ... This reverts commit 7200a783ee.	2020-05-05 18:07:43 +03:00
Sergeanur	74b522af71	Merge branch 'master' into miami	2020-05-05 18:07:33 +03:00
Sergeanur	7200a783ee	Remove #endif	2020-05-05 18:07:08 +03:00
Sergeanur	c2b9ddc5b8	Revert "Remove Miami stuff" ... This reverts commit 9960c41193.	2020-05-05 18:04:43 +03:00
Sergeanur	9960c41193	Remove Miami stuff	2020-05-05 18:04:18 +03:00
Sergeanur	dfe0642195	Merge pull request #512 from Nick007J/master ... MIAMI CAutoPilot + CCarAI + multiple fixes	2020-05-05 17:14:13 +03:00