1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

3829 Commits

Author SHA1 Message Date
Andrei Zavatski
b03b520818 Move Absing from the APIKudosuHistory 2019-08-30 10:13:21 +03:00
Andrei Zavatski
b7a75ef5e1 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-30 10:09:00 +03:00
Dean Herbert
1d77e3764d
Merge branch 'master' into accuracy-bar 2019-08-30 15:21:32 +09:00
StanR
c1c1c7874b Nullcheck 2019-08-29 13:25:05 +03:00
StanR
68ee7346b2 Remove usings 2019-08-29 12:49:44 +03:00
StanR
d303083179 Update to match api 2019-08-29 12:29:31 +03:00
StanR
3347ee8170 Merge branch 'master' into beatmapset-genre-language 2019-08-29 09:57:53 +03:00
Dean Herbert
dfdf3f5e96 Merge remote-tracking branch 'upstream/master' into humanizer-fallback 2019-08-28 20:15:32 +09:00
Dean Herbert
bb22c2d6e4 Tidy up text construction 2019-08-28 17:29:18 +09:00
Dean Herbert
b1f523dae3 Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-08-28 17:13:57 +09:00
Dean Herbert
fcf770c744 Merge branch 'master' into update-framework 2019-08-28 17:04:44 +09:00
Dean Herbert
bef44b8e58 item -> model 2019-08-28 13:31:12 +09:00
Dean Herbert
3942c83c18 Simplify schedule layout 2019-08-28 13:28:57 +09:00
Dean Herbert
27633c8dbd T -> TModel 2019-08-28 13:28:21 +09:00
Dean Herbert
f18b5a3c02 Remove "AllowCreate" function by instead handling nulls 2019-08-28 13:27:44 +09:00
Andrei Zavatski
5fd43d42f4 CI fixes 2019-08-27 16:09:37 +03:00
Andrei Zavatski
9a383eee1a Add AllowCreate function 2019-08-27 15:58:57 +03:00
Andrei Zavatski
22ee7db805 Refactor PaginatedContainer to avoid code duplication 2019-08-27 15:47:37 +03:00
Andrei Zavatski
f49b58c102 Simplify text building 2019-08-27 15:30:41 +03:00
Andrei Zavatski
7f0a4fbef9 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-27 15:11:55 +03:00
Dean Herbert
b59973c712 Update in line with framework changes 2019-08-27 18:43:58 +09:00
Dean Herbert
2e21fbcf6a Fix incorrect colour usage 2019-08-25 11:44:56 +09:00
Dean Herbert
524547adbf
Merge branch 'master' into implement-grouped-difficulty-icons 2019-08-24 17:34:58 +09:00
iiSaLMaN
008e39b738 Remove redundant using directive 2019-08-24 01:40:40 +03:00
iiSaLMaN
8ccbe84f67 Loop on distinct rulesets of beatmap instead of all 2019-08-24 01:30:33 +03:00
iiSaLMaN
63e6aca61b Add logic to create grouped difficulty icons in direct panel 2019-08-23 23:40:41 +03:00
iiSaLMaN
1295ec490f Fix difficulty icon not wrapping correctly in beatmap set overlay 2019-08-23 17:57:31 +03:00
Andrei Zavatski
0cde0982e5 Use cansellation token 2019-08-23 14:52:26 +03:00
Andrei Zavatski
7e34afeab8 Conver to method group 2019-08-23 14:38:18 +03:00
Andrei Zavatski
45c0826314 Remove repetitive code 2019-08-23 14:14:39 +03:00
Andrei Zavatski
050130e159 Refactor PaginatedContainer to centralise repetitive logic 2019-08-23 14:11:21 +03:00
Andrei Zavatski
87379a42c8 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-23 13:05:19 +03:00
Dean Herbert
c55d237db6 Use BindValueChanged 2019-08-23 17:42:40 +09:00
Joehu
c41b1e9eb4 Fix alignment and size of mute button 2019-08-22 21:36:21 -07:00
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Andrei Zavatski
f4d2bb036b Expand KudosuAction list 2019-08-22 16:50:54 +03:00
Dean Herbert
82209aed82
Merge branch 'master' into humanizer-fallback 2019-08-22 17:58:40 +09:00
Dean Herbert
8018aba852
Merge branch 'master' into kudosu-info 2019-08-22 14:30:26 +09:00
Dean Herbert
4f98361da3 One more offset removed 2019-08-21 22:22:03 +09:00
Andrei Zavatski
336f979480 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:39:28 +03:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Andrei Zavatski
426c7a4898 Fix incorrect templates 2019-08-20 16:19:21 +03:00
Andrei Zavatski
5c7cb4dc21 Simplify text creation 2019-08-20 16:11:59 +03:00
Andrei Zavatski
c4344f3f7c CI fixes 2019-08-20 15:29:32 +03:00
Andrei Zavatski
f1d02d8169 Update design in line with web 2019-08-20 15:00:14 +03:00
Andrei Zavatski
f70a7abea3 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-19 19:36:28 +03:00
Andrei Zavatski
6b8fbf0eb1 Change link format back
Due to unavaliability to handle round brackets
2019-08-19 17:59:55 +03:00
Andrei Zavatski
daeefc449c Use another link format to avoid representation issues 2019-08-19 17:49:53 +03:00
Andrei Zavatski
fd21e06389 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-19 17:16:50 +03:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
18ee2f5e99
Merge branch 'master' into centre-beatmap-panels 2019-08-19 13:27:40 +09:00
Dean Herbert
be51fde292 Centre beatmap panels in profile overlay 2019-08-19 13:22:32 +09:00
Dean Herbert
1f00793891 Unpause music when changing selection at song select 2019-08-19 11:30:04 +09:00
Andrei Zavatski
be97804180 Implement text formatting 2019-08-18 21:28:07 +03:00
Andrei Zavatski
550dcee60d Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-18 17:14:34 +03:00
Andrei Zavatski
a59a14c9e6 Add setting to enable/disable hit error visibility 2019-08-18 15:01:04 +03:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip 2019-08-17 13:45:20 +09:00
Dean Herbert
132d51a2cc Update tooltip implementation 2019-08-16 19:47:35 +09:00
Dean Herbert
8f63887972 Make use of existing null check 2019-08-15 14:38:49 +09:00
Dean Herbert
9e13a6aeae Fix newlines being considered in user profile content 2019-08-15 14:38:04 +09:00
Dean Herbert
f355cff8bc Apply reviews 2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784 Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip 2019-08-15 11:54:59 +09:00
smoogipoo
3a79a4149a Disable music controls when beatmap is disabled 2019-08-14 15:19:21 +09:00
Dean Herbert
52f42ddade Use child instead of children 2019-08-14 10:53:47 +09:00
Dean Herbert
b6bc84af2c Fix chat context menus displaying out-of-bounds 2019-08-14 10:52:26 +09:00
Dean Herbert
ea18a8dd12
Merge branch 'master' into music-controller-hotkeys 2019-08-13 19:08:52 +09:00
Dan Balasescu
77fca7b04a
Merge branch 'master' into split-out-music-controller 2019-08-13 17:03:15 +09:00
Dean Herbert
4948e7d31c
Merge branch 'master' into split-out-music-controller 2019-08-13 16:43:56 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
Dean Herbert
6a70849acb Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 15:08:33 +09:00
Dean Herbert
b942192e00 Fix remaining nullref 2019-08-13 15:04:04 +09:00
Dean Herbert
81f8b5f325 Fix merge issue 2019-08-13 14:52:51 +09:00
Dean Herbert
5898198da6 Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:48:14 +09:00
Dean Herbert
2cbdf8c01c Update public methods in line with future usage 2019-08-13 14:46:57 +09:00
Dean Herbert
de1ab56a2c Fix potential nullref on disposal 2019-08-13 14:45:27 +09:00
Dean Herbert
9aac5efa4e Move logic out of OsuGame 2019-08-13 14:42:59 +09:00
Dean Herbert
8d23cda51a Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:33:35 +09:00
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
smoogipoo
8d3f2f7645 Drop container from name 2019-08-13 14:09:10 +09:00
smoogipoo
5681d1097c Move into components namespace 2019-08-13 14:07:40 +09:00
Dean Herbert
5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
Dean Herbert
6328fd9363 Merge remote-tracking branch 'upstream/master' into music-controller-hotkeys 2019-08-13 11:57:18 +09:00
Dean Herbert
4ccac60337 Merge remote-tracking branch 'upstream/master' into refactor-osd 2019-08-13 11:35:54 +09:00
Dean Herbert
5447e7cf22 Fix file ordering 2019-08-13 11:34:45 +09:00
Dean Herbert
433b701df3 Make line slightly thicker (to display better at low resolutions)
Also tidies up code.
2019-08-13 00:21:52 +09:00
Dean Herbert
c0f0fbbaa9 Rename variable and add xmldoc 2019-08-13 00:14:37 +09:00
Andrei Zavatski
9c36cb4af4 Use existing AccentColour logic instead of weird BoxColour 2019-08-12 14:33:30 +03:00
Andrei Zavatski
ba49a4c2da Use existing PageTabControl for layout 2019-08-12 13:16:57 +03:00
Lucas A
6533f114d4 Apply review suggestions 2019-08-12 12:09:09 +02:00
Lucas A
9c15024014 Reword and add missing xmldoc to OnScreenDisplay 2019-08-12 10:53:06 +02:00
Dean Herbert
75cb0d093b Use description correctly
Required for localisation
2019-08-12 16:10:48 +09:00
Dean Herbert
a83afd00b5
Merge branch 'master' into beatmap-scope-selector 2019-08-12 15:48:53 +09:00
Dean Herbert
ea4a97ebd9
Merge branch 'master' into refactor-osd 2019-08-12 02:27:02 +09:00
Dean Herbert
9ac4870a21
Merge branch 'master' into triangles 2019-08-12 02:24:45 +09:00
Dean Herbert
684c37bf05 Rename class to better match usage 2019-08-11 16:19:40 +09:00
Dean Herbert
c2e2c1e67e
Merge branch 'master' into refactor-osd 2019-08-11 13:13:12 +09:00
Lucas A
7825923cb6 Use media keys as default bindings for jukebox. 2019-08-10 16:33:16 +02:00
Lucas A
fdf76be967 Merge branch 'master' into music-controller-hotkeys 2019-08-10 16:29:02 +02:00
Lucas A
8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
Lucas A
b0a7177987 Add ScreenTitleIcon class, used for displaying custom specific icons on overlays. 2019-08-10 13:26:19 +02:00
Lucas A
fc4c0cc2e7 Fix visual discrepancies with master 2019-08-10 10:52:37 +02:00
Dean Herbert
cb0cd7ed58 Add triangles intro 2019-08-09 20:05:28 +09:00
Andrei Zavatski
cf2a9db8e0 Implement basic layout for kudosu history 2019-08-09 11:14:38 +03:00
Andrei Zavatski
1d42f0959a ModIcon improvements 2019-08-07 08:46:27 +03:00
Andrei Zavatski
b064df91a7 Initial implementation 2019-08-07 08:33:55 +03:00
Andrei Zavatski
b9384d7a53 Remove unnecessary null check 2019-08-07 07:00:50 +03:00
Andrei Zavatski
24f9872315 Fix unnecessary scores loading 2019-08-07 06:45:39 +03:00
Dean Herbert
e3f88a83a0
Fix drawable channels remaining in memory after being closed (#5607)
Fix drawable channels remaining in memory after being closed
2019-08-06 22:58:14 +09:00
smoogipoo
11916782ba Fix drawable channels remaining in memory after being closed 2019-08-05 19:23:13 +09:00
Andrei Zavatski
749a00cc2f Force bindable change 2019-08-05 12:49:54 +03:00
Andrei Zavatski
c591cb83eb Merge remote-tracking branch 'refs/remotes/ppy/master' into move-graph-data-to-statistics 2019-08-05 12:45:29 +03:00
Dan Balasescu
cd27e1eb70
Merge branch 'master' into update-direct-categories-sorting 2019-08-05 17:11:48 +09:00
Dan Balasescu
b20f1d1717
Merge branch 'master' into fix-settings-sidebar-max-ui-scale 2019-08-05 13:42:04 +09:00
Dan Balasescu
b9c406f3b2
Merge branch 'master' into profile-ruleset-selector-improvements 2019-08-05 13:31:23 +09:00
smoogipoo
d839717131 Remove unnecessary intermediate method 2019-08-05 13:18:29 +09:00
Andrei Zavatski
d693a54c84 Move RankHistoryData to User Statistics 2019-08-04 14:35:26 +03:00
Andrei Zavatski
3ae5428dad ProfileRulesetSelector improvements 2019-08-04 14:15:16 +03:00
Andrei Zavatski
c8acbdb1d9 Update the colour 2019-08-04 06:15:15 +03:00
Joehu
f6f96658c7 Fix settings sidebar being behind toolbar 2019-08-03 15:22:06 -07:00
Joehu
115cf47ed5 Fix settings sidebar showing scrollbar at max ui scale 2019-08-03 15:20:44 -07:00
Andrei Zavatski
416f9d89db CI fixes 2019-08-03 05:49:01 +03:00
Andrei Zavatski
37be4fbf16 Use GridContainer for layout 2019-08-03 05:34:14 +03:00
Joehu
0082695cd8 Choose default category sorting instead of being always first 2019-08-02 13:22:58 -07:00
Andrei Zavatski
de96e5dfc6 Apply suggested changes 2019-08-02 07:41:11 +03:00
Andrei Zavatski
5547592768 CI fixes 2019-08-01 23:04:18 +03:00
Andrei Zavatski
e66a3494b9 make the container hidden by default 2019-08-01 22:50:01 +03:00
Andrei Zavatski
13fe1732d8 adjust height values to avoid random jumps 2019-08-01 21:32:04 +03:00
Andrei Zavatski
90c59ab39d implement PreviousUsernamesContainer 2019-08-01 21:26:59 +03:00
Andrei Zavatski
0f36088ef8 Add loved section 2019-08-01 11:06:29 +03:00
Dean Herbert
26909dc580
Update follower count API source (#5397)
Update follower count API source
2019-07-31 00:24:18 +09:00
Dean Herbert
4c6cccb3a3 Update settings in line with framework changes 2019-07-30 23:31:21 +09:00
Dean Herbert
5bb31ecb00
Merge branch 'master' into update-follower-count 2019-07-30 22:20:33 +09:00
smoogipoo
fab3ec3e5b Add maximum height to skin dropdown 2019-07-30 19:28:02 +09:00
David Zhao
1956098166 Add a fallback for humanizer localization failure 2019-07-30 14:06:08 +09:00
Max Hübner
316b11d08b use single line if-statement 2019-07-28 20:36:21 +02:00
Dean Herbert
663f34d3d8 Remove width specifications 2019-07-29 02:47:26 +09:00
Max Hübner
f7b9ddb48c combine Text and TextBold 2019-07-28 12:40:21 +02:00
Max Hübner
df8d4d8966 add truncation to base class 2019-07-28 12:16:32 +02:00
Max Hübner
c6d4ce0f8a revert truncation in derived class 2019-07-28 12:14:06 +02:00
Dean Herbert
a24e57dd3d
Merge branch 'master' into refactor-osd 2019-07-28 13:10:01 +09:00
Dean Herbert
ddb98c705a
Merge branch 'master' into update-follower-count 2019-07-28 12:53:40 +09:00
Max Hübner
edf6453e04 truncate long usernames in private chat 2019-07-27 18:56:37 +02:00
Dean Herbert
56b27db7a4 Use "Click" instead of "Action" 2019-07-26 13:17:33 +09:00
Dean Herbert
7ec6ac7b0e Remove unnecessary override 2019-07-26 13:15:36 +09:00
Max Hübner
78a8a6490e close chat tabs with middle mouse button 2019-07-24 17:17:29 +02:00
Dan Balasescu
bc64c56a26
Merge branch 'master' into remove-text-shadow 2019-07-23 20:16:33 +09:00
Dean Herbert
704fe2d655 Remove text shadow in chat 2019-07-23 16:04:50 +09:00
smoogipoo
5e72ed0d12 Fix potential nullref 2019-07-23 15:35:12 +09:00
Andrei Zavatski
ffcc1c62af simplify moving condition 2019-07-22 23:22:39 +03:00