Huo Yaoyuan
|
af4ddf8fbd
|
Merge branch 'master' into profile.
|
2017-06-16 16:32:54 +08:00 |
|
Huo Yaoyuan
|
fa98cfa9e5
|
Handle max==min in LineGraph.
|
2017-06-16 14:48:14 +08:00 |
|
Dean Herbert
|
ae79ba48be
|
Merge branch 'master' into numpad-enter
|
2017-06-16 15:32:52 +09:00 |
|
MrTheMake
|
06089a74e3
|
Handle the numpad's Enter in cases where only the normal Enter was handled
|
2017-06-15 23:06:28 +02:00 |
|
Huo Yaoyuan
|
3ec5d774df
|
Child control fixes.
|
2017-06-15 22:42:15 +08:00 |
|
Huo Yaoyuan
|
ce67a28609
|
Merge branch 'master' into profile.
|
2017-06-15 02:31:51 +08:00 |
|
Huo Yaoyuan
|
78669a5941
|
Hover for rank history.
|
2017-06-15 02:17:48 +08:00 |
|
Huo Yaoyuan
|
3b64dfe0fd
|
Update transform using masking.
|
2017-06-15 00:46:39 +08:00 |
|
Huo Yaoyuan
|
443e24716c
|
Handle relative size at LineGraph level.
|
2017-06-14 22:00:22 +08:00 |
|
Huo Yaoyuan
|
190de76d9a
|
Add LineGraph.
|
2017-06-14 20:37:07 +08:00 |
|
smoogipooo
|
99a93d98dc
|
Merge remote-tracking branch 'origin/master' into fix-hacky-tabs
|
2017-06-13 19:46:01 +09:00 |
|
Huo Yaoyuan
|
9ceb4930e9
|
Merge branch 'master' into profile
|
2017-06-13 15:23:12 +08:00 |
|
Dean Herbert
|
19236dcd1e
|
Merge branch 'improved-loading-animation' into nuget-update
|
2017-06-13 15:50:21 +09:00 |
|
Dean Herbert
|
700d6f9d38
|
Adjust appearance slightly
|
2017-06-13 15:27:47 +09:00 |
|
Dean Herbert
|
679786c76f
|
Move MenuItemType to correct namespace
|
2017-06-13 15:20:21 +09:00 |
|
EVAST9919
|
9f8c66b8c6
|
Forgot to add dropdown-like animation
|
2017-06-12 13:39:45 +03:00 |
|
EVAST9919
|
41eb084191
|
CI fixes
|
2017-06-12 13:37:13 +03:00 |
|
EVAST9919
|
1711258038
|
Context Menu
|
2017-06-12 12:56:07 +03:00 |
|
Dean Herbert
|
3efe8629d6
|
Fix hacky tabs
|
2017-06-12 18:39:22 +09:00 |
|
Dean Herbert
|
e94425f311
|
Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
|
2017-06-12 17:04:42 +09:00 |
|
Huo Yaoyuan
|
e311ac612c
|
Merge branch 'master' into profile
|
2017-06-12 14:40:42 +08:00 |
|
smoogipooo
|
ffbb46f668
|
Update in line with framework.
|
2017-06-12 12:48:47 +09:00 |
|
Huo Yaoyuan
|
3945d33adc
|
Make OsuTabControl.isEnumType static.
|
2017-06-09 19:04:29 +08:00 |
|
Huo Yaoyuan
|
140c74cd2a
|
Use PageTabControl.
|
2017-06-09 16:01:16 +08:00 |
|
John Neijzen
|
2f7d9655fd
|
More Clean up
|
2017-06-08 15:27:35 +08:00 |
|
John Neijzen
|
431d225a60
|
Keyword Spacing and Brackets Fixing
|
2017-06-08 14:35:10 +08:00 |
|
Dean Herbert
|
bf971f6613
|
Merge branch 'master' into social-browser
|
2017-06-05 19:16:28 +09:00 |
|
Dean Herbert
|
0cb1df35e9
|
Merge remote-tracking branch 'upstream/master' into ingame_options
|
2017-06-05 14:53:37 +09:00 |
|
Jorolf
|
f6e0e0bc38
|
add caps lock warning
|
2017-06-03 19:24:53 +02:00 |
|
Jorolf
|
a43890ffb4
|
update osu to use the framework's TooltipContainer
|
2017-06-03 14:50:35 +02:00 |
|
Seth
|
394745bca5
|
Merge branch 'master' into social-browser
|
2017-05-31 05:18:52 -03:00 |
|
Dean Herbert
|
bab3f1b89a
|
Merge branch 'master' into user-dropdown-arrow
|
2017-05-31 15:39:52 +09:00 |
|
EVAST9919
|
8cde50a88a
|
Merge branch 'master' of https://github.com/ppy/osu into ingame_options
|
2017-05-31 08:23:06 +03:00 |
|
DrabWeb
|
cd57343191
|
Text -> Label
|
2017-05-31 02:03:13 -03:00 |
|
DrabWeb
|
4fd7405fb8
|
Fix user dropdown menu item chevron alignment
|
2017-05-31 01:57:32 -03:00 |
|
Dean Herbert
|
8544b45443
|
Update in line with framework
|
2017-05-30 22:23:51 +09:00 |
|
EVAST9919
|
e737ded382
|
Applied suggested changes
|
2017-05-30 12:23:53 +03:00 |
|
smoogipooo
|
7416952eb3
|
Fix usings.
|
2017-05-30 17:36:42 +09:00 |
|
smoogipooo
|
c8066cfde9
|
Allow Nub/OsuCheckbox/OsuSliderBar colours to be overridden.
|
2017-05-30 16:40:35 +09:00 |
|
EVAST9919
|
08219ccb42
|
Applied suggested changes
|
2017-05-29 19:00:29 +03:00 |
|
Dean Herbert
|
5e4558cc54
|
Merge branch 'master' into social-browser
|
2017-05-29 18:35:22 +09:00 |
|
Dan Balasescu
|
6918368afc
|
Merge branch 'master' into ingame_options
|
2017-05-29 18:12:02 +09:00 |
|
Dean Herbert
|
718eeb6df8
|
Use linq to tidy up casting
|
2017-05-29 16:18:07 +09:00 |
|
Dean Herbert
|
4a0c8fb5dd
|
Merge branch 'master' into breadcrumbs
|
2017-05-29 15:59:37 +09:00 |
|
Dean Herbert
|
f3422800b1
|
Merge remote-tracking branch 'upstream/master' into backbutton_beat
|
2017-05-29 13:04:43 +09:00 |
|
Seth
|
0e087994a1
|
Merge branch 'master' into social-browser
|
2017-05-28 15:11:00 -03:00 |
|
Dean Herbert
|
d749fc516d
|
Update focus handling in line with framework changes
|
2017-05-28 20:08:46 +09:00 |
|
Dean Herbert
|
bdeaf2dbb4
|
Update method names in line with framework changes
|
2017-05-28 18:34:12 +09:00 |
|
EVAST9919
|
743dfcc130
|
More xmldoc and few Title text fixes
|
2017-05-28 00:56:11 +03:00 |
|
DrabWeb
|
d4a9813af9
|
Cleanup BreadcrumbTabItem visibility code
|
2017-05-27 18:19:09 -03:00 |
|
EVAST9919
|
bedcf04043
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-27 02:25:03 +03:00 |
|
DrabWeb
|
3699c39967
|
PADDING -> padding, make private
|
2017-05-26 16:46:09 -03:00 |
|
DrabWeb
|
33d6b718be
|
padding -> PADDING
|
2017-05-26 16:37:52 -03:00 |
|
DrabWeb
|
c9971bb490
|
Don't store hideChevron
|
2017-05-26 16:32:46 -03:00 |
|
DrabWeb
|
4c127a6130
|
CI fixes
|
2017-05-26 16:29:20 -03:00 |
|
DrabWeb
|
352d3d247b
|
Fix incorrect sizes
|
2017-05-26 16:21:37 -03:00 |
|
DrabWeb
|
fb6ed159ca
|
Use padding for chevron margin
|
2017-05-26 16:03:51 -03:00 |
|
EVAST9919
|
d052f093d5
|
Scaling on hover
|
2017-05-26 14:29:45 +03:00 |
|
DrabWeb
|
cbe36259c3
|
Add BreadcrumbControl
|
2017-05-26 07:49:45 -03:00 |
|
EVAST9919
|
2c23703ca6
|
Removed amplitude container
|
2017-05-26 13:46:44 +03:00 |
|
EVAST9919
|
ad66587273
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into backbutton_beat
|
2017-05-26 13:19:47 +03:00 |
|
DrabWeb
|
8fca0fddb3
|
Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser
|
2017-05-26 00:54:03 -03:00 |
|
DrabWeb
|
8e09b738b0
|
Remove magic numbers
|
2017-05-24 21:51:00 -03:00 |
|
DrabWeb
|
b57a3f2056
|
Initial layout of user panel and user dropdown
|
2017-05-24 19:44:48 -03:00 |
|
EVAST9919
|
181648515b
|
Moving icon to the beat on the TwoLayerButton
|
2017-05-24 16:05:24 +03:00 |
|
EVAST9919
|
178f8127b8
|
overall fixes
|
2017-05-23 16:01:00 +03:00 |
|
EVAST9919
|
0615f104f0
|
SettingsContainer -> SettingsDropdownContainer
|
2017-05-21 18:22:27 +03:00 |
|
DrabWeb
|
1d61fc84c7
|
Remove duplicate code in SettingsEnumDropdown
|
2017-05-19 17:04:59 -03:00 |
|
EVAST9919
|
6f0e1fccdb
|
moved autosize to ctor and whitespace fix
|
2017-05-19 16:08:33 +03:00 |
|
EVAST9919
|
e18f95185f
|
More constants
|
2017-05-19 06:39:39 +03:00 |
|
EVAST9919
|
c3647e4056
|
dropdown-like animation
|
2017-05-19 06:26:54 +03:00 |
|
DrabWeb
|
a5fa7e1a7d
|
Result counts displaying
|
2017-05-18 17:43:39 -03:00 |
|
EVAST9919
|
f2af31aceb
|
Naming fixes
|
2017-05-18 20:21:58 +03:00 |
|
EVAST9919
|
640c940fce
|
Make field readonly
|
2017-05-18 11:50:15 +03:00 |
|
EVAST9919
|
83a89ce22d
|
options -> settings
|
2017-05-18 11:39:22 +03:00 |
|
DrabWeb
|
5fb445e3fe
|
Basic direct panel, minor cleanups
|
2017-05-17 16:37:34 -03:00 |
|
DrabWeb
|
9ba356f2c6
|
Added osu!direct header and filter control
|
2017-05-17 05:58:34 -03:00 |
|
EVAST9919
|
5fb8830e3a
|
Moved music controller buttons to it's own class
|
2017-05-17 10:36:24 +03:00 |
|
Huo Yaoyuan
|
f1d5a92950
|
Use generic IEqutable to avoid typeless Equals.
|
2017-05-16 21:49:38 +08:00 |
|
Huo Yaoyuan
|
b9a40a841b
|
Use IsAssignableFrom.
|
2017-05-16 21:04:54 +08:00 |
|
Dean Herbert
|
b016d53b85
|
Fix TwoLayerButton not capturing MouseDown events
Caused clicks to pass through the skip button to the progress bar.
|
2017-05-16 17:59:07 +09:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
Dean Herbert
|
24db423c4f
|
Merge remote-tracking branch 'upstream/master' into playlist-commit
|
2017-05-12 20:39:50 +09:00 |
|
Dan Balasescu
|
815379646c
|
Merge branch 'master' into new-option-search
|
2017-05-12 20:22:11 +09:00 |
|
Dean Herbert
|
d2e066ca35
|
Move SearchTextBox to better namespace
Is being used in multiple places now.
|
2017-05-12 19:57:06 +09:00 |
|
Dean Herbert
|
f044b95ce8
|
Allow OsuTabControl to handle non-enum types.
|
2017-05-11 23:10:19 +09:00 |
|
DrabWeb
|
c193a90a16
|
Merge https://github.com/ppy/osu into playlist
|
2017-04-29 05:39:52 -03:00 |
|
Dean Herbert
|
94c259bd59
|
Remove most usages of DelayReset
ButtonSystem requires some more work.
|
2017-04-27 18:39:40 +09:00 |
|
Jorolf
|
e53c4be356
|
I guess this works...
|
2017-04-22 18:36:36 +02:00 |
|
Jorolf
|
02249dcd67
|
add a function to OsuSliderBar to manually set the tooltip text
|
2017-04-22 18:34:57 +02:00 |
|
Dean Herbert
|
ef7bc0f92e
|
Update UI controls to understand DisabledChanged.
|
2017-04-21 14:02:04 +09:00 |
|
Dean Herbert
|
02e406860b
|
Merge remote-tracking branch 'upstream/master' into tooltips
# Conflicts:
# osu.Game/Graphics/UserInterface/OsuSliderBar.cs
|
2017-04-20 18:02:38 +09:00 |
|
Dean Herbert
|
0de71ab24d
|
Add basic tooltip support to OsuSliderBar.
|
2017-04-20 17:57:58 +09:00 |
|
Dean Herbert
|
c87657707f
|
Add tooltip to sliderbars. Move interface.
|
2017-04-20 17:33:07 +09:00 |
|
Dean Herbert
|
9c8cd08927
|
Don't play sliderbar samples more than once when value has not changed.
|
2017-04-20 16:35:55 +09:00 |
|
Dean Herbert
|
52ddc414d5
|
Fix errors.
|
2017-04-14 20:17:17 +09:00 |
|
Dean Herbert
|
ed3956eca5
|
Make comma separators optional.
|
2017-04-14 20:09:01 +09:00 |
|
Dean Herbert
|
ac3b435f00
|
Merge remote-tracking branch 'upstream/master' into hud-improvements
# Conflicts:
# osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
|
2017-04-14 19:29:59 +09:00 |
|
smoogipooo
|
3054697f98
|
Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.
|
2017-04-13 10:04:12 +09:00 |
|
smoogipooo
|
2987a57588
|
Use formatter to add zeroes.
|
2017-04-12 20:28:04 +09:00 |
|
Dean Herbert
|
157ad17606
|
Merge branch 'master' into details
|
2017-04-12 20:25:51 +09:00 |
|
Dan Balasescu
|
5bf71aae9c
|
Remove unused using.
|
2017-04-12 20:14:12 +09:00 |
|
Dean Herbert
|
ec6267c5b2
|
switch -> if.
|
2017-04-12 19:41:11 +09:00 |
|
Jorolf
|
d2affe6867
|
requested changes
|
2017-04-12 10:52:24 +02:00 |
|
Dean Herbert
|
2964c04c14
|
Add special SliderBar sound behaviour when at extents.
|
2017-04-12 12:07:29 +09:00 |
|
Dean Herbert
|
d6fa51dc5c
|
Update SliderBar to use OnUserChange method.
|
2017-04-12 12:07:27 +09:00 |
|
Jorolf
|
ed2f5d210e
|
condensed some commits because they were small or already reversed
|
2017-04-11 22:48:53 +02:00 |
|
Jorolf
|
50b6bcd574
|
Merge branch 'master' into details
|
2017-04-11 19:06:58 +02:00 |
|
Jorolf
|
d4e5f55091
|
the power of linq
|
2017-04-11 18:43:48 +02:00 |
|
Jorolf
|
fb5952186c
|
changes and fixes
|
2017-04-11 14:02:56 +02:00 |
|
Dean Herbert
|
2bb50ff082
|
Add commas to score counter.
|
2017-04-11 19:21:05 +09:00 |
|
Dean Herbert
|
c615762da6
|
wip
|
2017-04-11 18:56:25 +09:00 |
|
Dean Herbert
|
f8c6ce15c3
|
Fix weird RollingCounter behaviour.
|
2017-04-11 16:37:36 +09:00 |
|
Jorolf
|
ad41fd5c1a
|
more unnecessary stuff
|
2017-04-10 16:49:48 +02:00 |
|
Jorolf
|
412d6a14ca
|
removed something unnecessary
|
2017-04-10 16:45:34 +02:00 |
|
Jorolf
|
a597149b7f
|
Merge branch 'details' of github.com:Jorolf/osu into details
|
2017-04-10 16:42:42 +02:00 |
|
Jorolf
|
24b4b3ad7d
|
update to everything
|
2017-04-10 16:42:23 +02:00 |
|
Dean Herbert
|
c6a24bb549
|
Merge branch 'master' into details
|
2017-04-10 20:07:13 +09:00 |
|
Dean Herbert
|
5af4259ab4
|
Add back explicit binds.
|
2017-04-10 17:10:15 +09:00 |
|
Dean Herbert
|
f12b5a8954
|
Unify disable logic.
|
2017-04-10 16:22:36 +09:00 |
|
Dean Herbert
|
bb4a909de5
|
Update UI control access in line with framework changes.
|
2017-04-10 14:54:23 +09:00 |
|
DrabWeb
|
963cd09bd0
|
Merge https://github.com/ppy/osu into playlist
|
2017-04-09 04:04:13 -03:00 |
|
Jorolf
|
f7a9a11ae5
|
Bar uses AccentColour aswell
|
2017-04-08 13:53:11 +02:00 |
|
Jorolf
|
5e56e84c4a
|
change SRGBColour to Color4 and use IHasAccentColour in some places
|
2017-04-08 13:31:55 +02:00 |
|
Jorolf
|
c60a55285c
|
updated TestCase and some null checks
|
2017-04-07 20:32:09 +02:00 |
|
Jorolf
|
9881889f88
|
removed some unused stuff
|
2017-04-07 18:24:36 +02:00 |
|
Jorolf
|
eb4b3772e9
|
put Bar into its own file and let it only add a background if BackgroundColour is changed
|
2017-04-07 18:13:55 +02:00 |
|
Jorolf
|
e59c0a770f
|
Merge branch 'master' into details
|
2017-04-06 15:42:00 +02:00 |
|
Huo Yaoyuan
|
9b1e010dcc
|
Fix filename mismatch.
|
2017-04-06 16:05:41 +08:00 |
|
Dean Herbert
|
942699218a
|
Merge branch 'master' into details
|
2017-04-06 15:44:43 +09:00 |
|
Jorolf
|
f9bf1c69bf
|
add Flags to BarDirection and remove unused "using"
|
2017-04-04 18:23:29 +02:00 |
|
Jorolf
|
502afc0a48
|
some fixes to BarGraph so Direction works properly
|
2017-04-04 18:09:16 +02:00 |
|
Jorolf
|
b2731bb0a1
|
some formatting
|
2017-04-04 17:27:08 +02:00 |
|
Jorolf
|
58f8dc8254
|
add direction to graphs
|
2017-04-04 17:17:22 +02:00 |
|
Dean Herbert
|
7c74951454
|
Update bindables.
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseResults.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/Results.cs
|
2017-04-04 11:34:13 +09:00 |
|
Dean Herbert
|
f6303d55ec
|
Upodate some tab usages.
|
2017-04-04 11:13:09 +09:00 |
|
Jorolf
|
5a694e0c9d
|
changed location of BarGraph to be more generic
|
2017-04-03 19:29:13 +02:00 |
|
Dean Herbert
|
24d06fa92d
|
CheckBox -> Checkbox.
|
2017-03-31 17:38:33 +09:00 |
|
Dean Herbert
|
79031b9e74
|
Update framework.
|
2017-03-31 12:58:54 +09:00 |
|
Dean Herbert
|
f7dc7e9bb9
|
Update references.
|
2017-03-28 21:26:20 +09:00 |
|
DrabWeb
|
215b016f32
|
Initial implementation
|
2017-03-24 05:59:26 -03:00 |
|
DrabWeb
|
88d878e1d5
|
Formatting
|
2017-03-23 02:47:27 -03:00 |
|
Dean Herbert
|
e77229b34b
|
Merge branch 'master' into beatmap-detail-tabs
|
2017-03-23 14:26:00 +09:00 |
|
Dean Herbert
|
681ed38941
|
Use const whenever possible.
|
2017-03-23 13:52:38 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
DrabWeb
|
b8b45262c5
|
Formatting
|
2017-03-23 01:35:55 -03:00 |
|
DrabWeb
|
67421cdf1c
|
Even though it was 5 minutes ago what was I thinking
|
2017-03-23 01:34:06 -03:00 |
|
DrabWeb
|
87b8015e8f
|
Cleanup
|
2017-03-23 00:29:28 -03:00 |
|
DrabWeb
|
c173c4b7ee
|
Tab control
|
2017-03-23 00:22:31 -03:00 |
|
Dean Herbert
|
b0340f77d8
|
Remove nested types completely.
|
2017-03-23 08:57:14 +09:00 |
|