1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

12295 Commits

Author SHA1 Message Date
smoogipoo
d7ccf939d8 General refactoring 2019-05-31 13:54:40 +09:00
smoogipoo
e7ae9c249f Fix size of release stream separator in listing 2019-05-31 13:53:55 +09:00
smoogipoo
57d648df6d Add comment + fix spinlocking 2019-05-31 13:38:48 +09:00
smoogipoo
4dc77d64a3 Fix overlay group + depth 2019-05-31 13:23:50 +09:00
smoogipoo
f780c80c17 Fix bar not expanding/collapsing correctly 2019-05-31 13:08:35 +09:00
smoogipoo
c211f1d0fe Merge remote-tracking branch 'Joehuu/master' into changelog-overlay 2019-05-31 12:28:28 +09:00
EVAST9919
fe9e53e383 Add a testcase 2019-05-30 23:07:04 +03:00
EVAST9919
2933169614 Move the button into a separate class 2019-05-30 22:55:59 +03:00
EVAST9919
73fb28f9f7 Make the button inherit from OsuHoverContainer 2019-05-30 22:48:27 +03:00
EVAST9919
877fe97107 Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update 2019-05-30 22:17:22 +03:00
Dean Herbert
c950f37497 Ad missing link 2019-05-30 16:57:54 +09:00
Dean Herbert
e5999dd9b1 Update font sizes to match web 2019-05-30 16:49:18 +09:00
EVAST9919
9a13c52ffd Add missing lines 2019-05-29 21:19:03 +03:00
EVAST9919
97dbc95bc6 Kudosu section update 2019-05-29 21:02:20 +03:00
HoLLy
2a295545a7 Don't mutate strainPeaks 2019-05-29 11:25:25 +02:00
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
Dean Herbert
a1cc8c448f Update TrackVirtual consumption 2019-05-29 16:43:27 +09:00
Dean Herbert
08ab1e5df7 Use new ITrackStore interface 2019-05-29 16:43:15 +09:00
David Zhao
4f09141718 remove extra bool 2019-05-29 12:22:34 +09:00
EVAST9919
5169e31d54 Fix CI issues 2019-05-28 19:53:00 +03:00
EVAST9919
19fbab6892 Applied suggested changes 2019-05-28 19:39:31 +03:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
EVAST9919
857eb9b83a Fix CI stuff 2019-05-28 17:21:34 +03:00
EVAST9919
6ca3bd086f ShowMore button update 2019-05-28 17:04:05 +03:00
David Zhao
1a871af552 Fix hide selection, add test 2019-05-28 19:15:29 +09:00
Dean Herbert
23b5d30360 Remove csproj changes 2019-05-28 17:10:46 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
David Zhao
e59a00ac6e Remove excessive selection updating 2019-05-28 14:04:33 +09:00
Dan Balasescu
5742984c97
Merge branch 'master' into settings-flexibility 2019-05-28 13:35:06 +09:00
Dan Balasescu
0d2eef68b2
Merge branch 'master' into settings-flexibility 2019-05-28 13:21:33 +09:00
Dan Balasescu
4852519259
Merge branch 'master' into isolate-checkbox-alpha 2019-05-28 13:12:12 +09:00
Dean Herbert
31e6a4fa59 Add optional skin foreign key to databased settings 2019-05-27 01:56:19 +09:00
Dean Herbert
127858d398 Store databased settings based on string keys rather than ints
Allows for rearranging/removal from enums without consequence.
2019-05-27 01:53:49 +09:00
Dean Herbert
e7b9d1efa3 Isolate alpha usage in OsuCheckbox 2019-05-27 01:49:24 +09:00
Dean Herbert
02e2fb963a Tidy up how subpanels are handled in SettingsOverlay 2019-05-27 01:48:21 +09:00
Dean Herbert
53b2245330 Move common settings sub-panel logic to own class 2019-05-27 01:47:23 +09:00
Dean Herbert
b9f6372c3f Fix Aquatico font lookups 2019-05-25 22:11:11 +09:00
Dean Herbert
601b25f05e Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-25 19:10:44 +09:00
Lucas A
a819dd764f Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-25 11:02:19 +02:00
EVAST9919
69ada11f41 use constant value 2019-05-24 20:01:47 +03:00
EVAST9919
cda97a61fa Add a bit of smoothness to the rank graph 2019-05-24 19:43:53 +03:00
Dean Herbert
cc256614b9
Merge branch 'master' into changelog-overlay 2019-05-24 11:13:48 +09:00
Dean Herbert
a272004610 Use a more friendly set method for tab control 2019-05-24 11:04:36 +09:00
Dean Herbert
8f87e8ad7f
Merge branch 'master' into fix-beatmap-background-never-removed 2019-05-24 10:41:12 +09:00
Dean Herbert
e034b3d514 Use TaskCompletionSource in a better manner 2019-05-23 19:08:44 +09:00
Dean Herbert
acaf2f9fbb Show changelog from new build notification 2019-05-23 18:54:42 +09:00
Dean Herbert
774ef87868 Merge branch 'update-framework' into HoutarouOreki-changelog-overlay 2019-05-23 17:58:56 +09:00
Dean Herbert
9c6fbebb67 Update framework 2019-05-23 17:55:18 +09:00
Dean Herbert
0bce7241d2 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-23 17:54:13 +09:00
smoogipoo
f0d7728e81 Fix failures with a null-model 2019-05-23 17:01:22 +09:00
smoogipoo
7971261fbc Don't create a new drawable for the first background 2019-05-23 15:59:22 +09:00
Dan Balasescu
27504cf81b
Merge branch 'master' into fix-preview-state 2019-05-23 13:49:33 +09:00
Dean Herbert
7229975fef Further minor refactoring 2019-05-23 12:41:45 +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
5a887dabfe Prepare changelog api requests to work when not logged in 2019-05-23 11:41:37 +09:00
Dean Herbert
cb62008280 Cleanup pass 2019-05-23 11:23:37 +09:00
Dean Herbert
a0ddc6d77a Use linq instead of a temporary sorted list 2019-05-23 00:13:59 +09:00
Dean Herbert
c96d7bfb67 Centralise font specification 2019-05-23 00:13:47 +09:00
Dean Herbert
ba98c68cbd Add support for osu! user links 2019-05-23 00:11:26 +09:00
Dean Herbert
81e42041e6 Move update streams inside header content 2019-05-22 23:56:50 +09:00
Dean Herbert
661fc01e7d Fix date string 2019-05-22 23:49:54 +09:00
Dean Herbert
66f5dbaa9f Fix badge state regressions from tab control usage 2019-05-22 23:44:37 +09:00
Dean Herbert
b588638740 Use TabControl instead of custom logic 2019-05-22 19:51:16 +09:00
Dean Herbert
9f9e86f18c Rename classes and fix back-to-front state 2019-05-22 17:04:21 +09:00
Dean Herbert
1d5b7cdec0 Add ExpandingBar UI element 2019-05-22 16:44:47 +09:00
Dean Herbert
92c991494d Fix (and rename) ExpandingBar 2019-05-22 16:38:15 +09:00
Welsar55
9e1f2d4fbc Added ability to reset all mods by pressing 1 as present on stable. 2019-05-21 21:48:09 -05:00
Dean Herbert
8025a97b2b Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-21 17:18:23 +09:00
Dean Herbert
0e8517ebae
Update framework (#4837)
Update framework
2019-05-21 17:16:49 +09:00
Dan Balasescu
2024cdf16d
Merge branch 'master' into hover-container-disabled-hover-effect 2019-05-21 17:04:50 +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
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
f81c66db63 Hotfix to fix chat scrolling to end 2019-05-18 21:46:03 +09:00
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +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
Lucas A
5a72d509f2 Resolve merge conflicts 2019-05-16 18:48:15 +02: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
e7409a28a3 Merge branch 'move-screen-dependencies' into tournament-tools 2019-05-15 13:05:12 +09:00
Dean Herbert
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Roman Kapustin
459a285cd8 Rename test cases to test scenes inline with the framework change 2019-05-14 22:37:25 +03:00
Lucas A
2d966682dc Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-14 18:09:58 +02: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
Dean Herbert
cb2b14e501 Centralise fullscreen overlay logic 2019-05-14 14:20:53 +09:00
Dean Herbert
cc558cf073 Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay 2019-05-14 13:36:17 +09:00
Dean Herbert
4abe987e11 Add new colour palette 2019-05-14 13:28:16 +09:00
Dean Herbert
0d57cf6599 Remember FPS display state after changing via Ctrl+F11 hotkey 2019-05-14 13:13:51 +09:00
smoogipoo
93b26cd026 Reduce unnecessary allocations 2019-05-14 13:04:49 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dean Herbert
92f6f4d21a Apply same fix to other methods which were missed 2019-05-13 19:04:12 +09:00
Dean Herbert
aca77a7ae2 Merge remote-tracking branch 'upstream/master' into fix-control-point-ordering 2019-05-13 18:47:05 +09:00
Dean Herbert
66df784e9a Adjust header image sizing 2019-05-13 17:32:49 +09:00
Dean Herbert
d66a26cd11 Add JsonProperty hinting 2019-05-13 17:26:50 +09:00
Dean Herbert
8ecd1912e1 Split out web response classes into own files 2019-05-13 17:24:33 +09:00
Dean Herbert
27ca094421 Update outdated licence headers 2019-05-13 17:14:52 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Dean Herbert
50c440de8d Add toolbar button 2019-05-13 17:01:17 +09:00
Dean Herbert
e9c3f54307 Share web request between builds and streams 2019-05-13 16:44:43 +09:00
Dean Herbert
37a8d9eb80 Remove chart references for now 2019-05-13 16:27:54 +09:00
Dean Herbert
219c590b8a Initial pass to make work with real API 2019-05-13 16:24:32 +09:00
Dean Herbert
5ea87d9467 Merge remote-tracking branch 'upstream/master' into use-volumemute-icon 2019-05-13 07:24:39 +09:00
Dean Herbert
8110d6768c Inherit OsuButton 2019-05-13 07:24:34 +09:00
Joehu
c119a6a135 Use VolumeMute icon for mute button 2019-05-12 09:30:43 -07:00
Joehu
f14690e3b8 Swap profile play styles and last visit positions 2019-05-12 09:04:11 -07:00
Dean Herbert
31b72f168d Fix deprecated calls and code styling (partly) 2019-05-13 00:46:22 +09:00
Lucas A
2f663622cc Fix CI inspections 2019-05-12 17:40:18 +02:00
Lucas A
18fc965d7a Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 17:39:13 +02:00
Lucas A
55663b3576 Nest all UserActivities into UserActivity 2019-05-12 17:38:02 +02:00
Dean Herbert
34f54aa945 Resolve compile-time issues 2019-05-13 00:36:05 +09:00
Dean Herbert
943e1574a4
Merge branch 'master' into changelog-overlay 2019-05-13 00:24:18 +09:00
Dean Herbert
da2338581b
Merge branch 'master' into dev 2019-05-12 23:13:46 +09:00
Dean Herbert
487a56549e Fix CI issues 2019-05-12 22:53:12 +09:00
Dean Herbert
41e13aef23 Use more standard parsing method 2019-05-12 22:53:03 +09:00
Dean Herbert
65097fddc1 Hide music controller when exiting via Alt-F4
Closes #4764.
2019-05-12 22:34:58 +09:00
Paul Teng
1c3b768266 Use Precision.AlmostBigger 2019-05-12 09:02:22 -04:00
Dean Herbert
ce0e4c506e
Merge branch 'master' into dev 2019-05-12 21:45:52 +09:00
Paul Teng
1a6c8e91a5 Compare Health with small value 2019-05-12 08:44:20 -04:00
Dean Herbert
82599127fd
Merge branch 'master' into patch-1 2019-05-12 20:30:25 +09:00
Paul Teng
7adaa09263 Move tab channel class into tab item class 2019-05-12 06:31:11 -04:00
Paul Teng
8957ad5a7e Instantiate channel in tab item 2019-05-12 06:26:03 -04:00
Paul Teng
d53fb9a5c8 Check against type instead of channel name 2019-05-12 06:11:16 -04:00
Paul Teng
496a9dd41d Create separate type for Join-Channel button 2019-05-12 06:02:21 -04:00
Lucas A
5ac6bd8204 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 11:53:30 +02:00
Dean Herbert
038e49701e Move conditional to within BreakPeriod 2019-05-12 16:25:25 +09:00
Dean Herbert
1391aa342c
Merge branch 'master' into break-pause 2019-05-12 16:15:24 +09:00
Dean Herbert
3566da73cc
Merge branch 'master' into fix-more-pause-cases 2019-05-12 15:57:45 +09:00
Dean Herbert
9add2562f9
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
2019-05-12 15:50:10 +09:00
Dean Herbert
790700d8bf Use more correct calculation 2019-05-12 15:40:58 +09:00
Joehu
175daac16a Close beatmap options when suspending 2019-05-11 21:26:42 -07:00
Joehu
29cec54b3c Fix beatmap carousel overlapping beatmap info wedge 2019-05-11 20:08:45 -07:00
Paul Teng
c508b8ed6b
Trim whitespace 2019-05-11 19:21:12 -04:00
Paul Teng
3971a49549
Ignore Add-channel button 2019-05-11 19:16:15 -04:00
Paul Teng
6cf1ca288f
Do not try to join the Add-channel button 2019-05-11 19:13:48 -04:00
smoogipoo
bde2d552b6 Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
# Conflicts:
#	osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
2019-05-10 22:16:59 +09:00
smoogipoo
01eb1a34a9 Remove unused variable 2019-05-10 22:15:33 +09:00
Dean Herbert
ad93eda399
Allow song progress bar to show current position during a seek (#4746)
Allow song progress bar to show current position during a seek

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-05-10 21:10:11 +09:00
Dan Balasescu
4abd5c78cd
Merge branch 'master' into fix-score-deletion 2019-05-10 19:09:18 +09:00
smoogipoo
3fe61c4a7e Trim whitespace 2019-05-10 18:48:39 +09:00
Dan Balasescu
425154c264
Merge branch 'master' into progress-bar-show-seek 2019-05-10 18:24:15 +09:00
Dan Balasescu
fe7ea1e900
Merge branch 'master' into fix-score-deletion 2019-05-10 18:24:04 +09:00
Dean Herbert
af3a75307d
Merge branch 'master' into fix-failing-pause-tests 2019-05-10 18:22:20 +09:00
Dean Herbert
97796a8578 Attempt to fix failing tests by delaying starting of the gameplay clock 2019-05-10 18:10:07 +09:00
smoogipoo
d2479acbf2 Fix incorrect value being clamped 2019-05-10 18:04:58 +09:00
Dan Balasescu
4776fc75b9
Merge branch 'master' into fix-score-deletion 2019-05-10 18:00:43 +09:00
smoogipoo
ad4b4f3422 Use nullable cancellation tokens 2019-05-10 17:42:45 +09:00
Dean Herbert
a44296a6db
Merge branch 'master' into progress-bar-show-seek 2019-05-10 17:27:49 +09:00
Dean Herbert
fdf67aaa11 Clamp values 2019-05-10 17:18:39 +09:00
Dean Herbert
21ab628f41
Merge branch 'master' into player-load-cancellations 2019-05-10 16:58:36 +09:00
smoogipoo
f6dfcc4dcf Remove unnecessary Storyboard disposal 2019-05-10 16:31:22 +09:00
smoogipoo
d25d39b315 Add cancellation to storyboard/hitobject loading 2019-05-10 16:31:09 +09:00
Dan Balasescu
b9a579b624
Merge branch 'master' into fix-control-point-ordering 2019-05-10 16:18:22 +09:00
Dan Balasescu
32808a8a59
Merge branch 'master' into fix-long-skip-performance 2019-05-10 16:10:50 +09:00
smoogipoo
6a957ad27f Fix pause triggered when already paused 2019-05-10 15:51:12 +09:00
smoogipoo
7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
David Zhao
9480c74fcc Merge remote-tracking branch 'upstream/master' into result-count 2019-05-10 11:20:16 +09:00
David Zhao
5c096cbc91 Revert mirroring condition too 2019-05-09 18:59:00 +09:00
David Zhao
9e0af723cc Split out affectscombo change 2019-05-09 18:56:19 +09:00
Dean Herbert
9248e6290c Use FrameStabilityClock to denote current position on song progress 2019-05-09 18:09:26 +09:00
Dean Herbert
5942072128 Add a tween when clicking to seek 2019-05-09 18:07:38 +09:00
Dean Herbert
3bcfc86b9c Allow custom MaxCatchUpFrames to be specified
Also adjusts the default to allow for smoother seeking.
2019-05-09 16:39:03 +09:00
Dean Herbert
66594b7a1b Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start 2019-05-09 16:39:03 +09:00
David Zhao
b0e34d86d5 Subtract a result from count if its been reverted 2019-05-09 16:16:20 +09:00
David Zhao
39fb5712f1 Only combo-incrementing results add to result count 2019-05-09 15:31:37 +09:00
Dean Herbert
516186c945
Merge branch 'master' into fix-score-deletion 2019-05-09 15:21:05 +09:00
Dean Herbert
24e64c1333 Add proper co-dependent beatmap/score deletion via events 2019-05-09 15:15:28 +09:00
Dean Herbert
6ebd13c733 Allow Delete and Undelete operations to run silently when needed 2019-05-09 15:15:02 +09:00
Dean Herbert
c8f9354327 Remove incorrect deletion include
This was causing deletions of scores without considering that scores are now managed by a ScoreManager (and have their own data dependencies).
2019-05-09 15:13:35 +09:00
Dan Balasescu
2e50c1ce48
Merge branch 'master' into zoomablescrollcontainer-fix 2019-05-09 14:09:47 +09:00
Dan Balasescu
22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix 2019-05-09 13:54:21 +09:00
smoogipoo
5c6b4d923f Reorder methods 2019-05-09 13:53:53 +09:00
smoogipoo
35624a5d1c Invert scheduling order 2019-05-09 13:42:04 +09:00
smoogipoo
3fed165b74 Cleanup some schedules 2019-05-09 13:33:18 +09:00
smoogipoo
c69d813745 Fix bindable potentially being set from background thread 2019-05-09 13:32:18 +09:00
David Zhao
d625f3c104 Private method 2019-05-09 13:21:01 +09:00
Dean Herbert
869136b2fb
Fix possible cross-thread config cache access (#4730)
Fix possible cross-thread config cache access

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-09 11:16:48 +09:00
Dean Herbert
9457a6128e Fix game pausing when made inactive while watching a replay 2019-05-09 10:57:55 +09:00
Dean Herbert
a5b07347e9
Merge branch 'master' into fix-ruleset-crossthread 2019-05-09 10:49:26 +09:00
Dean Herbert
31c91746a5
Merge branch 'master' into fix-ruleset-crossthread 2019-05-09 10:13:25 +09:00
smoogipoo
5128dc32e4 Remove unnecessary fillmode 2019-05-08 23:13:21 +09:00
smoogipoo
17a9f191cd Fix incorrect texture name usage for some rank icons 2019-05-08 23:08:08 +09:00
Dean Herbert
83663467ce Update dependencies 2019-05-08 21:08:46 +09:00
Dean Herbert
4f697e2bd5 Add licence header 2019-05-08 19:35:20 +09:00
Dean Herbert
6dea16f365 Move action and hotkey specification local 2019-05-08 19:29:43 +09:00
Dean Herbert
c91b9c6032 Add missing button 2019-05-08 19:27:53 +09:00
smoogipoo
39efa2d173 Fix possible cross-thread config cache access 2019-05-08 19:05:00 +09:00
Dean Herbert
772eb460fb Move button definitions to their respective classes 2019-05-08 19:03:26 +09:00
Dean Herbert
0693290ad4 Merge remote-tracking branch 'upstream/master' into refactor-select-footer 2019-05-08 18:43:21 +09:00
Dean Herbert
b33372ca62 Don't expand mods in button on hover 2019-05-08 18:43:15 +09:00
Dean Herbert
8906eb874a Fix CI issues 2019-05-08 18:43:06 +09:00
Dean Herbert
9a9ac05cd9 Fix post-merge issues 2019-05-08 18:42:54 +09:00
Dean Herbert
bace829629 Add ability to avoid expand animation in ModDisplay 2019-05-08 18:42:26 +09:00
Dean Herbert
66ebdbbe4c Fix control points with same timestamp potentially being parsed incorrectly 2019-05-08 18:13:07 +09:00
Dan Balasescu
6ab83f8825
Merge branch 'master' into flashlight-dim 2019-05-08 13:37:21 +09:00
David Zhao
ff3c226596 Give ZoomableScrollContainer an initial width 2019-05-08 13:37:03 +09:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
Dean Herbert
13cf9657a4
Merge branch 'master' into fix-updateable-background-crash 2019-05-08 13:17:28 +09:00
Lucas A
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02:00
Lucas A
3ecfa9dcdb Invert partialy activity logic introduced in latest commit 2019-05-07 18:26:34 +02:00
smoogipoo
a00e2b18a9 Fix background unloading/reloading sometimes crashing 2019-05-07 17:24:05 +09:00
smoogipoo
99f2ee0e48 Fix CI issues 2019-05-07 15:09:03 +09:00
Dan Balasescu
288b3deb94
Merge branch 'master' into fix-rank-display 2019-05-07 15:00:51 +09:00
Dean Herbert
8bc313fb33
Merge branch 'master' into fix-new-inspections 2019-05-07 14:14:40 +09:00
Dean Herbert
c878d814f6
Merge branch 'master' into pause-via-inactive 2019-05-07 13:35:23 +09:00
Dean Herbert
f7a570d67a Fix double confirmation 2019-05-07 13:34:06 +09:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Dan Balasescu
a1c64d8d26
Merge branch 'master' into fix-retry-sound 2019-05-07 12:40:01 +09:00
Dan Balasescu
8b9cfadd64
Merge branch 'master' into fix-retry-sound 2019-05-07 12:37:22 +09:00
Dean Herbert
64bc0f958b
Merge branch 'master' into fix-import-crash 2019-05-07 12:18:41 +09:00
smoogipoo
f26a1cff6c Fix beatmap import crashing during room creation 2019-05-07 12:14:57 +09:00
David Zhao
abc163fa36 Fix merge 2019-05-07 12:07:45 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Dan Balasescu
9d3f6a716a
Merge branch 'master' into profile-details-animation 2019-05-07 11:44:22 +09:00
Lucas A
e7afaeaa4d Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-06 18:39:58 +02:00
Lucas A
59b8da5c77 Move OsuScreen activity logic to setUserActivity() 2019-05-06 18:37:21 +02:00
Lucas A
a50bbf7f42 Make appveyor happy. 2019-05-05 21:32:23 +02:00
Lucas A
3d8b56fe57 Fix user status related unit tests 2019-05-05 21:11:52 +02:00
Lucas A
d5d31282e5 Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes 2019-05-05 20:55:42 +02:00
Lucas A
88b8afbb6a Make UserPanel show current user activity when
user status is online.
2019-05-05 20:51:55 +02:00
Lucas A
fa986bb5e9 Rework OsuScreen user activity logic 2019-05-05 20:26:56 +02:00
Lucas A
b216635488 Added UserActivity class holding information about the current activity for the local user 2019-05-05 20:07:55 +02:00
Dean Herbert
7fdc79dd68 Improve skip boundary logic to be closer to expectations
Supersedes #4693.
Closes #4676.
2019-05-05 20:20:41 +09:00
Dean Herbert
3e3f12f277 Use more local bindables 2019-05-04 17:53:17 +09:00
Dean Herbert
b9a39fb788 Fix instant pausing when game becomes inactive
Resolves #4685.
2019-05-04 14:54:29 +09:00
Dean Herbert
0fa0271878 Add animation when collapsing or expanding the profile details section 2019-05-04 11:03:18 +09:00
Joseph Madamba
53accbfce1
Merge branch 'master' into switch-centre-profile-info 2019-05-03 11:27:52 -07:00
Dean Herbert
41ab82cdc3
Merge branch 'master' into refactor-select-footer 2019-05-03 21:46:41 +09:00
LeNitrous
31341bfeb1 use SongSelect's SelectedMods property to ensure it exists 2019-05-03 16:51:33 +08:00
LeNitrous
009eaa647a fixes to FooterButtonRandom 2019-05-03 16:38:15 +08:00
Dean Herbert
6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +09:00
Lucas A
a4a2ce5ec0 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus 2019-05-02 20:51:19 +02:00
Lucas A
84b41b3886 Split out setUserStatus() logic to multiple lines. +
Make UserStatusDoNotDisturb inherit from UserStatus
2019-05-02 19:44:07 +02:00
Joehu
ac31a9640a Add number sign to centre info rankings 2019-05-02 03:47:20 -07:00
Joehu
c6992bd6f9 Switch hidden/expanded centre profile header information 2019-05-02 03:37:15 -07:00
Dean Herbert
6a4dc5e25c Improve xmldoc slightly 2019-05-02 14:03:58 +09:00
Dean Herbert
1817f7bc12
Merge branch 'master' into sh-xh-grading-2 2019-05-02 13:27:12 +09:00
Dean Herbert
975f6e2c5d
Merge pull request #4694 from peppy/update-framework
Update framework
2019-05-02 13:13:15 +09:00
Dean Herbert
015b5cecb5 Update framework 2019-05-02 12:53:59 +09:00
jorolf
b61807da40
Add number sign inside ToString
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-05-01 17:55:30 -07:00
Joehu
6b7397b9cf Check for null instead of not null 2019-04-30 22:07:06 -07:00
Joehu
9b2d5727cd Fix wrong check 2019-04-30 21:54:25 -07:00
Joehu
1408513ebd Use similar check used on tooltip 2019-04-30 21:51:56 -07:00
Joehu
3cd6ccfc3d Add number sign in front of profile rankings 2019-04-30 20:47:44 -07:00
Lucas A
a3541339f5 Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay 2019-04-30 21:40:44 +02:00
iiSaLMaN
ddd9262384
fix xmldoc 2019-04-30 19:08:31 +03:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
iiSaLMaN
148f4c4ce0
Pass Rank.Value instead
Passing Rank.Value along each iteration instead of calculating.
2019-04-30 18:49:31 +03:00
iiSaLMaN
e0abd0b2c1
fix comment 2019-04-30 18:44:31 +03:00
iiSaLMaN
665558c297
Remove unnecessary comment 2019-04-30 18:44:06 +03:00
iiSaLMaN
5d50316ae7
Add xmldoc 2019-04-30 18:12:27 +03:00
Lucas A
7e42068a14 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-28 19:48:35 +02:00
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound 2019-04-28 23:38:14 +09:00
Dean Herbert
f9f6e1f04a Clamp values to avoid potentially weird element 2019-04-28 20:13:36 +09:00
Dean Herbert
8ab5149336 SupporterLevel -> SupportLevel 2019-04-28 20:11:36 +09:00