402 commits

Author	SHA1	Message	Date
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	fec0028e12	sync with upstream	2020-05-19 23:27:41 +03:00
aap	bdbe5d1080	CEntity and friends	2020-05-19 20:56:42 +02: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	6b0b984909	Merge pull request #561 from Nick007J/miami ... script revision	2020-05-19 13:26:21 +02:00
aap	0d0f4da27a	little cleanup of handlingmgr	2020-05-19 13:09:20 +02:00
aap	53cdf6ab41	HandlingMgr	2020-05-19 13:07:12 +02: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
aap	abd230dcdd	some less certainly fps fixes	2020-05-18 22:52:35 +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
Nikolay Korolev	5ab2c85e97	some debug changes	2020-05-18 00:34:24 +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
eray orçunus	84f8312b86	Weapon fixes and thingies	2020-05-17 21:01:52 +03:00
Nikolay Korolev	b587d835e8	more script stuff	2020-05-16 23:06:33 +03:00
Nikolay Korolev	c33b93793f	new horn	2020-05-16 14:01:32 +03: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
eray orçunus	acd1ea9909	Weapon layer in Peds	2020-05-15 21:21:25 +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
Nikolay Korolev	9d4d83db0d	some fixes	2020-05-14 14:01:24 +03:00
Nikolay Korolev	509d57edcb	car control and cranes fixes	2020-05-13 13:29:17 +03: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	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
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	8a4fa58cd4	Linux build support	2020-05-11 21:00:55 +03: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	9e842f1628	vehicle model descriptions; a bit of heli code	2020-05-10 20:51:29 +02: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
aap	0552d49fce	CVehicleModelInfo	2020-05-10 17:09:14 +02:00
bigbossbro08	af6e132b37	defined out asserts.	2020-05-10 19:54:37 +06: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	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
Nikolay Korolev	3de003a8e7	new curves + boat fix	2020-05-09 22:11:40 +03:00
Nikolay Korolev	a55e738dfa	ccarctrl big fix	2020-05-09 20:21:13 +03:00
Nikolay Korolev	7e753c2596	CCarCtrl::GenerateOneRandomCar	2020-05-08 23:29:43 +03:00
aap	05a1d64fbb	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
Sergeanur	6ad66fb2d7	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/render/Renderer.cpp	2020-05-06 19:32:57 +03:00
Nikolay Korolev	a24b65cbde	IsStatic	2020-05-06 19:17:47 +03:00
aap	68d3ea9c42	getting the vice city map to work	2020-05-05 23:27:43 +02:00
aap	e81652c2fc	cleaned up MIAMI ifdefs	2020-05-05 18:06:38 +02: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	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
aap	b3b9be5e8c	merged master	2020-05-05 14:21:13 +02:00
Sergeanur	e9b334d7bf	More use of GetModelIndex	2020-05-05 14:48:35 +03:00
Nikolay Korolev	ee261c996b	Merge remote-tracking branch 'upstream/master'	2020-05-05 14:40:56 +03:00
Nikolay Korolev	ae0c83fa01	CAutoPilot + CCarAI + fixes	2020-05-05 14:40:35 +03:00
aap	b44df26d3e	implemented most of streamed collisions and big buildings	2020-05-05 13:02:42 +02:00
Sergeanur	84c9484e55	SetPosition, final part	2020-05-05 04:45:18 +03:00
Nikolay Korolev	131e8af174	Merge pull request #508 from Nick007J/master ... Scripts compatible saving + CCarCtrl bug + crusher coach bug	2020-05-04 19:52:26 +03:00
Nikolay Korolev	11c7050dfb	deny coach in crusher	2020-05-04 15:02:46 +03:00
aap	67467f15d1	GTA_BRIDGE and GTA_TRAIN defines	2020-05-03 17:28:54 +02:00
aap	702da55ec9	implemented most of vice city path system	2020-05-03 16:09:37 +02:00
Sergeanur	4448156e29	Merge pull request #494 from Nick007J/master ... pools compatibility	2020-05-02 23:48:17 +03:00
Sergeanur	c62d35fed0	Adding sound intensity consts	2020-05-02 23:31:45 +03:00
Nikolay Korolev	7d067684ff	Merge remote-tracking branch 'upstream/master'	2020-05-02 18:02:45 +03:00
Nikolay Korolev	f372ce156d	changed saving compatibility	2020-05-02 18:02:17 +03:00
Sergeanur	52390062b3	SetPosition, part 2	2020-05-02 15:28:19 +03:00
Sergeanur	d23b2c423e	SetPosition, part 1	2020-05-02 15:13:09 +03:00
Sergeanur	e14733367e	Rename m_phy_flagA80 to bSkipLineCol	2020-04-30 18:58:15 +03:00
Sergeanur	7d758f3a9f	Adding getters and setters for type and status	2020-04-30 16:45:45 +03:00
Sergeanur	c94ccce6d6	Audio structs moved to their AudioManager.h	2020-04-27 20:06:54 +03:00
Nikolay Korolev	68bf239868	Merge pull request #489 from Nick007J/master ... 1.1 patch stuff + flying controls	2020-04-27 00:53:54 +03:00
Sergeanur	4f763cba49	Fix compilation error	2020-04-26 13:59:06 +03:00
eray orçunus	6c1a1f7cd2	Initial GLFW support	2020-04-26 13:29:50 +03:00
Nikolay Korolev	ae8deff131	helis done + cheats	2020-04-25 21:25:14 +03:00
Nikolay Korolev	40ec636291	fixed flight control code	2020-04-25 16:47:39 +03:00
Nikolay Korolev	34ef766c67	Merge remote-tracking branch 'upstream/master'	2020-04-25 12:15:29 +03:00
Nikolay Korolev	f3ae4fa184	undo	2020-04-25 12:14:51 +03:00
Nikolay Korolev	c8fd0385cf	flying control	2020-04-25 12:14:21 +03:00
Nikolay Korolev	4b883f2b40	disable mouse steering by default	2020-04-24 20:50:00 +03:00
Nikolay Korolev	458eb3a4f0	removed fix that made no sense	2020-04-23 16:40:19 +03:00
Fire-Head	75acd78190	ps2 particles, sampman oal started	2020-04-23 11:24:03 +03:00
Filip Gawin	370c4e48cd	Try to build with mingw	2020-04-20 18:18:46 +02:00
erorcun	0f07a323c9	Merge pull request #474 from Nick007J/master ... Bug fixes, mostly replay; added RegisterReference for player ped pointer	2020-04-19 16:56:39 +03:00
eray orçunus	1ffc37735e	Struct cleanup, various fixes, enable PS2 rand	2020-04-19 16:44:35 +03:00
Nikolay Korolev	4c133a95bd	Merge remote-tracking branch 'upstream/master'	2020-04-18 23:50:58 +03:00
Nikolay Korolev	c4cd45d47c	replays bug fix	2020-04-18 23:50:37 +03:00
eray orçunus	2f63e5e751	Vc ped ports and Frontend fixes	2020-04-18 21:30:03 +03:00
Sergeanur	555f933780	Remove padding fields	2020-04-18 11:31:53 +03:00
Sergeanur	599164006a	Remove patches	2020-04-17 16:31:11 +03:00
Fire-Head	a4922d5cb7	rem refs	2020-04-17 08:54:14 +03:00
Sergeanur	83cbe4e39e	More refs removed	2020-04-16 15:30:47 +03:00
erorcun	647cfbfd45	Merge pull request #446 from erorcun/erorcun ... Many fixes and cleanup	2020-04-15 19:22:28 +03:00
eray orçunus	4da1879975	Many fixes and cleanup	2020-04-15 19:19:45 +03:00
aap	eccc4a3a5b	fixed bug and weirdness in CHeli	2020-04-15 16:17:18 +02:00
Sergeanur	eb0b9f6255	fix CTheCarGenerators::SaveAllCarGenerators	2020-04-14 17:24:31 +03:00
Sergeanur	a19fa8764f	CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement	2020-04-14 13:08:03 +03:00
Nikolay Korolev	3b0cd93f89	Merge remote-tracking branch 'upstream/master'	2020-04-13 21:54:25 +03:00
aap	3aae52d220	finished CBoat	2020-04-13 00:20:44 +02:00
Nikolay Korolev	cbb298c8dd	sync with master	2020-04-12 12:08:30 +03:00
Nikolay Korolev	fa0f5542cc	Merge pull request #402 from Nick007J/master ... Record	2020-04-12 12:06:12 +03:00
Nikolay Korolev	38dee74a5a	CPools	2020-04-11 21:01:39 +03:00
Nikolay Korolev	92b6d775d6	Record	2020-04-11 02:03:42 +03:00
saml1er	a8f7bf0bec	CObject complete	2020-04-10 16:44:08 +05:00
aap	34349c4df2	normalized line endings to LF	2020-04-09 20:50:24 +02:00
aap	6225e50723	fixed questionable RW usage; changed radar mask to PS2 techinque	2020-04-09 17:45:05 +02:00
Sergeanur	cb262c791e	Finished CExplosion	2020-04-09 13:28:17 +03:00
aap	51512db006	implemented CRubbish	2020-04-07 17:16:58 +02:00
aap	5e9ae94298	Merge pull request #378 from aap/master ... finished CCamera	2020-04-05 14:30:28 +02:00
aap	7ff5a3a65c	CCamera fixes	2020-04-03 09:26:10 +02:00
Nikolay Korolev	347f0a0e9c	vehicles missing functions + fixes	2020-04-01 01:58:40 +03:00
eray orçunus	5e2fe749bd	Mouse free cam for peds&cars (under FREE_CAM)	2020-03-31 06:05:49 +03:00
Nikolay Korolev	24b8c7819c	merge with upstream	2020-03-29 18:51:18 +03:00
Fire-Head	194ddc5f40	CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names	2020-03-28 23:55:23 +03:00
Nikolay Korolev	101c21e064	merge with master	2020-03-28 20:55:15 +03:00
eray orçunus	112685ebac	CCopPed done and #include cleanup	2020-03-28 18:52:25 +03:00
Nikolay Korolev	9fb101fdd9	Merge branch 'master' into garages_dev	2020-03-28 15:24:55 +03:00
Nikolay Korolev	268f92bfbe	garages part 1	2020-03-28 15:24:13 +03:00
aap	739e80614d	remove include <new> from common.h	2020-03-28 09:37:04 +01:00
blingu	0e91015940	Update Vehicle.cpp	2020-03-26 14:19:55 +01:00
blingu	be2aca47cf	added InflictDamage() declaration	2020-03-25 22:58:20 +01:00
blingu	93a4bc31fa	added wrapper for InflictDamage()	2020-03-25 22:57:34 +01:00
eray orçunus	934e9db4fc	CPopulation done, CCopPed and fixes	2020-03-12 00:48:33 +03:00
eray orçunus	ae523a09a7	fixes	2020-03-01 04:44:58 +03:00
eray orçunus	b2d062ef2d	some fixes	2020-02-23 01:48:21 +03:00
Nikolay Korolev	85d815cf9d	bug fixes	2020-02-15 23:30:51 +03:00
eray orçunus	ce0687db27	A bug fix and VC ports for veh. enter/exit	2020-02-03 21:03:48 +03:00
Nikolay Korolev	c794b59a7c	fixed firetruck crash	2020-02-02 15:22:17 +03:00
Sergeanur	0c581ce86a	Fix boat component	2020-01-31 21:02:08 +02:00
Sergeanur	6ff06ff7c6	Partial CBoat	2020-01-24 10:41:40 +02:00
Sergeanur	18f80a02fc	Fixing some plane funcs declarations	2020-01-23 17:43:19 +02:00
Sergeanur	9eb599ff58	Plane crashfix and more	2020-01-23 17:29:36 +02:00
Nikolay Korolev	42ff0f7c58	bug fixes	2020-01-01 23:55:01 +03:00
Nikolay Korolev	5b0cf80a76	merge with upstream	2020-01-01 02:42:00 +03:00
Nikolay Korolev	80453d3f4d	some not fully tested stuff	2020-01-01 02:35:54 +03:00
Filip Gawin	c7e9ddb566	Audio fixes for erorcun review	2019-12-01 20:44:57 +01:00
eray orçunus	680fe0f7e6	CCivilianPed done & restore peds running to phone	2019-11-26 02:35:05 +03:00
eray orçunus	be7d1d1a63	Frontend, Peds & logic and overflow fixes	2019-11-12 23:34:28 +01:00
Nikolay Korolev	5ef291ddf2	Merge remote-tracking branch 'upstream/master' into script_dev	2019-11-09 16:44:36 +03:00
eray orçunus	d5619fb5ae	Peds & a few fixes	2019-11-05 03:52:06 +03:00
Nikolay Korolev	6224060627	Merge remote-tracking branch 'upstream/master' into script_dev	2019-10-27 12:51:24 +03:00
Nikolay Korolev	5e77e9d0ea	script 600-699	2019-10-27 12:51:09 +03:00
Fire_Head	6a46cc6c3b	Merge branch 'master' into master	2019-10-27 06:36:58 +03:00
Fire-Head	537aaca5c2	ControllerConfig done ... Fix Cam enum	2019-10-27 06:17:30 +03:00
Sergeanur	d5a72fa597	Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode	2019-10-26 15:20:12 +03:00
Filip Gawin	8808e6fdfe	Fixes for aap review (audio8)	2019-10-26 13:05:00 +02:00
Filip Gawin	d822417cfc	Fixes for nitpicks	2019-10-26 13:05:00 +02:00
Filip Gawin	d2941b0368	More audio (to hook and test)	2019-10-26 13:05:00 +02:00
Nikolay Korolev	483dfbbf1b	fixed planes	2019-10-13 18:15:14 +03:00
eray orçunus	0562a6e983	Peds&fixes	2019-10-13 07:17:53 +03:00
Sergeanur	be2e01c6fb	Fixed wrong CAutomobile field type	2019-10-12 17:06:15 +03:00
Sergeanur	35add59b34	Removed !this check in CVehicle::IsWrecked, added CPed::IsNotInWreckedVehicle instead	2019-10-12 17:03:32 +03:00
erorcun	f70c2ad54f	Merge pull request #230 from Nick007J/master ... CCarAI, CCurves, CAutoPilot	2019-10-11 02:39:16 +03:00
Nikolay Korolev	803412f33b	CCarAI + bugfixes	2019-10-11 00:02:55 +03:00
Sergeanur	fd1edbc0c8	Single-wagon train fix	2019-10-10 20:55:12 +03:00
Nikolay Korolev	9e5a5f2ab6	Merge remote-tracking branch 'upstream/master' into carctrl_dev	2019-10-08 23:57:58 +03:00
Sergeanur	dd602eb4a4	Fixing ColPoints again	2019-10-06 15:49:01 +03:00
Sergeanur	90aa16b9b0	Possible fix for wheel bug	2019-10-06 15:42:48 +03:00
Nikolay Korolev	26f7691031	car AI	2019-10-06 14:25:13 +03:00
Nikolay Korolev	84186e7b0f	Merge branch 'carctrl_dev'	2019-09-14 20:54:56 +03:00
Nikolay Korolev	57f24ad533	more CCarCtrl	2019-09-14 20:53:04 +03:00
eray orçunus	88f0ef75e8	P.e.d.s.	2019-09-14 02:24:53 +03:00
Nikolay Korolev	a3aea359b2	DragCarToPoint	2019-09-12 13:11:13 +03:00
Nikolay Korolev	05b01c5ff5	ccarctrl	2019-09-11 21:42:34 +03:00
Nikolay Korolev	c86c9b3118	Merge remote-tracking branch 'upstream/master'	2019-09-11 17:52:07 +03:00
eray orçunus	24d9773ae0	Peds	2019-09-07 01:27:07 +03:00
Nikolay Korolev	b2236d8951	More CCarCtrl	2019-09-02 19:04:09 +03:00
Filip Gawin	01ac2929cd	Cleanup	2019-08-27 22:29:23 +02:00
Filip Gawin	2fabbc3b4c	More more more audio	2019-08-27 21:18:47 +02:00
Filip Gawin	458fc63f01	Cleanup	2019-08-27 21:14:28 +02:00
Filip Gawin	af5bd951ae	More audio ped	2019-08-27 21:13:17 +02:00
Nikolay Korolev	64cef333c8	more CCarCtrl	2019-08-25 16:47:22 +03:00
Nikolay Korolev	13233ccaed	merge	2019-08-17 15:46:19 +03:00
Nikolay Korolev	c16849d4a2	more CCarCtrl	2019-08-17 15:44:25 +03:00
Fire_Head	6909fa283a	Merge branch 'master' into master	2019-08-15 05:06:52 +03:00
Fire-Head	6093d855b0	CParticleObject done, cDMAudio done	2019-08-15 04:43:00 +03:00
eray orçunus	e5d089db88	More peds	2019-08-13 01:30:31 +03:00
aap	b7471489fa	Merge pull request #186 from Nick007J/master ... more CCarCtrl	2019-08-11 22:15:31 +02:00
eray orçunus	be1c7b0761	P.e.d.s. and fixes	2019-08-11 20:31:36 +03:00
Nikolay Korolev	14b945ba08	more CCarCtrl	2019-08-11 20:11:54 +03:00
aap	a3e3527a3b	implemented CHeli	2019-08-04 00:31:00 +02:00
eray orçunus	875cdd845d	The Peds	2019-08-02 01:30:40 +03:00
aap	78c15c4828	implemented CPlane	2019-07-31 23:57:18 +02:00
aap	5f6b235301	implemented CTrain	2019-07-31 14:33:27 +02:00