Dean Herbert
|
0634a3a5c5
|
Merge branch 'master' into osu-direct
|
2017-05-23 17:33:20 +09:00 |
|
smoogipooo
|
aad6f8f5d6
|
Refactoring of BeatSyncedContainer.
|
2017-05-23 16:11:46 +09:00 |
|
smoogipooo
|
1867cbb381
|
Revert a bit of BeatSyncedContainer for smaller changeset.
|
2017-05-23 16:06:30 +09:00 |
|
smoogipooo
|
836bf930a0
|
More cleanups.
|
2017-05-23 15:29:38 +09:00 |
|
smoogipooo
|
3cdfd2eef5
|
Split ControlPoint into different types.
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
|
2017-05-23 14:03:40 +09:00 |
|
Dean Herbert
|
3e0aaa1aa0
|
Add basic beat response to osu! logo
|
2017-05-23 12:29:43 +09:00 |
|
Dean Herbert
|
1295b0a7e1
|
Merge branch 'master' into ColdVolcano/beat-syncing
|
2017-05-23 10:51:47 +09:00 |
|
smoogipooo
|
adf8bb853e
|
Move load() to be directly below ctor.
|
2017-05-22 20:06:37 +09:00 |
|
smoogipooo
|
de575b3867
|
Early return if beatLength = 0.
|
2017-05-22 20:02:02 +09:00 |
|
smoogipooo
|
95c4704a9e
|
Delay backwards instead of using a millisecond tolerance.
|
2017-05-22 20:01:28 +09:00 |
|
Dan Balasescu
|
fc90cfa604
|
Update BeatSyncedContainer.cs
|
2017-05-22 17:50:05 +09:00 |
|
Dan Balasescu
|
a438a8b8d3
|
Merge branch 'master' into ColdVolcano/beat-syncing
|
2017-05-22 17:27:22 +09:00 |
|
smoogipooo
|
70d7f61f7c
|
More inversion for logic simplification.
|
2017-05-22 17:19:39 +09:00 |
|
smoogipooo
|
f81ffa636d
|
Use BindTo instead of taking the game's beatmap bindable.
|
2017-05-22 17:18:11 +09:00 |
|
smoogipooo
|
609aac6453
|
Better kiai mode detection.
|
2017-05-22 17:18:05 +09:00 |
|
smoogipooo
|
b241140496
|
Proper kiai mode detection.
|
2017-05-22 17:18:00 +09:00 |
|
smoogipooo
|
abe9c464a8
|
Invert if statements.
|
2017-05-22 17:17:54 +09:00 |
|
Huo Yaoyuan
|
85684e5fee
|
Do not scroll headers to when scrolling position is negative.
|
2017-05-22 15:54:58 +08:00 |
|
EVAST9919
|
50e3feb761
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-22 09:12:40 +03:00 |
|
Huo Yaoyuan
|
d0ff9e6576
|
Merge branch 'master' into sections
|
2017-05-22 12:52:27 +08:00 |
|
Dean Herbert
|
82cf94bbff
|
Move spinner colours to local definition for now
We don't want to start polluting the OsuColours namespace with non-UI colours.
|
2017-05-22 09:50:45 +09:00 |
|
EVAST9919
|
0615f104f0
|
SettingsContainer -> SettingsDropdownContainer
|
2017-05-21 18:22:27 +03:00 |
|
Huo Yaoyuan
|
7357076c4d
|
CI fixes.
|
2017-05-21 04:48:43 +08:00 |
|
Huo Yaoyuan
|
a98f109d73
|
Use LayoutSize for header and footer layout.
|
2017-05-21 04:01:07 +08:00 |
|
Huo Yaoyuan
|
93668e53a0
|
Add footer support.
|
2017-05-21 03:44:03 +08:00 |
|
Huo Yaoyuan
|
201b44dbf1
|
Do not make the name confusing.
|
2017-05-21 03:02:51 +08:00 |
|
Huo Yaoyuan
|
72621c81dc
|
Handle null and invalidation of headers.
|
2017-05-21 02:37:34 +08:00 |
|
Huo Yaoyuan
|
e040f297c6
|
Set Masking = false and expose ScrollContainer.
|
2017-05-21 02:21:23 +08:00 |
|
Huo Yaoyuan
|
da47b0a260
|
Fix margin and offset calculating.
|
2017-05-21 02:11:55 +08:00 |
|
ColdVolcano
|
07d148f708
|
Merge branch 'master' of ppy/osu into beat-syncing
|
2017-05-20 11:46:51 -05:00 |
|
Dean Herbert
|
0b987be600
|
Merge branch 'master' into osu-direct
|
2017-05-20 16:17:59 +09:00 |
|
DrabWeb
|
e030573436
|
Add ReverseDepthFillFlowContainer to remove code duplication
|
2017-05-19 23:44:36 -03:00 |
|
Huo Yaoyuan
|
ecc222c043
|
Allow custom SectionsContainer.
|
2017-05-20 07:20:46 +08:00 |
|
Huo Yaoyuan
|
473441dfd4
|
Fix fields being null.
|
2017-05-20 07:07:27 +08:00 |
|
Huo Yaoyuan
|
e06c917c95
|
Selection support of SectionsContainer.
|
2017-05-20 06:39:01 +08:00 |
|
Huo Yaoyuan
|
058c5e18a4
|
Scrolling support for SectionsContainer.
|
2017-05-20 05:48:40 +08:00 |
|
Huo Yaoyuan
|
24a813e907
|
Basic children management of SectionsContainer.
|
2017-05-20 05:15:57 +08: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 |
|
Javier Flores
|
793b760ff2
|
Cleanup logic
|
2017-05-18 20:19:00 -05: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
|
a1b90ee70e
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-18 18:26:38 +03:00 |
|
Dean Herbert
|
3004a44b98
|
Further colour adjustments
|
2017-05-18 22:21:41 +09:00 |
|
Dean Herbert
|
c78dfb4a13
|
Oops colours were wrong
|
2017-05-18 21:56:19 +09:00 |
|
Dean Herbert
|
e3ae2bca6d
|
Design improvements
paired with smoogi
|
2017-05-18 21:38:19 +09: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 |
|
Javier Flores
|
f4c7a02a6f
|
Fix having negative beat when it should be 0
|
2017-05-17 09:23:04 -05: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 |
|
ColdVolcano
|
198542465b
|
More CI fixes
|
2017-05-17 01:37:31 -05:00 |
|
ColdVolcano
|
387d26a576
|
CI Fixes
|
2017-05-17 01:26:34 -05:00 |
|
ColdVolcano
|
5f192cae7b
|
Add missing licence header
|
2017-05-17 01:18:56 -05:00 |
|
ColdVolcano
|
0801a211da
|
Add a base container with beat syncing logic
|
2017-05-17 01:14:04 -05: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
|
f730769186
|
Rewrite to make better
|
2017-05-15 12:54:56 +09:00 |
|
Dean Herbert
|
3b87a938db
|
Merge branch 'master' into cursor_size.
|
2017-05-15 12:23:49 +09:00 |
|
Dean Herbert
|
622b155fda
|
OsuConfig -> OsuSetting
|
2017-05-15 10:56:27 +09:00 |
|
EVAST9919
|
b6460d89c9
|
Cleanup
|
2017-05-14 10:26:52 +03:00 |
|
EVAST9919
|
49f5364e9e
|
CI fixes
|
2017-05-14 07:35:23 +03:00 |
|
EVAST9919
|
12dab6f75c
|
iplemented stable-like algorithm
|
2017-05-14 07:28:12 +03:00 |
|
EVAST9919
|
ca6df533bd
|
Automatic gameplay cursor size
|
2017-05-13 03:46:37 +03: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
|
dbf60d24bf
|
Second design update pass.
|
2017-05-12 15:39:00 +09:00 |
|
Dean Herbert
|
f044b95ce8
|
Allow OsuTabControl to handle non-enum types.
|
2017-05-11 23:10:19 +09:00 |
|
smoogipooo
|
e1ed785cbf
|
Update framework.
|
2017-05-09 21:00:40 +09:00 |
|
Dean Herbert
|
ab1768ef80
|
Merge branch 'master' into tidy-up
|
2017-05-09 10:27:29 +09:00 |
|
Huo Yaoyuan
|
dff05bec79
|
Use readonly fields.
|
2017-05-08 18:56:04 +08:00 |
|
Dean Herbert
|
9f1f926634
|
Add non-null assurance.
|
2017-05-08 12:45:55 +09:00 |
|
Huo Yaoyuan
|
4f8549f220
|
Standardise usages of exceptions.
|
2017-05-07 00:38:17 +08:00 |
|
WebFreak001
|
5aecc3d761
|
Made cursortrail work with multiple positions
|
2017-05-05 17:44:51 +02:00 |
|
WebFreak001
|
063b606a12
|
Fix readonly warning
|
2017-05-03 18:48:17 +02:00 |
|
WebFreak001
|
008ff9d2f9
|
InputResample CursorTrail
|
2017-05-03 18:33:42 +02: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
|
6e3125e115
|
Merge pull request #656 from smoogipooo/taiko-fixes
Taiko fixes
|
2017-04-20 20:10:29 +09:00 |
|
smoogipooo
|
3acdc1dcfb
|
Update palette colours.
|
2017-04-20 19:36:53 +09:00 |
|
Dean Herbert
|
4e1942f998
|
Fix tooltips sticking after drag.
|
2017-04-20 18:17:12 +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
|
ce5763ed97
|
Remove using.
|
2017-04-20 16:37:29 +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
|
9d975f202f
|
Make background slightly transparent.
|
2017-04-20 16:29:05 +09:00 |
|
Dean Herbert
|
18bbbdad4c
|
Reduce appear delay slightly.
|
2017-04-20 16:28:55 +09:00 |
|
Dean Herbert
|
d12a9a7675
|
Don't run AutoSize transforms when tooltip is already invisible.
|
2017-04-20 16:28:45 +09:00 |
|
Dean Herbert
|
a884ac215e
|
Position tooltip better; remove need for lastState.
|
2017-04-20 16:08:36 +09:00 |
|
Dean Herbert
|
00d8cacba8
|
Update visual apperance.
|
2017-04-20 16:05:25 +09:00 |
|
Dean Herbert
|
990c14fbe0
|
Keep tooltip's current target while the main button is pressed.
Handles drag operations better.
|
2017-04-20 15:51:30 +09:00 |
|
Dean Herbert
|
30c3c932b1
|
Remove redundancies.
|
2017-04-20 15:29:34 +09:00 |
|
Dean Herbert
|
b11315ca46
|
Remove unnecessary interfaces and simplify tooltip logic.
|
2017-04-20 14:34:29 +09:00 |
|
Jorolf
|
ea67b41683
|
move tooltip outside of the cursor
|
2017-04-20 00:42:40 +02:00 |
|
Jorolf
|
d04893a43a
|
---changing---
|
2017-04-19 15:33:24 +02:00 |
|
Jorolf
|
eda0e99179
|
Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips
|
2017-04-19 13:53:08 +02:00 |
|
Jorolf
|
4f9c5dd44d
|
renaming and some changes in TestCaseTooltip
|
2017-04-19 13:52:17 +02:00 |
|
Jorolf
|
af9a45fd6c
|
Merge branch 'master' into tooltips
|
2017-04-19 13:51:39 +02:00 |
|
Jorolf
|
8e4288168a
|
renaming and some changes in TestCaseTooltip
|
2017-04-19 13:47:00 +02:00 |
|
Dean Herbert
|
fbd26a1d5e
|
Mode -> Ruleset.
|
2017-04-18 16:05:58 +09:00 |
|
Jorolf
|
095b6fded6
|
removed unused stuff and change the tooltip y coordinate
|
2017-04-17 19:50:34 +02:00 |
|
Jorolf
|
906d68936a
|
Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips
|
2017-04-17 17:43:54 +02:00 |
|
Jorolf
|
25fd1d2b72
|
made method into property
|
2017-04-17 17:43:44 +02:00 |
|
Jorolf
|
d4ac3c5e9c
|
Update MenuCursor.cs
|
2017-04-17 17:10:55 +02:00 |
|
Jorolf
|
773e6a2911
|
moved tooltip stuff to Tooltip instead of MenuCursor
|
2017-04-17 17:04:48 +02:00 |
|
Jorolf
|
dd26f9fcac
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
|
2017-04-17 14:45:46 +02: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 |
|
Jorolf
|
7f08c3c417
|
add IHasOverhangingTooltip
|
2017-04-14 00:18:17 +02:00 |
|
Jorolf
|
f6f75fac74
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
# Conflicts:
# osu.Game/Graphics/Cursor/MenuCursor.cs
|
2017-04-13 23:12:07 +02:00 |
|
Jorolf
|
c2b2e5ec19
|
changed way the tool tip is found and displayed
|
2017-04-13 23:00:49 +02:00 |
|
Dean Herbert
|
13f057f900
|
Give CursorTrail its own clock for the time being.
|
2017-04-13 14:14:12 +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
|
9732110bd9
|
Update TransformTo methods in line with framework changes.
|
2017-04-11 17:25:56 +09:00 |
|
Dean Herbert
|
7ca0d6d117
|
Adjust cursor popin/out to make it less ugly.
|
2017-04-11 16:44:12 +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 |
|