3134 Commits

Author	SHA1	Message	Date
aap	3d46f2a3af	fixed bike collision damage	2020-11-12 20:05:02 +01:00
erorcun	4f8029ad7c	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-11-12 17:37:04 +03:00
erorcun	b67ed1988f	Peds: Remove redundant lines	2020-11-12 17:36:41 +03:00
Nikolay Korolev	55c9a81922	fixed zone bug	2020-11-12 17:32:16 +03:00
aap	90b624a3e0	Merge pull request #812 from Nick007J/miami ... CWorld done + top gear fix	2020-11-12 11:40:19 +01:00
Sergeanur	feeab0b74a	Fix ini reader	2020-11-11 20:57:44 +02:00
aap	0115b0827b	fix wrong blend mode (original bug)	2020-11-11 19:10:22 +01:00
aap	79432dce20	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-11-11 14:42:12 +01:00
aap	ff44f29616	ped fix for new renderer	2020-11-11 14:42:02 +01:00
Nikolay	a76c6b2307	damn	2020-11-11 13:40:11 +03:00
Nikolay	984708dfd3	damn	2020-11-11 13:36:10 +03:00
Nikolay	a8b5303207	Update src/control/Pickups.cpp ... Co-authored-by: Sergeanur <s.anureev@yandex.ua>	2020-11-11 13:19:21 +03:00
erorcun	67e57d1368	Fix RestoreDef crash	2020-11-11 13:08:22 +03:00
Nikolay Korolev	35874b5fd2	fix	2020-11-11 12:27:40 +03:00
Nikolay Korolev	a67d4c70d7	Merge remote-tracking branch 'upstream/miami' into miami	2020-11-11 12:22:57 +03:00
Nikolay Korolev	be92957328	fixed top gear	2020-11-11 12:21:30 +03:00
aap	546ed0ff07	changes to RW layer so loading foreign files works	2020-11-11 09:42:30 +01:00
aap	48d0653331	urgh, merge and changes to RW layer in one commit.	2020-11-11 09:38:33 +01:00
Nikolay Korolev	612a6dd06c	Merge remote-tracking branch 'upstream/miami' into miami	2020-11-11 00:08:54 +03:00
Nikolay Korolev	ef2089cafb	CWorld done	2020-11-11 00:08:32 +03:00
Sergeanur	5c64dba65a	Merge pull request #771 from theR4K/miamiDev ... more audio for god of audio	2020-11-10 22:32:12 +02:00
erorcun	460f3cea44	Frontend: Scroll for All, some care for PS2-like menu ... Don't show Back button on PS2-like menu Removed PS2-style reversed fade-in, because it was a hack and taking too much space	2020-11-10 02:07:02 +03:00
erorcun	59f9c009ef	Font: Hud: Use orig. text dimensions, fix right-align calculations	2020-11-10 01:50:34 +03:00
majestic	cf6a9a8341	CGlass indices fix	2020-11-09 06:18:49 -08:00
Sergeanur	51e7f44433	Pickup fix	2020-11-08 22:40:05 +02:00
Roman Masanin	c91d5a90a1	easy way to safe few petaseconds	2020-11-08 23:29:57 +03:00
Sergeanur	23d294fef5	Possibly fix pickup money text	2020-11-08 21:59:13 +02:00
Roman Masanin	fb2173c396	to make Serge and _R4K_ happy	2020-11-08 22:33:30 +03:00
Roman Masanin	363a2c6098	marked stupied code(dotProduct and AudioEvents)	2020-11-08 22:26:14 +03:00
Roman Masanin	612bd98039	return bad code, becouse no one knows what to do with it	2020-11-08 21:30:03 +03:00
Roman Masanin	0853a47a3f	returned bad code, becouse no one knows what to do with it	2020-11-08 21:23:29 +03:00
erorcun	f8367ebdef	Revert "Font: Fix text dimensions" ... This reverts commit 6729de49b1.	2020-11-08 21:11:55 +03:00
Roman Masanin	279acfae59	pointers to referencies too	2020-11-08 20:50:46 +03:00
erorcun	fe5d0c9cdf	Font: Hud: Use orig. text dimensions, fix right-align calculations	2020-11-08 20:49:47 +03:00
Roman Masanin	e269809bfd	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-11-08 20:32:31 +03:00
Roman Masanin	95bd5b073a	pointers into referencies!	2020-11-08 20:31:24 +03:00
Roman Masanin	a553ac8716	fix for merge fix	2020-11-08 17:49:10 +03:00
Roman Masanin	f8cc86c227	fix merge	2020-11-08 16:23:20 +03:00
Roman Masanin	23d23f6462	merge upstream	2020-11-08 16:23:05 +03:00
Sergeanur	a2e0373d22	Pickups fix	2020-11-08 15:00:54 +02:00
erorcun	c96ffb05b1	Merge pull request #809 from erorcun/master ... Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults	2020-11-07 23:51:07 +03:00
erorcun	163c12608f	Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults	2020-11-07 21:58:23 +03:00
Sergeanur	7f4498e0f0	Check if buttons txd exsist	2020-11-07 20:54:38 +02:00
Sergeanur	7ede8685ec	Ped comments fixes	2020-11-07 14:39:53 +02:00
Sergeanur	3b81eaa2d7	Fix cAudioManager::GetPhrase	2020-11-07 13:55:55 +02:00
aap	092f32ba67	move stuff into define	2020-11-07 12:52:11 +01:00
Filip Gawin	e24513d2ad	Sfx audio logic	2020-11-06 18:42:52 +01:00
Filip Gawin	f442793d20	Allow to handle larger files via 64bit variables	2020-11-06 18:42:28 +01:00
withmorten	bd78b5ff4e	add bInvertLook4Pad from VC (doesn't get saved yet)	2020-11-05 19:57:13 +01:00
aap	ee8366adba	RwRenderStateGet	2020-11-05 17:46:28 +02:00
aap	8614f68620	RwRenderStateGet	2020-11-05 16:42:57 +01:00
Sergeanur	8224a6a381	Button icons	2020-11-05 17:05:16 +02:00
Sergeanur	5a59542679	Fix inverted vertical camera	2020-11-05 16:38:41 +02:00
aap	0d55b6182a	Merge pull request #795 from withmorten/master ... enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds # Conflicts: # premake5.lua # src/core/config.h	2020-11-05 16:38:02 +02:00
aap	881a3e1091	Merge pull request #795 from withmorten/master ... enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds	2020-11-05 10:59:02 +01:00
aap	67c894cda9	more fixes to new renderer	2020-11-04 23:11:27 +01:00
aap	0662de5323	fixed vehicle and ped sorting for new renderer	2020-11-04 22:45:01 +01:00
aap	244b91ee80	fixed boats for new renderer	2020-11-04 16:22:15 +01:00
Roman Masanin	89b622eea8	FORMAT	2020-11-04 11:37:17 +03:00
aap	e1279b01bc	forget ifdef	2020-11-03 20:40:33 +01:00
aap	6857e26411	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-11-03 20:33:14 +01:00
aap	3c5bb4e8f3	new LCS-style renderer	2020-11-03 20:33:07 +01:00
aap	b3da518ae0	only do backface culling on buildings	2020-11-03 16:59:37 +01:00
aap	ebddb7956c	fix mistake in custom menu; update librw	2020-11-03 14:37:00 +01:00
Sergeanur	f08b9cf033	fix build	2020-11-03 15:00:48 +02:00
erorcun	770a1f8012	Merge pull request #789 from erorcun/master ... rewrite CFO + postfx/pipeline options	2020-11-03 01:43:53 +03:00
Nikolay Korolev	e473123a6a	fixes	2020-11-03 00:07:25 +03:00
Nikolay Korolev	0ccc70c843	embarassing	2020-11-02 23:53:52 +03:00
Sergeanur	d4c26396c7	Fix MemoryCard.cpp	2020-11-02 18:17:37 +02:00
Filip Gawin	1df6dda546	Add basic support for cmake on linux	2020-11-02 17:07:04 +01:00
aap	8acc98563e	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-11-02 13:57:58 +01:00
aap	7041f11987	bike bug	2020-11-02 13:57:51 +01:00
Nikolay Korolev	bae6c24209	fix	2020-11-02 15:54:42 +03:00
shfil	e587974759	Fix include in Frontend_PS2.cpp	2020-11-02 13:31:25 +01:00
Roman Masanin	174424c520	fix serviceSoundEffects an cleanup	2020-11-02 12:05:23 +03:00
Roman Masanin	fad0a9507d	some "optimizations". same like I did in VC	2020-11-01 23:48:03 +03:00
Roman Masanin	cebf32c46c	mark code	2020-11-01 23:38:45 +03:00
Roman Masanin	5ea9285c5b	changes in switch, and mark code	2020-11-01 22:42:45 +03:00
Roman Masanin	55c4346610	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev	2020-11-01 22:35:46 +03:00
Nikolay Korolev	5edd9e75da	finished script and replay	2020-11-01 18:21:05 +03:00
Nikolay Korolev	45c09224f7	fixed KYFC	2020-11-01 16:34:39 +03:00
Nikolay Korolev	370d693f9d	the driver fix	2020-11-01 15:15:23 +03:00
Sergeanur	30d1cbfecd	Fix the goddamn spaces for tabs master race	2020-11-01 13:46:12 +02:00
Sergeanur	37943a87cb	Show Xbox buttons when playing with a controller	2020-11-01 13:42:02 +02:00
Nikolay Korolev	63a27fbc5f	overflow fix	2020-11-01 13:55:29 +03:00
Sergeanur	db84afd263	Revert	2020-11-01 12:31:37 +02:00
Sergeanur	1f5a6dab67	Revert	2020-11-01 12:30:23 +02:00
aap	b8b3292161	Merge pull request #791 from majesticCoding/miami ... CObject::Render	2020-11-01 10:40:30 +01:00
Nikolay Korolev	f21cfef8fb	remove autosave at end of mission under MISSION_REPLAY	2020-11-01 12:33:16 +03:00
aap	9598a90627	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-11-01 10:29:37 +01:00
aap	7f5806b727	tiny cleanup	2020-11-01 10:29:28 +01:00
Sergeanur	20ea2fde84	Also fix SetModelIndex in CAutomobile and CTrain ctors	2020-11-01 09:46:25 +02:00
Sergeanur	5711251b0f	Also fix SetModelIndex in CAutomobile and CTrain ctors	2020-11-01 09:46:02 +02:00
Sergeanur	3c4f166a82	Fix virtual SetModelIndex call in CBoat ctor	2020-11-01 09:34:10 +02:00
majestic	c124e7381c	CObject::Render	2020-11-01 00:25:35 -07:00
Sergeanur	d370c2076d	Fix virtual SetModelIndex call in CBoat ctor	2020-11-01 09:20:37 +02:00
withmorten	e9735f928f	add ifdef LIBRW guard for pipelines and colourfilter	2020-11-01 01:09:46 +01:00
aap	30c0f26f17	fix sniper crosshair	2020-10-31 22:09:43 +01:00
aap	32c1135cd4	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-10-31 22:08:43 +01:00
aap	9203a33646	fix sniper/camera crosshair	2020-10-31 22:07:58 +01:00
aap	3665a82418	Merge pull request #792 from withmorten/master ... fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ... # Conflicts: # src/core/Frontend.cpp	2020-10-31 19:21:10 +02:00
aap	6eef54e3fc	Merge pull request #792 from withmorten/master ... fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...	2020-10-31 17:06:25 +01:00
aap	7d64698322	foobar!	2020-10-31 14:45:26 +01:00
aap	ea5b86774d	couple of fixes and cleanup	2020-10-31 14:33:49 +01:00
Sergeanur	0e1257cf17	Disable loading screen	2020-10-30 20:32:41 +02:00
erorcun	ded7c89602	Update MenuScreensCustom.cpp	2020-10-30 17:36:13 +03:00
erorcun	7784ba052e	Update config.h	2020-10-30 17:24:20 +03:00
Sergeanur	b8d2c4e452	Add VB file list	2020-10-30 10:34:13 +02:00
withmorten	d34d591ed3	fix draw menu version text ifdef location	2020-10-29 19:53:23 +01:00
withmorten	57b01ac476	NO_MOVIES and DEBUGMENU not for MASTER	2020-10-29 19:23:59 +01:00
aap	317393d763	few more fixes to last commit	2020-10-29 19:21:16 +01:00
withmorten	e95516032f	fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version text	2020-10-29 19:18:46 +01:00
aap	e97366c023	implemented extra model flags for backface culling and alpha test from mobile	2020-10-29 19:11:47 +01:00
erorcun	922d06ab1f	rewrite CFO + postfx/pipeline options	2020-10-28 15:05:04 +03:00
aap	81e462b677	Merge branch 'master' of github.com:GTAmodding/re3	2020-10-28 10:33:46 +01:00
aap	a5447306c4	fixed skin on player head	2020-10-28 10:33:27 +01:00
Sergeanur	86b1d9aea5	OpenAL channels now use their own sound buffers ... # Conflicts: # src/audio/sampman_oal.cpp	2020-10-28 10:09:59 +02:00
Fire-Head	f7b1ba4049	fix FireShotgun missing normalise	2020-10-28 03:10:53 +03:00
Fire-Head	e2dc1ba102	fix rainraindrop	2020-10-27 18:55:28 +03:00
aap	f1c935ac4c	stupid bug; update librw	2020-10-27 16:20:47 +01:00
aap	ee222d0384	stupid bug; update librw	2020-10-27 16:15:30 +01:00
aap	a4d198005d	boolean for extended pipelines ... (cherry picked from commit 78ac22ee2c)	2020-10-27 15:57:26 +01:00
aap	78ac22ee2c	boolean for extended pipelines	2020-10-27 15:55:07 +01:00
Sergeanur	4cfb3b0984	OpenAL channels now use their own sound buffers	2020-10-27 09:35:09 +02:00
erorcun	ba0c96c39c	Revert "(TEST) Try to fix OAL audio problems" ... This reverts commit 19cc6fafe0.	2020-10-27 00:40:12 +03:00
Sergeanur	d94b36c202	Fixes to OpenAL	2020-10-26 20:13:50 +02:00
Sergeanur	9a3758bfc1	Fix undefined colorId for pickups	2020-10-26 16:39:43 +02:00
Roman Masanin	c3cbf4353d	Fix build and use enum in ProcessPlayerMood	2020-10-26 14:02:11 +03:00
erorcun	19cc6fafe0	(TEST) Try to fix OAL audio problems	2020-10-26 12:35:24 +03:00
Roman Masanin	4bcd176944	fix merge	2020-10-26 00:17:21 +03:00
Roman Masanin	44bbcbd14a	merge upstream	2020-10-26 00:16:46 +03:00
Roman Masanin	96ccb1333b	cleanup processVehicleOneShots, processVehicleX done	2020-10-26 00:14:59 +03:00
Roman Masanin	04b841c719	processVehicleOneShots	2020-10-26 00:11:04 +03:00
erorcun	6729de49b1	Font: Fix text dimensions	2020-10-25 20:57:24 +03:00
Nikolay Korolev	3bdc974ff5	small glass fix	2020-10-25 20:53:05 +03:00
aap	adfa2645bf	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-10-25 16:17:43 +01:00
aap	537c0960fe	clean up timebar ifdefs	2020-10-25 16:17:31 +01:00
aap	e3a1041a47	clean up timebar ifdefs	2020-10-25 16:17:30 +01:00
erorcun	0a36629502	Finalize frontend sounds, player setup screen	2020-10-25 18:01:09 +03:00
Roman Masanin	211ab16ddb	skiding	2020-10-25 16:14:29 +03:00
erorcun	5b8437172a	Fix weapon icon drawing	2020-10-25 15:27:49 +03:00
Sergeanur	6647dd043d	Remove redundant includes	2020-10-25 13:08:28 +02:00
Sergeanur	83947e6958	Remove redundant includes	2020-10-25 13:07:44 +02:00
Sergeanur	e0394e6e69	Possible fix of linux build	2020-10-25 12:38:08 +02:00
Sergeanur	a520243563	cAudioManager::ProcessFrontEnd done	2020-10-25 12:00:57 +02:00
Sergeanur	6634410aee	Fix build	2020-10-25 09:50:17 +02:00
Sergeanur	93b318cfdf	DMAudio fixes	2020-10-25 09:42:24 +02:00
Sergeanur	aac0c3fb67	DMAudio fixes	2020-10-25 09:40:11 +02:00
erorcun	de09a80a35	Messages fix and update librw	2020-10-25 01:21:18 +03:00
erorcun	5e5854b914	Fix bindings not loaded on Linux	2020-10-25 01:10:03 +03:00
erorcun	d0e80e8c97	librw update	2020-10-24 23:56:21 +03:00
Sergeanur	d1394c6994	Fix WindModifiers	2020-10-24 22:28:44 +03:00
Roman Masanin	a12789c632	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev	2020-10-24 22:26:56 +03:00
Roman Masanin	63c7df9f09	mark reflections done	2020-10-24 22:26:45 +03:00
Roman Masanin	c4707fe887	fix merging errors	2020-10-24 22:06:45 +03:00
erorcun	92ae468e00	Messages and CameraSize fix	2020-10-24 21:56:04 +03:00
Sergeanur	04845a72bc	Model indices edits	2020-10-24 21:33:15 +03:00
Roman Masanin	a9db60a1d9	jumbo	2020-10-24 20:47:03 +03:00
Roman Masanin	beae41b207	fires	2020-10-24 19:43:11 +03:00
erorcun	29a2d810a7	WaterLevel (Beachtoys)	2020-10-24 19:31:18 +03:00
Roman Masanin	19ffb9c8df	model heli	2020-10-24 19:24:48 +03:00
Adrian Graber	28fb26f792	Join CdStream threads to wait for them to exit	2020-10-24 18:14:41 +03:00
erorcun	07d1637342	Merge pull request #779 from Sergeanur/VC/Pickups ... Pickups Done	2020-10-24 17:56:21 +03:00
erorcun	088065e0a8	Merge pull request #778 from majesticCoding/miami ... Fluff done, FireInstantHit fix	2020-10-24 17:56:03 +03:00
erorcun	0913abe616	Merge pull request #780 from Sergeanur/VC/ObjectData ... ObjectData	2020-10-24 17:55:40 +03:00
Adrian Graber	a32c390a95	Join CdStream threads to wait for them to exit	2020-10-24 16:12:10 +02:00
Sergeanur	3d14097bf6	Fix playback of vanilla opus	2020-10-24 16:37:39 +03:00
Sergeanur	a492f8ba0d	Fix playback of vanilla opus	2020-10-24 16:37:14 +03:00
Roman Masanin	39b7075502	merge Upstream	2020-10-24 14:20:08 +03:00
Sergeanur	a0efb89aa0	more ScriptSounds	2020-10-23 18:35:37 +03:00
majestic	6a89fe401a	Fluff done, FireInstantHit fix	2020-10-23 07:51:24 -07:00
Sergeanur	ca497e2cbd	ScriptSounds	2020-10-23 16:56:34 +03:00
Sergeanur	d7b9884f9d	Use audio enum	2020-10-23 16:18:46 +03:00
Sergeanur	1544683bdc	Missed nil	2020-10-23 13:23:42 +03:00
Sergeanur	9f692ea3ab	Missed nil	2020-10-23 13:23:05 +03:00
Sergeanur	d237bb694b	Small CPedModelInfo fixes	2020-10-23 13:11:51 +03:00
Sergeanur	f8a7f47fde	Small CPedModelInfo fixes	2020-10-23 13:06:40 +03:00
Sergeanur	89a7007c6a	ObjectData	2020-10-23 08:41:23 +03:00
Sergeanur	281e45ce01	Timer fix	2020-10-23 08:38:36 +03:00
erorcun	067200dd7e	mr.casepath 2	2020-10-23 04:37:01 +03:00
erorcun	08d78fb6ff	Timer, main	2020-10-23 04:26:52 +03:00
erorcun	1587815fca	satisfy mr.casepath	2020-10-23 04:25:55 +03:00
erorcun	bedc066cfd	mr.casepath	2020-10-23 01:56:32 +03:00
Sergeanur	1cdc647324	Fix argument type	2020-10-22 22:05:50 +03:00
Sergeanur	86a7d4415b	Fix argument type	2020-10-22 22:04:12 +03:00
Sergeanur	ee61f19253	Police Radio + fixes	2020-10-22 12:38:09 +03:00
Sergeanur	94f0ecfa21	Police Radio fixes	2020-10-22 12:36:47 +03:00
erorcun	70f625d211	Message fix	2020-10-21 21:39:57 +03:00
erorcun	86002b093f	EmergencyPed, PedDebug, message fix	2020-10-21 21:27:13 +03:00
Sergeanur	bd8d8b53a3	CTempColModels small fix	2020-10-21 21:26:10 +03:00
Sergeanur	ff2665942e	CTempColModels stuff	2020-10-21 21:24:18 +03:00
Sergeanur	2709531f09	Rename CObject flag	2020-10-21 21:14:40 +03:00
Sergeanur	e9a89236a2	Pickups Done	2020-10-21 21:00:13 +03:00
Sergeanur	632569cff3	Pickup fixes	2020-10-21 19:48:13 +03:00
erorcun	0265804003	Cross-platform fix and a little style change	2020-10-21 03:55:35 +03:00
erorcun	af53267b74	Text and cross-platform fix	2020-10-21 03:11:10 +03:00
majestic	1fef3e106c	Fluff done	2020-10-20 16:03:41 -07:00
majestic	b36759b586	/c/Users/misha/Documents/GitHub/re3/src/render/Fluff.cpp /c/Users/misha/Documents/GitHub/re3/src/render/Fluff.h	2020-10-20 15:49:29 -07:00
erorcun	0750f04019	Messages, fix Font	2020-10-20 22:24:56 +03:00
erorcun	42fbe7572e	Messages, fix Font	2020-10-20 22:19:05 +03:00
Roman Masanin	0594ed5b46	peds	2020-10-18 23:03:03 +03:00
Nikolay Korolev	a1112183de	fix	2020-10-18 22:53:25 +03:00
Nikolay Korolev	6173e1dd10	fix	2020-10-18 22:52:49 +03:00
Nikolay Korolev	e2c29a3b28	fix	2020-10-18 22:15:44 +03:00
Nikolay Korolev	fb80236214	fixed ped attractor crash	2020-10-18 21:17:37 +03:00
Filip Gawin	7ae25761d5	Tweak comparison in CFallingGlassPane::Render	2020-10-18 19:57:39 +02:00
erorcun	0eb4aca1d6	Fix build	2020-10-18 20:09:55 +03:00
erorcun	1858904ce0	Merge pull request #769 from Sergeanur/VC/Pickups ... Partial Pickups	2020-10-18 20:01:32 +03:00
erorcun	10758088ef	Merge pull request #766 from Fire-Head/miami ... Glass	2020-10-18 19:59:11 +03:00
erorcun	70f9832e14	Merge branch 'miami' into miami	2020-10-18 19:45:11 +03:00
erorcun	497c179245	Merge pull request #772 from Nick007J/miami ... Original save/load support + bugfixes	2020-10-18 19:37:49 +03:00
erorcun	20ab7d1739	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-10-18 19:31:39 +03:00
erorcun	937290db09	Fix attractor even more	2020-10-18 19:31:02 +03:00
erorcun	a6aa782d6d	Fixes and style changes from miami	2020-10-18 19:16:37 +03:00
Sergeanur	8697eebbc2	Merge branch 'miami' into VC/Pickups ... # Conflicts: # src/control/Pickups.cpp	2020-10-18 17:17:11 +03:00
Sergeanur	0d20f1c364	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp	2020-10-18 17:15:49 +03:00
Sergeanur	cc0ae51631	lil fix	2020-10-18 16:55:11 +03:00
Sergeanur	b91f6a4550	Setter for bIsStatic (became virtual in SA)	2020-10-18 16:40:06 +03:00
erorcun	1b59b2c9bc	Attractor obj. fixes	2020-10-18 16:38:36 +03:00
Filip Gawin	23220d799c	Cleanup breaks CAutomobile::ProcessOpenDoor	2020-10-18 15:26:20 +02:00
Filip Gawin	747fe7ab67	Merge branch 'master' of github.com:GTAmodding/re3 into master	2020-10-18 15:14:03 +02:00
Filip Gawin	3594b35fbb	Add missing breaks in AudioLogic.cpp	2020-10-18 15:13:43 +02:00
Nikolay Korolev	8d92a0681a	fix in ped attractor	2020-10-18 15:39:27 +03:00
eray orçunus	ab071163e5	Fix ped buoyancy	2020-10-18 14:34:20 +03:00
eray orçunus	f60e3d667a	Minor things	2020-10-18 13:53:17 +03:00
shfil	cafe4e38db	Script.cpp missing breaks	2020-10-18 13:37:17 +03:00
Nikolay Korolev	c856d88691	object field renamed	2020-10-18 12:34:34 +03:00
Sergeanur	b3385015e5	Merge remote-tracking branch 'origin/miami' into VC/Pickups	2020-10-18 04:54:01 +03:00
shfil	82f54b946f	Script.cpp missing breaks	2020-10-18 00:56:07 +02:00
Roman Masanin	9cf38634b9	ProcessWaterCannon bug and refractoring (#773) ... * fix audio bug and some refractoring * mark original bugs	2020-10-17 20:56:42 +02:00
Roman Masanin	1e3aabf654	fix bugs	2020-10-17 21:30:48 +03:00
Nikolay Korolev	720abca826	finished save/load	2020-10-17 20:45:07 +03:00
Roman Masanin	3cbccd2ad3	typo fixes	2020-10-17 19:05:41 +03:00
Nikolay Korolev	cae3990eac	Merge remote-tracking branch 'upstream/miami' into miami	2020-10-17 18:50:41 +03:00
Nikolay Korolev	1195f3db7b	saves part 1	2020-10-17 18:50:16 +03:00
erorcun	4e4e0e8e04	Merge pull request #765 from erorcun/miami ... Radar, WaterCannon, win/glfw skels	2020-10-17 18:39:56 +03:00
Sergeanur	588fb26728	Fix player model not changing in cutscenes	2020-10-17 18:26:48 +03:00
eray orçunus	b84dc2bc9b	Fix management issue	2020-10-17 18:10:37 +03:00
eray orçunus	dc80884ab5	Fix management issue	2020-10-17 18:07:20 +03:00
Sergeanur	e465cea07b	Pickup arrays done	2020-10-17 18:05:23 +03:00
eray orçunus	b98864d134	Radar, WaterCannon, win/glfw skels	2020-10-17 17:35:26 +03:00
Sergeanur	7fc70179ed	Pickup save/load	2020-10-17 17:06:38 +03:00
Roman Masanin	eeee5012b7	model cars and other audio stuff	2020-10-17 16:57:36 +03:00
Sergeanur	7f3b51dd17	Small inner fix	2020-10-17 16:04:11 +03:00
Sergeanur	63666391d4	More Pickup stuff	2020-10-17 15:57:12 +03:00
Sergeanur	516a02d2da	Fix pickup fix :P	2020-10-17 15:33:22 +03:00
Sergeanur	ca64a49af1	fix build	2020-10-17 14:23:31 +03:00
Nikolay Korolev	0cf2c8505e	cranes done	2020-10-17 14:18:20 +03:00
Sergeanur	1f36b78c20	Pickup fixes	2020-10-17 13:48:08 +03:00
Nikolay Korolev	40434eadfd	small fix	2020-10-17 12:31:14 +03:00
Sergeanur	ef47dad566	Partial Pickups	2020-10-17 08:23:01 +03:00
Roman Masanin	97fc5224e7	road noise	2020-10-17 02:22:02 +03:00
Roman Masanin	894a1ae93a	siren and horn	2020-10-17 00:27:28 +03:00
Roman Masanin	63c2b98c5e	fix build	2020-10-15 16:04:03 +03:00
Roman Masanin	07143ee73b	SpecialFX fixes	2020-10-15 15:52:37 +03:00
Roman Masanin	34b4efe242	fix bullet traces rener and some renaming	2020-10-15 15:42:10 +03:00
Fire-Head	e4ac934dbf	Miami Glass	2020-10-15 00:33:57 +03:00
Sergeanur	a96146c87b	Pickup fix	2020-10-14 03:29:25 +03:00
erorcun	971b7cba65	Merge pull request #761 from erorcun/SampleMan ... SampleManager	2020-10-13 13:18:49 +03:00
shfil	3b40e003ab	Fix typo in fire.cpp	2020-10-12 22:51:49 +02:00
Fire-Head	1e068aea73	fix AskForObjectToBeRenderedInGlass	2020-10-12 23:10:08 +03:00
Sergeanur	6450fd2692	Fix zone saving on 64 bit	2020-10-12 22:54:46 +03:00
erorcun	1e11c1eac6	Merge pull request #762 from Nick007J/miami ... Control update	2020-10-12 21:52:59 +03:00
Roman Masanin	a4fd1a9f39	sirenes and more marks for audio. also fix cAudioMrg size	2020-10-12 20:55:19 +03:00
erorcun	4e07297503	Update sampman_miles.cpp	2020-10-12 20:51:52 +03:00
eray orçunus	342da2430b	Merge branch 'miami' of https://github.com/GTAmodding/re3 into new	2020-10-12 20:47:34 +03:00
eray orçunus	3772be32bf	Streaming and cross-platform fixes	2020-10-12 20:41:13 +03:00
eray orçunus	be6b97b5d8	Streaming and cross-platform fixes	2020-10-12 20:30:49 +03:00
eray orçunus	d18a55f429	SampleManager	2020-10-12 20:22:39 +03:00
Roman Masanin	e34261d3ef	mark some audio stuff and fix frameCounter	2020-10-12 18:09:58 +03:00
Roman Masanin	417646819c	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-10-12 13:42:57 +03:00
Roman Masanin	56bb7d721a	mark file and fix screen offset	2020-10-12 13:41:57 +03:00
Roman Masanin	e6a1ea9d4f	CBrightLight::render	2020-10-12 13:28:06 +03:00
erorcun	96f36d16ae	Merge pull request #753 from majesticCoding/miami ... CWaterCreatures	2020-10-12 12:37:47 +03:00
eray orçunus	40020f4e1e	Fix forgotten wanted/busted text	2020-10-12 12:36:15 +03:00
eray orçunus	b1e235535c	Cutscene aspect ratio fix	2020-10-12 12:16:24 +03:00
Nikolay Korolev	49c48f2ec2	sync with upstream	2020-10-12 12:11:53 +03:00
erorcun	9e0b23f065	Merge pull request #758 from erorcun/miami ... Hud, Fire, OnscreenBlaBla	2020-10-12 11:13:46 +03:00
eray orçunus	8a622a0e72	Hud, Fire, OnscreenBlaBla	2020-10-12 06:42:54 +03:00
Sergeanur	239e09ad07	Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad ... Zones saving and loading	2020-10-12 04:16:30 +03:00
Roman Masanin	ca1d899413	final step	2020-10-11 22:29:49 +03:00
Roman Masanin	7a3e1ef19a	SpecialFX almost done	2020-10-11 21:40:11 +03:00
Nikolay Korolev	28b47b601f	fix	2020-10-11 18:14:35 +03:00
Nikolay Korolev	91a274da2b	small fix	2020-10-11 13:11:25 +03:00
Nikolay Korolev	68779a4dac	small fix	2020-10-11 13:05:41 +03:00
Nikolay Korolev	49ad471b2d	removed extra header	2020-10-11 12:58:23 +03:00
Nikolay Korolev	552f308e9e	sync with upstream	2020-10-11 12:58:11 +03:00
Nikolay Korolev	c4d4821327	Control updates	2020-10-11 12:56:33 +03:00
Sergeanur	b0becb5a2d	UnicodeMakeUpperCase move + arg fix	2020-10-11 10:39:04 +03:00
Sergeanur	9dba2386bb	Merge branch 'master' into VC/TextFinish ... # Conflicts: # src/text/Text.cpp	2020-10-11 10:34:47 +03:00
Sergeanur	43af5d9c1f	Merge branch 'miami' into VC/TextFinish	2020-10-11 10:33:56 +03:00
Sergeanur	e26e85deb8	Some unicode funcs belong to Font.cpp + small fix	2020-10-11 10:33:02 +03:00
majestic	e7ef45a606	CWaterCreatures	2020-10-10 17:49:54 -07:00
Sergeanur	f1bb09826d	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # gamefiles/TEXT/american.gxt # premake5.lua # src/audio/MusicManager.cpp # src/control/Darkel.cpp # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/Frontend.cpp # src/core/Game.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/extras/frontendoption.cpp # src/extras/frontendoption.h # src/render/Hud.cpp # src/skel/glfw/glfw.cpp # src/vehicles/CarGen.cpp # src/vehicles/Vehicle.cpp # src/weapons/WeaponInfo.cpp # utils/gxt/american.txt	2020-10-11 01:18:08 +03:00
Sergeanur	6fe6d0cb9a	Finish Text stuff	2020-10-11 00:56:16 +03:00
Sergeanur	dd039677a0	Zones saving and loading	2020-10-10 23:50:00 +03:00
Nikolay	63611408b1	bug fix	2020-10-10 18:19:49 +03:00
Roman Masanin	881db86895	CSpecialFX and some other classes	2020-10-09 20:29:38 +03:00
eray orçunus	a01b14f301	Fix sniper and water creatures bug, mark some files	2020-10-09 12:24:21 +03:00
majestic	c091a5c11a	CWaterCreatures	2020-10-08 19:28:31 -07:00
eray orçunus	22c9e8b581	Fix POSIX streaming	2020-10-09 02:22:02 +03:00
eray orçunus	ed82c55475	Fix POSIX streaming	2020-10-09 02:19:49 +03:00
eray orçunus	570ccb7db1	Merge branch 'miami' of https://github.com/GTAmodding/re3 into new	2020-10-08 22:45:37 +03:00
eray orçunus	73a3e9d5bb	Fixes, some thanks to ASan	2020-10-08 22:41:51 +03:00
erorcun	b97f86deea	Merge pull request #750 from erorcun/miami ... Pad, BulletInfo, ProjectileInfo, fixes	2020-10-08 21:39:11 +03:00
Roman Masanin	e52c5ca1bb	fix for wheelie cras	2020-10-08 20:34:59 +03:00
majestic	9a10501698	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-10-08 09:31:57 -07:00
Filip Gawin	6bae5a6031	Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)	2020-10-08 18:45:07 +03:00
eray orçunus	fec01aeff1	Fix some sanitizer errors, improve POSIX streamer	2020-10-08 17:58:18 +03:00
Andrew Udvare	1a3e254b6c	CdStreamPosix: fix type issues	2020-10-08 17:53:32 +03:00
Andrew Udvare	2bb29a50b7	core/CdStreamPosix: switch to named semaphores to support macOS ... macOS does not support unnamed semaphores. The functions return ENOSYS.	2020-10-08 17:52:12 +03:00
Andrew Udvare	d590fdddf6	macOS support; thanks to @MrYadro ... This should support ARM64 and x86-64. -target flag based on information from https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.	2020-10-08 17:51:43 +03:00
erorcun	3435d6656c	Merge pull request #748 from theR4K/miamiUpstream ... CExplosion and some audio	2020-10-08 16:15:18 +03:00
majestic	7861992fe6	CWaterCreatures	2020-10-08 05:59:08 -07:00
erorcun	fa373c7fdb	Merge branch 'miami' into miami	2020-10-08 01:29:35 +03:00
eray orçunus	0409907438	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-10-08 01:26:34 +03:00
eray orçunus	07cdd06373	little renamings & librw update	2020-10-08 01:17:19 +03:00
erorcun	8b7bf76260	Merge pull request #735 from theR4K/miami ... car fly cheat enhancement	2020-10-08 00:59:10 +03:00
eray orçunus	da39624f1c	Pad, BulletInfo, ProjectileInfo, fixes	2020-10-08 00:26:24 +03:00
eray orçunus	556dbdcdd6	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-10-05 22:18:51 +03:00
Roman Masanin	a6a1de5006	rename var	2020-10-05 19:05:13 +03:00
Filip Gawin	e3571510ae	Fix build on clang	2020-10-05 17:40:44 +02:00
Roman Masanin	4fd93fea51	fix mistakes	2020-10-05 17:24:57 +03:00
Roman Masanin	e3273d7268	CExplosion done	2020-10-05 16:14:48 +03:00
Nikolay Korolev	6853be36c8	Merge remote-tracking branch 'upstream/master'	2020-10-05 16:10:26 +03:00
Nikolay Korolev	2bfb54b192	fixed darkel/replay	2020-10-05 16:09:44 +03:00
eray orçunus	c5a61b3d3b	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-10-05 14:26:42 +03:00
eray orçunus	9db0d7bba1	Merge branch 'master' of https://github.com/GTAmodding/re3 into audioFix	2020-10-05 14:24:45 +03:00
eray orçunus	ee27cae732	Fix Linux audio path	2020-10-05 14:23:37 +03:00
eray orçunus	1a0b71bd47	Fix Audio	2020-10-05 14:23:12 +03:00
eray orçunus	6f3f581d8a	Fix Audio	2020-10-05 13:59:40 +03:00
Roman Masanin	4867d9949d	some audio and part of CExplosion	2020-10-05 03:04:35 +03:00
eray orçunus	49ae7da5ce	Fix Linux audio path	2020-10-05 01:25:56 +03:00
shfil	c31e3e6823	Merge pull request #741 from ShFil119/fix/make_space ... Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)	2020-10-04 22:02:28 +02:00
eray orçunus	8c170a62ee	Fix some sanitizer errors, improve POSIX streamer	2020-10-04 22:39:54 +03:00
erorcun	fae97f29c4	Merge branch 'master' into master	2020-10-04 22:12:57 +03:00
Roman Masanin	1b3144f978	back to the future style wheels on flying	2020-10-04 19:03:34 +03:00
Filip Gawin	0ac2be0093	Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)	2020-10-04 13:18:24 +02:00
Nikolay Korolev	39678ba5ca	small fix	2020-10-03 16:16:46 +03:00
erorcun	a8c19dfed8	Merge pull request #734 from Tatsh/macos ... macOS support	2020-10-03 13:22:08 +03:00
Roman Masanin	063a80ecfb	now BETTER_ALLCARSDODO_CHEAT tweak original cheat to be useful.	2020-10-03 02:26:49 +03:00
Roman Masanin	55d94c99b8	Merge remote-tracking branch 'upstream/miami' into miami	2020-10-03 01:52:37 +03:00
eray orçunus	3bd3330227	Load and write our settings in re3.ini & fixes	2020-10-02 21:18:34 +03:00
shfil	9d53b738cc	Merge pull request #737 from theR4K/miamiDev ... just ProcessActiveQueues	2020-10-02 20:11:00 +02:00
Nikolay Korolev	8761763d95	fixed cargen check	2020-10-02 20:43:24 +03:00
Roman Masanin	1991f9b362	revert some changes and little fix	2020-10-02 20:35:16 +03:00
erorcun	72f342245d	Merge pull request #731 from erorcun/miami ... Population done, mouse AUX buttons, Frontend, Hud, fixes	2020-10-02 17:39:15 +03:00
Roman Masanin	6ff138ca76	fix build(bcs func CheckForAnAudioFileOnCD not used anymore)	2020-10-02 05:03:29 +03:00
Roman Masanin	064f2e66e1	letter 'c' is done	2020-10-02 04:59:06 +03:00
Roman Masanin	e5a48faf89	merged from upstream	2020-10-02 04:03:17 +03:00