1468 commits

Author	SHA1	Message	Date
Nikolay Korolev	bf90fed2b7	fixes	2020-12-19 11:49:19 +03:00
Nikolay Korolev	8d1996833b	merge attempt	2020-12-19 03:21:04 +03:00
aap	9982f1f21b	anim compression	2020-12-18 23:46:51 +01:00
aap	c17ccc50ab	get rid of all PED_SKIN defines	2020-12-18 17:27:18 +01:00
aap	75a9976cbc	memorymgr fix	2020-12-18 14:33:54 +01:00
aap	f3a356375e	added MemoryHeap from III, MemoryMgr	2020-12-18 14:19:03 +01:00
aap	a080fbfbd4	little cleanup of templates	2020-12-18 13:58:59 +01:00
aap	55cf1a37cb	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-12-18 13:50:37 +01:00
aap	a7050458ae	little cleanup and synch on templates and config	2020-12-18 13:50:26 +01:00
Sergeanur	cfda5eb148	PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes	2020-12-18 02:58:09 +02:00
Sergeanur	e9a5670348	PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes	2020-12-18 02:57:54 +02:00
aap	cc5af26417	PreAllocateRwObjects	2020-12-17 12:47:00 +01:00
erorcun	dd579c4080	Fix	2020-12-17 02:47:48 +03:00
erorcun	8e45439205	Use scrolling if GRAPHICS_MENU_OPTIONS not defined, like miami	2020-12-16 23:45:18 +03:00
erorcun	12d16ddc06	Fixes and style changes	2020-12-16 23:28:25 +03:00
erorcun	23b5e664dc	Sync Frontend with miami 3/3	2020-12-16 00:38:26 +03:00
erorcun	cac7516d39	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-12-15 17:55:33 +03:00
erorcun	64b509af52	Make free cam collision code readable by aap, fixes	2020-12-15 17:49:43 +03:00
erorcun	970f84514a	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-12-15 17:45:06 +03:00
erorcun	59caa98c43	Make free cam collision code readable by aap, fixes	2020-12-15 17:33:51 +03:00
Sergeanur	f76dfaee82	Use SetPedState	2020-12-15 05:11:02 +02:00
erorcun	984b8efccc	Radio scroll to prev. station & radio off text	2020-12-15 05:51:53 +03:00
erorcun	91902a031e	Enable our Linux joystick handling	2020-12-14 02:43:07 +03:00
aap	e8fe09cf23	another fix for new renderer	2020-12-13 23:09:19 +01:00
aap	e3616c1ce1	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-12-13 12:53:27 +01:00
aap	35cac6b93b	some rendering things	2020-12-13 12:53:19 +01:00
Nikolay Korolev	6d61f9d2e1	fixed replay bugs	2020-12-12 23:17:16 +03:00
Nikolay Korolev	01c95378e1	fixed some replay bugs	2020-12-12 23:05:12 +03:00
erorcun	3038fba9ca	Sync Frontend, Peds with miami 2	2020-12-12 18:20:21 +03:00
Nikolay Korolev	78718700f9	quick fix	2020-12-12 13:00:40 +03:00
aap	4f3be49728	Merge pull request #868 from erorcun/miami ... Frontend cleanup, .INI, CFO, scrollable pages	2020-12-12 10:43:06 +01:00
erorcun	fc3cdf3b3b	Sync Frontend with miami 1	2020-12-09 21:43:58 +03:00
erorcun	1caf5d087a	Sync Stats page style with miami - and a little veh. cam. fix	2020-12-09 15:39:14 +03:00
aap	ccbbde549e	Merge pull request #869 from Nick007J/miami ... garages revision + fixes	2020-12-09 09:55:50 +01:00
erorcun	c504cf02e4	Vehicle cam object collision fix	2020-12-09 07:15:04 +03:00
erorcun	cf4aedd97c	Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default	2020-12-09 06:36:28 +03:00
erorcun	ba0c9e8b29	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-12-09 06:34:04 +03:00
erorcun	b473adcf80	Frontend cleanup, .INI, CFO, scrollable pages	2020-12-09 06:32:33 +03:00
erorcun	33e1f28239	Vehicle cam fixes ... - @ZLau92 's idea to remove 3rd person check on num 2/8. It was meaningless on III, probably not on VC tho. - @Nick007J pointed out that camera wasn't checking objects, which was something done by someone to prevent camera to collide with traffic lights. Instead I enabled object check again, and comparing the result if it's a traffic light after the test.	2020-12-09 06:09:48 +03:00
erorcun	e1044a7947	AnimViewer fixes, commentary from miami	2020-12-09 05:10:57 +03:00
erorcun	122c7aa40d	Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default	2020-12-09 03:41:45 +03:00
erorcun	ac3484b82e	Merge pull request #872 from withmorten/sized-enums-miami ... Get rid of sized enums 2: Electric Boogaloo	2020-12-09 03:31:03 +03:00
erorcun	6b654094a5	Merge pull request #871 from withmorten/sized-enums ... Get rid of sized enums	2020-12-09 03:15:20 +03:00
erorcun	fc6f07345e	Red delete menu background	2020-12-08 23:33:51 +03:00
Nikolay Korolev	016ff5b4aa	sync with upstream	2020-12-08 12:00:24 +03:00
Sergeanur	f3e9c82432	Pool fixes from master	2020-12-08 07:52:03 +02:00
Sergeanur	778d1381bb	Add NUM_LEVELS	2020-12-08 07:50:29 +02:00
Sergeanur	aae4f3319f	Fixes	2020-12-08 03:29:08 +02:00
Fire-Head	87bca997a4	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-12-07 21:50:18 +03:00
Fire-Head	c5fbb594a5	ps2 hud, restore original code	2020-12-07 21:12:13 +03:00
withmorten	4c0744260d	uint8 enums fixed	2020-12-07 01:59:17 +01:00
withmorten	4696e3f9c8	uint8 enums fixed	2020-12-07 00:36:40 +01:00
Nikolay Korolev	fe918d41c2	garages revision + some fixes	2020-12-06 19:30:51 +03:00
Nikolay Korolev	0bd373cd56	script from other platforms and unused commands	2020-12-05 02:49:32 +03:00
aap	9714a37769	bit more GTA_VERSION and GTA_PS2	2020-12-04 01:12:58 +01:00
aap	43fb7fe342	one more original name	2020-12-03 19:11:57 +01:00
aap	5bed7afd79	forgot some junk	2020-12-03 16:56:32 +01:00
aap	13cefd3293	more PS2 stuff; memory movement done	2020-12-03 16:04:59 +01:00
aap	0d166081ad	animviewer fixes	2020-12-03 11:30:46 +01:00
aap	3c24505990	little fixes for animviewer	2020-12-03 09:34:09 +01:00
erorcun	ab3e810a95	AnimViewer done, comment cleanup	2020-12-03 05:22:58 +03:00
erorcun	8b47774aee	Stats page	2020-12-03 02:09:35 +03:00
erorcun	774aa1570f	Merge pull request #853 from erorcun/miami ... PlayerPed and "Redefine controls" menu done, fixes	2020-12-02 14:35:06 +03:00
erorcun	bd8b907d13	PlayerPed and "Redefine controls" menu done, fixes	2020-12-02 14:21:46 +03:00
aap	1172056833	cam lod dist fix	2020-12-02 10:39:23 +01:00
aap	f576311814	Merge branch 'master' of github.com:GTAmodding/re3	2020-12-02 10:38:39 +01:00
aap	fba657ff0c	better cam lod dist fix	2020-12-02 10:38:27 +01:00
Nikolay Korolev	4b9f1680a3	fast fix	2020-12-02 02:41:05 +03:00
Nikolay Korolev	fda58fb1df	added GTA_SCENE_EDIT	2020-12-02 02:34:51 +03:00
Sergeanur	a259b6b8ab	TexturePools ... # Conflicts: # src/core/Game.cpp # src/rw/RwHelper.cpp	2020-12-01 22:54:19 +02:00
Sergeanur	24b5406a1d	Add GTA_REPLAY ... # Conflicts: # src/control/Replay.cpp # src/control/Replay.h	2020-12-01 22:53:09 +02:00
Sergeanur	0b20fd7e77	Remove ifndef GTA_PS2 around replays	2020-12-01 22:35:53 +02:00
Sergeanur	9461998304	TexturePools	2020-12-01 22:12:46 +02:00
Sergeanur	e33ab44b7d	Add GTA_REPLAY	2020-12-01 22:08:05 +02:00
aap	83bbb631d1	some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet)	2020-12-01 17:42:18 +01:00
aap	b8bc54640d	fix cam-fix	2020-12-01 17:24:56 +01:00
aap	56c471d02e	Merge pull request #854 from Nick007J/master ... small garages + templates revision	2020-12-01 11:25:02 +01:00
aap	d6fab1bc53	cam stuff	2020-12-01 10:12:42 +01:00
Sergeanur	5a3a058ed3	Make texture conversion work a bit faster ... # Conflicts: # src/core/config.h	2020-12-01 03:51:31 +02:00
Zach Charo	6eb0fd52d7	Update Camera.cpp ... camdist multiplier is consitently between 1 and 1.4 on 16:9 aspect ratio On ultrawide, the cam dist multiplier jumps to anywhere between 2 and 3 The preferred distance generator for car objects is the cam dist multiplier * 120. Which puts cars that it's trying to generate outside of the allowed gen/draw distance for new car objects when on ultrawide. This means no new cars can spawn. This change caps the scaling for the generation distance a bit above what it would be for 16:9 and does not affect the LOD multiplier.	2020-11-30 19:08:15 -06:00
aap	2c59e1c894	some more GTA_VERSION	2020-12-01 00:22:57 +01:00
aap	4b9fb631fc	added a few registered pointers and memory debug	2020-11-30 23:44:58 +01:00
Nikolay Korolev	a3b83a5d2f	Merge remote-tracking branch 'upstream/master'	2020-11-30 02:15:35 +03:00
Nikolay Korolev	8f05ccd6c4	small garages revision + small template stuff	2020-11-30 02:15:03 +03:00
aap	d5bc382cb5	GTA_VERSION define and some config.h cleanup	2020-11-29 21:29:48 +01:00
aap	566282057a	add debug script hotkey	2020-11-29 11:37:06 +01:00
aap	c57fee38ca	Merge pull request #841 from aap/master ... start using CMemoryHeap; also some PS2 define cleanup	2020-11-28 18:52:44 +01:00
aap	a8035b6466	moved some stuff to MemoryMgr	2020-11-28 17:05:57 +01:00
aap	b23bda6e45	Merge branch 'master' of github.com:GTAmodding/re3	2020-11-28 16:02:21 +01:00
Sergeanur	ad48b9cde0	Make texture conversion work a bit faster	2020-11-28 16:29:45 +02:00
Sergeanur	18d0fd2e48	Add multisampling to librw	2020-11-28 15:13:06 +02:00
aap	d857758c16	start using CMemoryHeap	2020-11-26 17:39:59 +01:00
Sergeanur	491274f188	CStreaming::PrintStreamingBufferState	2020-11-26 18:11:55 +02:00
aap	4ddc356341	memory heap starting to work	2020-11-25 22:49:50 +01:00
aap	70d8bdc087	rename badly named camera variable	2020-11-24 15:20:41 +01:00
aap	1906a08f72	cam fix; forgot some shaders	2020-11-24 15:18:39 +01:00
erorcun	b7783b19d2	Xbox message screen, disabled by default	2020-11-24 01:45:54 +03:00
aap	9b4cfa618d	Merge pull request #827 from aap/master ... finished cullzones	2020-11-22 22:49:22 +01:00
aap	07303c62d1	finished cullzones	2020-11-22 00:13:07 +01:00
aap	15ae9e2a3e	Merge pull request #823 from aap/master ... Neo screen droplets	2020-11-22 00:12:34 +01:00
aap	b9b7d5ac21	Merge pull request #825 from aap/miami ... neo screen droplets	2020-11-22 00:12:31 +01:00
Nikolay	6b6b600cee	no script logging	2020-11-21 21:12:47 +03:00
Sergeanur	fe40f65703	Reorganize CPed functions into their original cpp files	2020-11-20 01:18:37 +02:00
Sergeanur	9e45feb4fa	Reorganize CPed functions into their original cpp files	2020-11-19 21:12:20 +02:00
aap	07fe099b4e	neo screen droplets	2020-11-19 19:07:32 +01:00
aap	02c7f8381b	neo screen droplets	2020-11-19 16:23:52 +01:00
erorcun	808f7c46f1	Infamous XBOX subtitle outline	2020-11-19 02:09:04 +03:00
erorcun	54214dd2c4	Fix mouse lock/high-dpi	2020-11-18 17:42:21 +03:00
erorcun	1d600c640a	Merge pull request #816 from erorcun/miami ... Frontend: Stats, Map, Audio inputs, Radio selector	2020-11-18 01:45:28 +03:00
erorcun	b58a54527e	Merge pull request #820 from withmorten/mission-switcher ... add mission switcher from miami	2020-11-18 01:45:12 +03:00
erorcun	c6f53d25b0	Frontend: Stats, Map, Audio inputs, Radio selector	2020-11-18 00:33:45 +03:00
aap	46253fbf7d	Merge branch 'master' of github.com:GTAmodding/re3	2020-11-16 22:43:35 +01:00
aap	3564b85b4e	animation compression from PS2	2020-11-16 22:43:15 +01:00
Nikolay Korolev	b9b9dabd75	lcs car ctrl 2	2020-11-16 22:20:56 +03:00
erorcun	f33ed2892a	Fix mouse lock/high-dpi 2	2020-11-16 15:49:00 +03:00
erorcun	3b1debaa0d	Fix mouse lock/high-dpi	2020-11-16 15:28:10 +03:00
Sergeanur	cdd30f4da5	Move ColStore to collision	2020-11-16 12:49:23 +02:00
aap	6804ad62c6	little fix to ps2 CPad	2020-11-16 09:48:15 +01:00
aap	5335b46cbb	little fix to ps2 CPad	2020-11-16 09:48:02 +01:00
withmorten	abcda2ce29	add mission switcher from miami	2020-11-16 00:41:03 +01:00
withmorten	207f8576d8	move config.h define to CUSTOM_FRONTEND_OPTIONS	2020-11-16 00:21:04 +01:00
withmorten	f0071c094a	remove unneeded ifdef	2020-11-16 00:07:27 +01:00
Sergeanur	9bb8ebaa10	Make collision code placement more like original (+ small fixes) ... # Conflicts: # premake5.lua # src/CMakeLists.txt # src/collision/Collision.cpp # src/core/Collision.h	2020-11-16 00:36:54 +02:00
withmorten	ac29ae6e23	add CFO for invertlook4pad; update american.gxt	2020-11-15 23:06:29 +01:00
withmorten	0669df763c	Merge branch 'upstream/master'	2020-11-15 22:08:40 +01:00
withmorten	ad10d3e64e	revert frontend changes for invertlook4pad	2020-11-15 22:07:44 +01:00
Sergeanur	a6f5f4634c	Make collision code placement more like original (+ small fixes)	2020-11-15 19:51:35 +02:00
Sergeanur	8374a346e5	Fix loading island LODs with big buildings	2020-11-13 18:28:15 +02:00
Nikolay Korolev	2e915780aa	some fixes	2020-11-13 13:19:54 +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	ff44f29616	ped fix for new renderer	2020-11-11 14:42:02 +01: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
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
erorcun	f8367ebdef	Revert "Font: Fix text dimensions" ... This reverts commit 6729de49b1.	2020-11-08 21:11:55 +03:00
erorcun	fe5d0c9cdf	Font: Hud: Use orig. text dimensions, fix right-align calculations	2020-11-08 20:49:47 +03: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
aap	092f32ba67	move stuff into define	2020-11-07 12:52:11 +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
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	244b91ee80	fixed boats for new renderer	2020-11-04 16:22:15 +01:00
aap	e1279b01bc	forget ifdef	2020-11-03 20:40:33 +01:00
aap	3c5bb4e8f3	new LCS-style renderer	2020-11-03 20:33:07 +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
shfil	e587974759	Fix include in Frontend_PS2.cpp	2020-11-02 13:31:25 +01: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
withmorten	e9735f928f	add ifdef LIBRW guard for pipelines and colourfilter	2020-11-01 01:09:46 +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
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	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
erorcun	6729de49b1	Font: Fix text dimensions	2020-10-25 20:57:24 +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
Sergeanur	e0394e6e69	Possible fix of linux build	2020-10-25 12:38:08 +02:00
Sergeanur	6634410aee	Fix build	2020-10-25 09:50:17 +02:00
Sergeanur	aac0c3fb67	DMAudio fixes	2020-10-25 09:40:11 +02:00
erorcun	5e5854b914	Fix bindings not loaded on Linux	2020-10-25 01:10:03 +03:00
Adrian Graber	28fb26f792	Join CdStream threads to wait for them to exit	2020-10-24 18:14:41 +03:00
erorcun	088065e0a8	Merge pull request #778 from majesticCoding/miami ... Fluff done, FireInstantHit fix	2020-10-24 17:56:03 +03:00
Adrian Graber	a32c390a95	Join CdStream threads to wait for them to exit	2020-10-24 16:12:10 +02:00
majestic	6a89fe401a	Fluff done, FireInstantHit fix	2020-10-23 07:51:24 -07: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	08d78fb6ff	Timer, main	2020-10-23 04:26:52 +03:00
Sergeanur	ee61f19253	Police Radio + fixes	2020-10-22 12:38:09 +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