Commit Graph

9529 Commits

Author SHA1 Message Date
ecf8a89f26 Set AccentColour and GlowColour in StandardHealthDisplay 2018-11-16 19:30:58 +03:00
37b19f78ae Set AccentColour in concrete counters 2018-11-15 23:37:21 +03:00
e8f34ddff0 Merge branch 'master' into return_to_large_logo_after_idle 2018-11-15 15:16:10 +09:00
9dd3d28436 Fix SettingsTextBox having width of 0 2018-11-14 22:29:11 +01:00
caaa5645e3 Correct framework version 2018-11-14 21:16:08 +09:00
30547ac064 Merge remote-tracking branch 'upstream/master' into dropdown-updates 2018-11-14 20:03:45 +09:00
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00
81a3170e3b Merge branch 'master' into hold-for-menu-back 2018-11-14 19:13:07 +09:00
61a62a4eae Merge branch 'master' into hold-for-menu-back 2018-11-14 18:35:08 +09:00
4b86c29f7b Merge remote-tracking branch 'origin/master' into placement-hiding 2018-11-14 18:34:45 +09:00
c963fc7cd2 Reduce chaining 2018-11-14 18:34:13 +09:00
e9b47c6233 Merge branch 'master' into hold-for-menu-back 2018-11-14 18:22:34 +09:00
a83efe225e Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase 2018-11-14 18:11:53 +09:00
aff5fa6169 Update with osu!-side dropdown changes 2018-11-14 18:02:38 +09:00
a1dd1057ce Merge branch 'master' into more-global-scrollalgo 2018-11-14 17:15:24 +09:00
84d16ee71b Merge branch 'master' into placement-hiding 2018-11-14 16:59:41 +09:00
7274908059 Implement interface 2018-11-14 15:33:09 +09:00
fb22fc11f6 Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-14 13:59:17 +09:00
9a9d5e60af More refactors 2018-11-14 13:59:02 +09:00
2ae139d260 Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:54:53 +09:00
34973a3e9f Merge branch 'master' into scrollalgorithm-timeat 2018-11-14 13:32:16 +09:00
8b190edde0 Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
8d59b7299f Merge branch 'master' into no-drawable-speedchangevis 2018-11-14 13:22:01 +09:00
c4769f6802 Refactors 2018-11-14 13:19:51 +09:00
396a5b3cd0 Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
b9278b3488 Fix brackets 2018-11-14 12:05:07 +09:00
161d476091 Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song 2018-11-14 11:53:43 +09:00
c77412992e Merge conditionals 2018-11-14 11:53:34 +09:00
3caf0cb0d9 Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
e7d984415b Merge branch 'master' into immutable-sliderpath 2018-11-13 18:06:14 +09:00
72ae22b0c4 Add support for creating new PM conversations 2018-11-13 17:24:11 +09:00
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
6d43baf4bf Make show/hide only invoked once each 2018-11-13 13:12:11 +09:00
fbc20d2d4d Hide placement when cursor is not in the playfield 2018-11-13 12:52:04 +09:00
8b9f7f6691 Merge branch 'master' into Private_Messages 2018-11-12 20:43:10 +09:00
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
2e0e1befe9 Add selection mask testcases
# Conflicts:
#	osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
2018-11-12 17:40:09 +09:00
8be6e351f5 Merge branch 'fix-mania-selections' into add-mania-selection-testcase 2018-11-12 17:39:58 +09:00
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
54668a0dec Simplify construction of ScrollingInfo 2018-11-12 17:34:35 +09:00
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
48486895ba Remove unused code 2018-11-12 17:34:35 +09:00
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
f3ba429701 Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
1101e161d9 Update framework and resources 2018-11-12 17:02:46 +09:00