RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,418 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

18418 Commits

Author SHA1 Message Date
Dan Balasescu 48ef1ae200
Merge pull request #4846 from peppy/fix-preview-state 
Fix audio preview buttons not correctly handling load failure states
 2019-05-23 14:25:46 +09:00
Dan Balasescu 27504cf81b
Merge branch 'master' into fix-preview-state 2019-05-23 13:49:33 +09:00
Dan Balasescu 484f56615c
Merge pull request #4844 from peppy/expanding-bar 
Add ExpandingBar UI element
 2019-05-23 13:46:56 +09:00
smoogipoo edfe47fb02 Rename button 2019-05-23 13:37:25 +09:00
Dean Herbert 372c5b081c Fix audio preview buttons not correctly handling load failure states 
Closes #4593.
 2019-05-23 12:07:49 +09:00
Dean Herbert 1d5b7cdec0 Add ExpandingBar UI element 2019-05-22 16:44:47 +09:00
Dean Herbert 0e8517ebae
Update framework (#4837) 
Update framework
 2019-05-21 17:16:49 +09:00
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
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 4ac2acbfc0 Fix usages of SpriteText (instead of OsuSpriteText) 2019-05-21 14:13:52 +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 89e62c3d30 Only play OsuHoverContainer hover effect if action is present 2019-05-21 14:07:40 +09:00
smoogipoo e3ae858c87 Adjust testcase to avoid potential rounding issues 2019-05-21 14:01:41 +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 d407981ae4
Increase fastlane processing interval 
This seems to be getting longer as we go. May be related to having many versions released under one testflight build?
 2019-05-18 12:58:13 +09:00
Dean Herbert c4adb79cc7
Update framework (#4814) 
Update framework

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-05-18 12:55:27 +09:00
Dean Herbert 5e499cf55d Update resources 2019-05-18 12:45:06 +09:00
Dean Herbert 98189b2b87
Merge branch 'master' into update-framework 2019-05-18 12:10:37 +09:00
Dean Herbert 9106200c65 Bump framework version 2019-05-18 12:08:22 +09:00
Dean Herbert cdd6e97dd2
Update NuGet packages (#4815) 
Update NuGet packages
 2019-05-18 11:25:51 +09:00
Roman Kapustin a538c94fed Update NuGet packages 2019-05-17 21:40:46 +03:00
smoogipoo ccbf3ff812 Update framework 2019-05-17 22:35:23 +09:00