13721 Commits

This Branch

This Branch

All Branches

• Remove unnecessary inject
  Dean Herbert · 2018-07-24 15:26:02 +02:00
  2d861f5897
• Formatting and ctor usage for required parameters
  Dean Herbert · 2018-07-24 15:25:47 +02:00
  da730269a9
• Trim whitespace
  Dean Herbert · 2018-07-24 15:10:55 +02:00
  53f556de9a
• Rename UserChannel to private channel.
  miterosan · 2018-07-24 05:17:57 +02:00
  42df0c974f
• rename user to private
  miterosan · 2018-07-24 05:14:47 +02:00
  9bc225e14b
• Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs
  miterosan · 2018-07-24 05:14:33 +02:00
  e769c15d28
• 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.

  miterosan · 2018-07-24 04:58:40 +02:00
  3df1842e1c
• Finding peace with the UI thread.

  There is the issue that in some cases that the ui thread blocked.

  miterosan · 2018-07-24 04:56:34 +02:00
  55f0cbf63e
• Extract the message hadling logic into IncomingMessagesHandler
  miterosan · 2018-07-24 04:54:11 +02:00
  16db81e9b5
• Rename fetchMsgReq to fetchMessageReq in ChannelManager.cs
  miterosan · 2018-07-23 22:09:05 +02:00
  9a6d92bb22
• Nicefy the errormessage in the constructor of GetMessagesRequest
  miterosan · 2018-07-23 22:08:37 +02:00
  2ae890366a
• Instead of Doing nothing at LinkFlowContainer if no link was found, we log it as an error.
  miterosan · 2018-07-23 22:06:40 +02:00
  d9611dcffb
• Simplify user channel message population code
  Dean Herbert · 2018-07-23 21:15:52 +02:00
  1ab75529a1
• Move private channel constructor to own class
  Dean Herbert · 2018-07-23 20:46:44 +02:00
  0aacde836a
• Remove unessary usings
  miterosan · 2018-07-23 16:05:39 +02:00
  2726d91594
• Readd usings I removed with my merge
  miterosan · 2018-07-23 15:48:48 +02:00
  344ec40a27
• Merge branch 'master' of https://github.com/ppy/osu into Private_Messages

  # Conflicts:
  #	osu.Game/Overlays/Chat/ChatTabControl.cs
  #	osu.Game/Overlays/ChatOverlay.cs

  miterosan · 2018-07-23 15:45:54 +02:00
  9f43e0c900
• Merge pull request #3103 from peppy/fix-testing-regression

  Fix fatal test result on temporary file deletion failures

  Dan Balasescu · 2018-07-23 19:44:25 +09:00
  9dc55688d2
• Prevent fatal failures on delete failures
  Dean Herbert · 2018-07-23 10:39:43 +02:00
  2169a47325
• Fix testing regression
  Dean Herbert · 2018-07-23 10:33:10 +02:00
  82ea4456e4
• Merge pull request #3079 from smoogipoo/centralise-judgement-display

  Centralise method of disabling playfield judgements

  Dean Herbert · 2018-07-23 05:34:50 +09:00
  9f1d37e052
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 05:23:52 +09:00
  6fa70ed696
• Merge pull request #3076 from smoogipoo/per-object-css

  Add support for multiple sample banks on a per-hitobject level

  Dean Herbert · 2018-07-23 05:07:46 +09:00
  f285279258
• Merge branch 'master' into per-object-css
  Dean Herbert · 2018-07-23 03:01:17 +09:00
  d561f54282
• Merge pull request #3095 from VPeruS/patch-1

  README clarification about dotnet restore for VScode users

  Dean Herbert · 2018-07-23 03:00:45 +09:00
  aa54472600
• Use full application name
  Dean Herbert · 2018-07-22 20:00:34 +02:00
  717345f260
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 02:58:49 +09:00
  d868d81b59
• Merge pull request #3093 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-07-23 02:57:46 +09:00
  61a57b8050
• Small clarification about to run dotnet restore
  VperuS · 2018-07-21 13:27:45 +03:00
  41ffc17fe3
• Update framework
  Dean Herbert · 2018-07-21 16:21:53 +09:00
  0f37758314
• Merge pull request #3063 from peppy/fix-model-import

  Fix ArchiveModelManager's model import method not running import logic

  Dan Balasescu · 2018-07-20 23:50:29 +09:00
  1796ffde14
• Merge branch 'master' into fix-model-import
  Dean Herbert · 2018-07-20 23:30:41 +09:00
  77da100c0f
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-20 17:29:15 +09:00
  3fc7f33e90
• Merge pull request #3042 from peppy/pause-input-fixes

  Improve pause logic

  Dean Herbert · 2018-07-20 17:28:25 +09:00
  f226e10033
• Merge branch 'master' into pause-input-fixes
  Dean Herbert · 2018-07-20 17:20:19 +09:00
  7cc999027d
• Remove unnecessary counting change logic
  Dean Herbert · 2018-07-20 17:08:25 +09:00
  241437c819
• Centralise method of disabling playfield judgements
  smoogipoo · 2018-07-20 17:04:33 +09:00
  1139f0dbf2
• Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
  Dean Herbert · 2018-07-20 16:42:46 +09:00
  fc6deb6ab5
• Add ToList
  Dean Herbert · 2018-07-20 16:38:02 +09:00
  7fea2b3a8b
• Merge pull request #3065 from peppy/no-more-memory-sqlite

  Remove SingletonContextFactory database testing interface

  Dan Balasescu · 2018-07-20 16:37:54 +09:00
  56a0cd0789
• Merge branch 'master' into fix-model-import
  Dean Herbert · 2018-07-20 16:17:39 +09:00
  92fe996a8b
• Merge branch 'master' into no-more-memory-sqlite
  Dean Herbert · 2018-07-20 16:17:36 +09:00
  0e7bb3b548
• Merge pull request #3072 from davidv273/fix-import-float-coords

  Fixes parsing of HitObject in case of float coords

  Dean Herbert · 2018-07-20 16:08:39 +09:00
  2af5d795fe
• Implement per-hitobject custom sample banks
  smoogipoo · 2018-07-20 15:12:44 +09:00
  c087a73f40
• Remove unnecessary setting of sample name to same value
  smoogipoo · 2018-07-20 15:12:21 +09:00
  de8d05bb0c
• Adjust testcase
  smoogipoo · 2018-07-20 15:12:04 +09:00
  967d0c3c72
• Restructure + corrects converting to support all systems
  David V · 2018-07-19 17:47:55 +02:00
  9eb69a1e76
• Converts float to int.
  David V · 2018-07-19 15:55:38 +02:00
  4e72794101
• Centralise test storage logic
  Dean Herbert · 2018-07-19 14:07:55 +09:00
  7be3a5d466
• Ensure online IDs are validated for imports that don't have an associated archive too
  Dean Herbert · 2018-07-19 13:41:34 +09:00
  68614f1512