1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 09:02:56 +08:00
Commit Graph

11906 Commits

Author SHA1 Message Date
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
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
ab183949df
Merge branch 'master' into new-colours-osu-colour 2019-05-21 14:49:25 +09:00
Dean Herbert
24a7e624df Only propagate badge value changes if not the current UpdateStream 2019-05-21 14:35:11 +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
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
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
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
Dean Herbert
808b45ac64 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 11:50:03 +09:00
Dean Herbert
6c26d6fdf9 Remove unnecessary getters from ScreenTitle 2019-05-21 11:13:36 +09:00
Dean Herbert
6a8a743eaa Begin to consume abstract header implementation 2019-05-20 18:02:27 +09:00
Dean Herbert
a5bd3262be Move UserProfileOverlay's header into an abstract implementation 2019-05-20 18:02:13 +09:00
Dean Herbert
455301de2c Use OsuColour for profile overlay 2019-05-20 15:58:40 +09:00
Dean Herbert
39e03ae705 Fix tests failing when not logged in 2019-05-19 11:58:47 +09:00
Dean Herbert
1c85fcbc81 Remove usage of TooltipIconButton completely 2019-05-19 11:39:32 +09:00
Dean Herbert
dae315ec0a Move TooltipText to OsuClickableContainer 2019-05-19 11:28:24 +09:00
Dean Herbert
3fa1545ea4 Huge refactor pass focusing on ChangelogContent 2019-05-19 02:09:08 +09:00
Dean Herbert
5d6c599129 Merge remote-tracking branch 'upstream/master' into changelog-overlay 2019-05-18 15:45:40 +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
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
Dan Balasescu
553d786b94
Merge branch 'master' into fix-logo-tracking-crash 2019-05-17 19:23:14 +09:00
Dean Herbert
2d56413e35 Update namespaces 2019-05-17 19:15:59 +09:00
Dean Herbert
9bc3aa3d46 Move new classes for now 2019-05-17 19:15:25 +09:00
Dean Herbert
dbc42fd59e Remove StreamColour class and implement locally 2019-05-17 18:31:53 +09:00
Dean Herbert
0b076c9ca0 Only fetch after initial pop in 2019-05-17 18:31:53 +09:00
Dean Herbert
c41ec20236 Improve load and switch logic between views 2019-05-17 18:31:53 +09:00
Dean Herbert
c5c1896a11 Use new colour palette 2019-05-17 18:31:53 +09:00
Dean Herbert
dd2d58d4f7 Split out ChangelogContent into two classes 2019-05-17 18:31:53 +09:00
Dean Herbert
876f108e0a Remove custom scroll logic 2019-05-17 18:31:53 +09:00
Dean Herbert
37e989fc64 fixup! Convert BadgeDisplay to use bindable 2019-05-17 18:31:53 +09:00
Dean Herbert
e606c73329 Convert BadgeDisplay to use bindable 2019-05-17 18:31:53 +09:00
Dean Herbert
880bfe9b6b Move resources to osu-resources 2019-05-17 10:29:27 +09:00
Dean Herbert
5d33a742c6 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-16 18:55:28 +09:00
Dean Herbert
409d89eecf Match header titles with web (pt size) 2019-05-16 18:53:52 +09:00
Dean Herbert
359e5b71a5 Fix race condition causing player to never restart 2019-05-16 17:13:03 +09:00
Dean Herbert
8ee3958b4a Fix some padding issues with DirectListPanel 2019-05-16 15:17:44 +09:00
Dean Herbert
7f30f61d1b Update DirectListPanel to use same styling 2019-05-16 15:02:13 +09:00
Dean Herbert
a5074d550c
Merge branch 'master' into linkify-user-links 2019-05-16 14:42:44 +09:00
Dean Herbert
958598d13b Fix crash on switching from main menu to gameplay too fast 2019-05-15 19:39:36 +09:00
Dan Balasescu
29a415de48
Merge branch 'master' into TextLengthLimit 2019-05-15 19:21:01 +09:00
Dean Herbert
1ccef61f7b Fix some missed instances of TestCase 2019-05-15 18:32:29 +09:00
Dean Herbert
a717970e11 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 18:27:51 +09:00
Dean Herbert
084ea3efa9 Fix another font usage case 2019-05-15 18:27:43 +09:00
Dean Herbert
1505ca976b API request clean-up 2019-05-15 18:21:06 +09:00
Dean Herbert
827ca445b1 Remove unnecessary ReceivePositionalinputAt modification 2019-05-15 18:11:22 +09:00
Dean Herbert
60d244d2d6 Clean up events and states 2019-05-15 18:08:19 +09:00
Dean Herbert
f49b0dc16d Initial clean-up pass of breadcrumb and header 2019-05-15 17:55:26 +09:00
Dean Herbert
d7098e2066 Hide other overlays when showing changelog 2019-05-15 17:38:19 +09:00
Dean Herbert
e46a61febf Allow chaining of loadComponentSingleFile 2019-05-15 17:36:29 +09:00
Dean Herbert
5ddd28bf30 Fix message display / html stripping 2019-05-15 16:42:12 +09:00
smoogipoo
5f56c38475 Merge remote-tracking branch 'origin/master' into rename_test_case 2019-05-15 15:52:06 +09:00
Dean Herbert
88528e797f Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 14:24:45 +09:00
Dean Herbert
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
Roman Kapustin
459a285cd8 Rename test cases to test scenes inline with the framework change 2019-05-14 22:37:25 +03:00
Dean Herbert
456e6a6601
Merge branch 'master' into remember-fps-display-state 2019-05-14 18:54:04 +09:00
Dean Herbert
4c221e43a9 Apply minimal changes to make framework compile 2019-05-14 18:39:56 +09:00
Dean Herbert
f2e5beec11 Update framework 2019-05-14 18:35:35 +09:00
Dean Herbert
5308a68103 Merge remote-tracking branch 'upstream/master' into remember-fps-display-state 2019-05-14 18:35:19 +09:00
Dean Herbert
ec5b024fa6 Define toolbarElements 2019-05-14 18:34:25 +09:00
Dean Herbert
a0c03d7fc3 Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller 2019-05-14 18:14:57 +09:00
smoogipoo
77263bd56e Linkify more user links 2019-05-14 18:11:32 +09:00
Dean Herbert
eece4d878f Tidy up colour references and texture assignment in ChangelogHeader 2019-05-14 18:03:54 +09:00
Dan Balasescu
d3d20773ee
Merge branch 'master' into fullscreen-overlay 2019-05-14 17:40:20 +09:00
Dan Balasescu
bffde7de08
Merge branch 'master' into exit-hide-music-controller 2019-05-14 17:36:38 +09:00
Dean Herbert
31e7f2fa87 Update ChangelogOverlay to use FullScreenOverlay 2019-05-14 17:35:21 +09:00
Dean Herbert
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
Dean Herbert
aff239a4fb Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay 2019-05-14 17:33:30 +09:00
Dean Herbert
fad9e73999 Add null check in disposal clause 2019-05-14 17:08:54 +09:00
Dan Balasescu
d040fe9635
Merge branch 'master' into tidy-osu-game 2019-05-14 16:52:56 +09:00
Dean Herbert
a52690ed9a
Fix commented line check not working with whitespace (#4788)
Fix commented line check not working with whitespace
2019-05-14 16:47:46 +09:00
smoogipoo
f1c9073338 Fix commented line check not working with whitespace 2019-05-14 16:16:55 +09:00
Dean Herbert
9aef4abf75
Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations
Reduce unnecessary allocations
2019-05-14 16:03:04 +09:00
Dean Herbert
c312a2e53c
Merge branch 'master' into fullscreen-overlay 2019-05-14 15:22:23 +09:00
Dean Herbert
e893925417 Move shadow fade logic 2019-05-14 15:19:23 +09:00
Dean Herbert
29bdc97ab7 Remove unnecessary DI 2019-05-14 15:07:18 +09:00