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
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
Dean Herbert
1ab75529a1
Simplify user channel message population code
2018-07-23 21:15:52 +02:00
Dean Herbert
0aacde836a
Move private channel constructor to own class
2018-07-23 20:46:44 +02:00
miterosan
2726d91594
Remove unessary usings
2018-07-23 16:05:39 +02:00
miterosan
344ec40a27
Readd usings I removed with my merge
2018-07-23 15:48:48 +02:00
miterosan
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
Dean Herbert
2169a47325
Prevent fatal failures on delete failures
2018-07-23 10:39:43 +02:00
Dean Herbert
6fa70ed696
Merge branch 'master' into centralise-judgement-display
2018-07-23 05:23:52 +09:00
Dean Herbert
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
77da100c0f
Merge branch 'master' into fix-model-import
2018-07-20 23:30:41 +09:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dean Herbert
fc6deb6ab5
Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
2018-07-20 16:42:46 +09:00
Dean Herbert
7fea2b3a8b
Add ToList
2018-07-20 16:38:02 +09:00
Dean Herbert
92fe996a8b
Merge branch 'master' into fix-model-import
2018-07-20 16:17:39 +09:00
Dean Herbert
0e7bb3b548
Merge branch 'master' into no-more-memory-sqlite
2018-07-20 16:17:36 +09:00
smoogipoo
c087a73f40
Implement per-hitobject custom sample banks
2018-07-20 15:12:44 +09:00
smoogipoo
de8d05bb0c
Remove unnecessary setting of sample name to same value
2018-07-20 15:12:21 +09:00
David V
9eb69a1e76
Restructure + corrects converting to support all systems
2018-07-19 17:47:55 +02:00
David V
4e72794101
Converts float to int.
2018-07-19 15:55:38 +02:00
Dean Herbert
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
Dean Herbert
68614f1512
Ensure online IDs are validated for imports that don't have an associated archive too
2018-07-19 13:41:34 +09:00
Dean Herbert
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
Dean Herbert
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
0c24244340
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
# Conflicts:
# osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
Dean Herbert
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
Dean Herbert
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
...
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width
2018-07-17 16:36:05 +09:00
Dean Herbert
9f933187e9
Apply review feedback
2018-07-17 16:33:08 +09:00
Dean Herbert
569d0f7993
Merge branch 'master' into scrolldirection-cleanup
2018-07-17 15:39:13 +09:00