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

6117 Commits

Author SHA1 Message Date
John Neijzen
23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
Dean Herbert
0198e16678 Merge pull request #859 from DrabWeb/social-browser
Social browser
2017-06-07 21:06:05 +09:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
Dean Herbert
59bed2b16e Add missing spaces 2017-06-07 20:44:54 +09:00
Dean Herbert
8d434e88ee Fix VisualTest not using placeholder data 2017-06-07 20:20:22 +09:00
Dean Herbert
94c961ddb8 CI Fixes 2017-06-07 20:16:34 +09:00
Dean Herbert
97db4856fc Add toolbar toggle button
Also ensure chat is hidden when social is displayed and vice-versa.
2017-06-07 20:15:58 +09:00
Dean Herbert
fc2d9816df Make SearchableListHeader icon customisable 2017-06-07 20:06:02 +09:00
Dean Herbert
6a12173175 Add very temporary data source for social browser 2017-06-07 20:05:43 +09:00
smoogipooo
8641379424 Not sure how these CI issues were missed. 2017-06-07 19:27:22 +09:00
smoogipooo
1932b58663 g -> gravity + one more xmldoc. 2017-06-07 19:21:31 +09:00
smoogipooo
1017cf54d9 CI fixes. 2017-06-07 19:17:45 +09:00
smoogipooo
6f191193a1 Rename timing changes, simplify + improve columns/dictionary usage. 2017-06-07 19:15:51 +09:00
smoogipooo
7aee8ee547 Make TimeSpan a double again. 2017-06-07 19:08:32 +09:00
Dean Herbert
a07f6801da Merge remote-tracking branch 'upstream/master' into timingchange-rework 2017-06-07 18:39:27 +09:00
Dean Herbert
1de296747f Merge remote-tracking branch 'upstream/master' into social-browser 2017-06-07 17:38:06 +09:00
Dan Balasescu
f52f8326dd Merge pull request #911 from peppy/update-framework
Bring framework up-to-date
2017-06-07 15:42:42 +09:00
Dean Herbert
5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
Péter Nemes
1f311cca06 Fix cref in comment. 2017-06-06 19:09:26 +02:00
Péter Nemes
93f654a539 More docs, better docs. 2017-06-06 18:59:46 +02:00
Péter Nemes
ce0d70d651 Whitespace fix. 2017-06-06 15:52:33 +02:00
Dan Balasescu
a010e6b8db Merge pull request #910 from peppy/warnings-as-errors
Treat inspectcode warnings as errors (CI)
2017-06-06 22:40:38 +09:00
Péter Nemes
01585027b1 OsuDifficultyBeatmap enumeration logic made clearer, more documentation added. 2017-06-06 15:39:37 +02:00
Dean Herbert
e727195187 Treat inspectcode warnings as errors (CI)
There are many instances we accidentally merge pull requests with outstanding warnings, as the fact warnings exists is not made obvious. This forces all `inspectcode` warnings to an error level.
2017-06-06 22:06:43 +09:00
Dean Herbert
fc43445063 Merge pull request #906 from Tom94/chat-focus
Do not release focus of the chat text box when sending a message
2017-06-06 19:24:47 +09:00
Dean Herbert
78fc36904e Merge branch 'master' into chat-focus 2017-06-06 19:13:30 +09:00
smoogipooo
5104e65bcd Make hold notes utilize RelativeChildOffset for tick positionings. 2017-06-06 15:57:30 +09:00
smoogipooo
e3d10fc4d3 Update with more framework changes. 2017-06-06 15:52:35 +09:00
Dan Balasescu
7ee62cc454 Merge pull request #902 from peppy/simplify-hud-overlay
Remove StandardHUDOverlay
2017-06-06 14:54:03 +09:00
Dan Balasescu
eb545d907d Merge branch 'master' into simplify-hud-overlay 2017-06-06 14:31:54 +09:00
Dan Balasescu
75165857d1 Merge pull request #909 from peppy/update-resources-again
Update resource again (fixes filesize increase)
2017-06-06 14:23:59 +09:00
Dean Herbert
141c53c506 Update resource again (fixes filesize increase) 2017-06-06 13:54:16 +09:00
Huo Yaoyuan
a09d873db9 Basic member of profile header. 2017-06-06 12:12:20 +08:00
Péter Nemes
afb4443763 Capitalised protected members, added readonly modifiers. 2017-06-06 01:08:34 +02:00
Péter Nemes
f9441a7419 Fix typo and whitespace. 2017-06-06 00:07:00 +02:00
Péter Nemes
c624712f2f Refactor ppv2 to allow integration of pp+ features. 2017-06-05 23:45:22 +02:00
Thomas Müller
fac16bdebd Do not release focus of the chat text box when sending a message 2017-06-05 18:07:28 +02:00
Dean Herbert
2fbad58866 Merge pull request #861 from DrabWeb/channel-selection
Channel selection overlay
2017-06-05 23:19:02 +09:00
Dean Herbert
6b7e18a1e3 Fix not being able to change channels when channel select dialog is up 2017-06-05 23:12:39 +09:00
Huo Yaoyuan
7d4c5999f6 Add description in test case. 2017-06-05 21:20:04 +08:00
Huo Yaoyuan
8fa076b5d7 Merge branch 'master' into userpage 2017-06-05 21:14:46 +08:00
Huo Yaoyuan
428b44f7d9 UserPage -> Profile. 2017-06-05 21:07:57 +08:00
Huo Yaoyuan
1b8ef3bbbd Add test case for UserPage. 2017-06-05 21:05:01 +08:00
Dean Herbert
d9106c4e30 Temporarily disable inspection 2017-06-05 21:58:13 +09:00
Dean Herbert
57aad1311d Merge branch 'master' into channel-selection 2017-06-05 21:46:28 +09:00
Dean Herbert
cbd0e8e375 Merge pull request #904 from Tom94/smoothly-moving-tooltips
Make osu tooltips move smoothly
2017-06-05 21:44:45 +09:00
Dean Herbert
dcee9dd299 Merge branch 'master' into smoothly-moving-tooltips 2017-06-05 21:11:50 +09:00
Dean Herbert
d2294cd294 Merge branch 'master' into simplify-hud-overlay 2017-06-05 21:00:04 +09:00
Dean Herbert
b9c99950da Merge pull request #903 from peppy/update-resource
Update resources
2017-06-05 20:59:44 +09:00
Dean Herbert
c85a0223b0 Only instantly move tooltip is we are not visible 2017-06-05 20:52:46 +09:00