14253 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	ff2a3a6e92	Fix hitobjects not properly expiring if scrolling in the editor	2018-07-26 20:07:16 +09:00
Dan Balasescu	dc6898e7e0	Merge pull request #3108 from peppy/fix-turkish-i ... Fix usage of culture local ToUpper causing incorrect display on Turkish machines	2018-07-26 18:17:38 +09:00
Dan Balasescu	ceaa23fbbb	Merge branch 'master' into fix-turkish-i	2018-07-26 18:06:58 +09:00
Dean Herbert	ee0522ad84	Ignore failing test	2018-07-25 16:45:07 +02:00
Dan Balasescu	8a68ec6462	Merge pull request #3116 from AlFasGD/labelled-text-box-fixes ... Apply certain fixes for labelled text box	2018-07-25 21:34:44 +09:00
Dan Balasescu	6c290702a3	Merge branch 'master' into labelled-text-box-fixes	2018-07-25 21:21:06 +09:00
AlFasGD	c4b1ba2979	Remove padding, fix corner radiuses	2018-07-25 15:14:40 +03:00
Dean Herbert	7400d4d0e9	Merge pull request #3101 from peppy/fix-always-skipping ... Fix gameplay always skipping to first hitobject time	2018-07-25 12:40:14 +02:00
Dean Herbert	95cca046fb	Merge branch 'master' into open-downloaded-beatmas	2018-07-25 12:38:49 +02:00
Dean Herbert	ff04527c6d	Merge branch 'master' into fix-always-skipping	2018-07-25 12:30:39 +02:00
Dan Balasescu	71898754a0	Merge pull request #3086 from AlFasGD/labelled-text-box ... Add labelled text box component for the Beatmap Setup Screen	2018-07-25 19:15:49 +09:00
smoogipoo	206e3686f2	Add back blue border	2018-07-25 18:38:50 +09:00
smoogipoo	127084ba74	Merge remote-tracking branch 'origin/master' into labelled-text-box	2018-07-25 18:35:04 +09:00
smoogipoo	b60e4b0728	Cleanup	2018-07-25 18:34:47 +09:00
Dan Balasescu	53e55c2f14	Merge branch 'master' into fix-always-skipping	2018-07-25 15:30:24 +09:00
Dean Herbert	38f221cd60	Merge branch 'master' into fix-turkish-i	2018-07-25 08:15:20 +02:00
Dan Balasescu	dcf70bbd54	Merge pull request #3104 from peppy/fix-invalid-operation ... Fix a potential InvalidOperationException when entering song select	2018-07-25 14:49:26 +09:00
Dean Herbert	da8fc0ee5d	ToLower -> ToLowerInvariant	2018-07-25 07:37:05 +02:00
Dean Herbert	425b5e4119	Merge remote-tracking branch 'upstream/master' into peppy-fix-turkish-i	2018-07-25 07:36:24 +02:00
Dan Balasescu	affecccabc	Merge branch 'master' into fix-invalid-operation	2018-07-25 14:35:36 +09:00
Dan Balasescu	391eaa30e0	Merge pull request #3109 from peppy/fix-migration-fail ... Fix resetting database failing due to incorrect disposal logic	2018-07-25 13:56:53 +09:00
AlFasGD	6675c455f3	Trim whitespace that magically appeared	2018-07-24 22:33:19 +03:00
AlFasGD	3ca112aef0	Clean code and apply requested changes	2018-07-24 22:04:02 +03:00
Dean Herbert	7b653fab17	Pass in lastMessageId instead of self referencing	2018-07-24 18:01:28 +02:00
Dean Herbert	6937cf27a7	Tidy up channel join logic	2018-07-24 17:51:20 +02:00
Dean Herbert	090d197b21	Remove unnecessary using	2018-07-24 17:35:08 +02:00
Dean Herbert	2d861f5897	Remove unnecessary inject	2018-07-24 15:26:02 +02:00
Dean Herbert	da730269a9	Formatting and ctor usage for required parameters	2018-07-24 15:25:47 +02:00
Dean Herbert	53f556de9a	Trim whitespace	2018-07-24 15:10:55 +02:00
Dean Herbert	5364a6148a	Use ToUpperInvariant	2018-07-24 14:42:06 +02:00
Dean Herbert	1d86083981	Hide unnecessary log output	2018-07-24 12:13:48 +02:00
Dean Herbert	b38da34da9	Fix resetting database failing due to incorrect disposal logic	2018-07-24 12:13:48 +02:00
Dean Herbert	ab9340f4be	Fix usage of culture local ToUpper causing incorrect display on Turkish machines ... Closes #3098.	2018-07-24 11:37:43 +02:00
AlFasGD	ebf14c9c93	Update framework from current master	2018-07-24 11:32:24 +03:00
AlFasGD	d304aca08f	Merge branch 'master' into circular-button	2018-07-24 11:30:56 +03:00
AlFasGD	4d0d4523ca	Add test case, rename component	2018-07-24 11:23:38 +03:00
AlFasGD	0e50e4ee34	Clean code	2018-07-24 10:10:17 +03:00
AlFasGD	765c6e4ecc	Remove custom text box	2018-07-24 09:46:24 +03:00
AlFasGD	2f452c162c	Make text colour white	2018-07-24 09:21:01 +03:00
AlFasGD	a833fa3d92	Update framework and apply suggested changes	2018-07-24 09:19:45 +03:00
AlFasGD	cd37b0df23	Merge branch 'master' into labelled-text-box	2018-07-24 09:19:22 +03:00
miterosan	42df0c974f	Rename UserChannel to private channel.	2018-07-24 05:17:57 +02:00
miterosan	9bc225e14b	rename user to private	2018-07-24 05:14:47 +02:00
miterosan	e769c15d28	Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs	2018-07-24 05:14:33 +02:00
miterosan	3df1842e1c	Fix that in some timing specific cases the fetched channels are not getting an visual representation. ... Sadly there is not a nice way of fixing this.	2018-07-24 04:58:40 +02:00
miterosan	55f0cbf63e	Finding peace with the UI thread. ... There is the issue that in some cases that the ui thread blocked.	2018-07-24 04:56:34 +02:00
miterosan	16db81e9b5	Extract the message hadling logic into IncomingMessagesHandler	2018-07-24 04:54:11 +02:00
miterosan	9a6d92bb22	Rename fetchMsgReq to fetchMessageReq in ChannelManager.cs	2018-07-23 22:09:05 +02:00
miterosan	2ae890366a	Nicefy the errormessage in the constructor of GetMessagesRequest	2018-07-23 22:08:37 +02:00
miterosan	d9611dcffb	Instead of Doing nothing at LinkFlowContainer if no link was found, we log it as an error.	2018-07-23 22:06:40 +02:00