Dean Herbert
|
324c8ce0bb
|
Only play OsuHoverContainer hover effect if action is present (#4833)
Only play OsuHoverContainer hover effect if action is present
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-05-21 17:16:06 +09:00 |
|
Dan Balasescu
|
2024cdf16d
|
Merge branch 'master' into hover-container-disabled-hover-effect
|
2019-05-21 17:04:50 +09:00 |
|
Dan Balasescu
|
3cf60d63a9
|
Merge pull request #4832 from peppy/abstract-profile-header
Abstract profile header
|
2019-05-21 17:04:43 +09:00 |
|
smoogipoo
|
17cb9d45c9
|
Merge remote-tracking branch 'origin/master' into abstract-profile-header
|
2019-05-21 16:06:27 +09:00 |
|
smoogipoo
|
e76d785c10
|
Move method above nested class
|
2019-05-21 16:05:59 +09:00 |
|
Dan Balasescu
|
103c365165
|
Merge pull request #4834 from peppy/screen-title-custom-icon
Allow custom icon specification in ScreenTitle
|
2019-05-21 16:05:48 +09:00 |
|
Dan Balasescu
|
ad2a495dbc
|
Merge branch 'master' into screen-title-custom-icon
|
2019-05-21 15:56:56 +09:00 |
|
Dean Herbert
|
7169eb67d2
|
Merge branch 'master' into abstract-profile-header
|
2019-05-21 15:33:47 +09:00 |
|
Dean Herbert
|
58efa7a177
|
Merge pull request #4729 from peppy/fix-control-point-ordering
Fix control points with same timestamp potentially being parsed incorrectly
|
2019-05-21 15:33:27 +09:00 |
|
Dean Herbert
|
236b8cec27
|
Update framework
|
2019-05-21 15:31:36 +09:00 |
|
Dean Herbert
|
7c80dbd635
|
Consolidate loader animation tests (#4836)
Consolidate loader animation tests
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-21 15:26:19 +09:00 |
|
Dean Herbert
|
e8f64247c5
|
Merge branch 'master' into consolidate-loader-testcase
|
2019-05-21 15:12:44 +09:00 |
|
Dean Herbert
|
56396d576e
|
Merge pull request #4830 from peppy/move-tooltip-text
Move TooltipText to OsuClickableContainer
|
2019-05-21 15:12:09 +09:00 |
|
Dean Herbert
|
d09101b43c
|
Merge remote-tracking branch 'upstream/master' into hover-container-disabled-hover-effect
|
2019-05-21 15:02:44 +09:00 |
|
Dean Herbert
|
5ed1540a12
|
Handle unhover state change better
|
2019-05-21 15:02:31 +09:00 |
|
Dan Balasescu
|
67ac76aae7
|
Merge branch 'master' into move-tooltip-text
|
2019-05-21 15:00:09 +09:00 |
|
Dan Balasescu
|
73cfe1381d
|
Merge pull request #4831 from peppy/new-colours-osu-colour
Use OsuColour for profile overlay
|
2019-05-21 15:00:03 +09:00 |
|
Dan Balasescu
|
ab183949df
|
Merge branch 'master' into new-colours-osu-colour
|
2019-05-21 14:49:25 +09:00 |
|
smoogipoo
|
aed4634fe0
|
Consolidate loader animation tests
|
2019-05-21 14:48:14 +09:00 |
|
Dean Herbert
|
a18e0b3b2f
|
Fix test scene
|
2019-05-21 14:46:12 +09:00 |
|
Dean Herbert
|
24a7e624df
|
Only propagate badge value changes if not the current UpdateStream
|
2019-05-21 14:35:11 +09:00 |
|
Dan Balasescu
|
1fe082a0c3
|
Merge pull request #4835 from peppy/fix-spritetext-usage
Fix usages of SpriteText (instead of OsuSpriteText)
|
2019-05-21 14:33:48 +09:00 |
|
smoogipoo
|
7a56fe84f2
|
Remove ControlPoint.EquivalentTo
|
2019-05-21 14:27:57 +09:00 |
|
smoogipoo
|
7e38aabe75
|
Remove equivalence check from controlpoint parsing
|
2019-05-21 14:27:41 +09:00 |
|
Dan Balasescu
|
de08bab0a1
|
Merge branch 'master' into move-tooltip-text
|
2019-05-21 14:25:38 +09:00 |
|
Dean Herbert
|
d1616e09b6
|
Merge branch 'fix-spritetext-usage' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:18:01 +09:00 |
|
Dean Herbert
|
4ac2acbfc0
|
Fix usages of SpriteText (instead of OsuSpriteText)
|
2019-05-21 14:13:52 +09:00 |
|
Dean Herbert
|
c2e30fb696
|
Merge branch 'screen-title-custom-icon' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:11:19 +09:00 |
|
Dean Herbert
|
e0da919fe9
|
Allow custom icon specification in ScreenTitle
Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
|
2019-05-21 14:10:21 +09:00 |
|
Dean Herbert
|
587e4bb5d5
|
Remove unnecessary getters from ScreenTitle
|
2019-05-21 14:10:16 +09:00 |
|
Dean Herbert
|
b9d217bb3d
|
Merge branch 'hover-container-disabled-hover-effect' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:08:35 +09:00 |
|
Dean Herbert
|
89e62c3d30
|
Only play OsuHoverContainer hover effect if action is present
|
2019-05-21 14:07:40 +09:00 |
|
Dean Herbert
|
a9447eaf7b
|
Remove redundant prefixes
|
2019-05-21 14:02:34 +09:00 |
|
Dean Herbert
|
e7c8c4f787
|
Fix incorrectly changed colour
|
2019-05-21 14:02:17 +09:00 |
|
smoogipoo
|
e3ae858c87
|
Adjust testcase to avoid potential rounding issues
|
2019-05-21 14:01:41 +09:00 |
|
Dean Herbert
|
a94c1c526c
|
Merge branch 'abstract-profile-header' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:01:09 +09:00 |
|
Dean Herbert
|
eac9186acb
|
Merge branch 'move-tooltip-text' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:00:54 +09:00 |
|
Dean Herbert
|
40f7cbde3a
|
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:00:50 +09:00 |
|
Dean Herbert
|
db817b3b25
|
Set HeaderTabControl's default AccentColour to non-transparent
Avoids items disappearing if no accent colour is set.
|
2019-05-21 13:58:36 +09:00 |
|
Dean Herbert
|
aba945934d
|
Move OverlayHeaderTabControl to correct namespace
|
2019-05-21 13:58:12 +09:00 |
|
Dean Herbert
|
5a9c3ab9fa
|
Move UserProfileOverlay's header into an abstract implementation
|
2019-05-21 13:58:03 +09:00 |
|
Dan Balasescu
|
2cf43dc4d4
|
Merge pull request #4829 from peppy/chain-load-component-single-file
Allow chaining of loadComponentSingleFile
|
2019-05-21 13:57:35 +09:00 |
|
Dean Herbert
|
247dad7e86
|
Use OsuColour for profile overlay
|
2019-05-21 13:54:19 +09:00 |
|
Dean Herbert
|
bc962bf8f0
|
Move TooltipText to OsuClickableContainer
|
2019-05-21 13:51:38 +09:00 |
|
Dean Herbert
|
85a41cf6c3
|
Allow chaining of loadComponentSingleFile
|
2019-05-21 13:44:18 +09:00 |
|
Dean Herbert
|
340b207fa0
|
Delete breadcrumb implementation
|
2019-05-21 13:37:35 +09:00 |
|
Dean Herbert
|
9a769c9f15
|
Move OverlayHeaderTabControl to correct namespace
|
2019-05-21 13:36:31 +09:00 |
|
Dean Herbert
|
a131875a7b
|
Use bindables the whole way
|
2019-05-21 13:34:35 +09:00 |
|
Dean Herbert
|
58a3480b6a
|
Update ChangelogHeader to work again with OverlayHeader
|
2019-05-21 12:52:50 +09:00 |
|
Dean Herbert
|
aca0fc80a8
|
Set HeaderTabControl's default AccentColour to non-transparent
Avoids items disappearing if no accent colour is set.
|
2019-05-21 12:45:20 +09:00 |
|