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

13903 Commits

Author SHA1 Message Date
miterosan
b414bff864 Fix the testcase 2018-08-04 01:00:46 +02:00
miterosan
358c346923 Use TabItem.Items.Count 2018-08-04 00:44:16 +02:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages 2018-08-04 00:33:46 +02:00
Dan Balasescu
78eabce35a
Merge pull request #3164 from peppy/fix-fade-discrepancies
Fix discrepancies in how elements of play mode fade when restarting/e…
2018-08-04 00:31:51 +09:00
Dan Balasescu
1981b94e32
Merge branch 'master' into fix-fade-discrepancies 2018-08-04 00:21:48 +09:00
Dan Balasescu
c3060e18a4
Merge pull request #3161 from peppy/scroll-chat-on-message
Scroll chat to end of buffer when posting a new message
2018-08-04 00:21:17 +09:00
Dean Herbert
808754a191
Merge branch 'master' into fix-fade-discrepancies 2018-08-03 21:50:03 +09:00
Dean Herbert
46b3ba9edb
Merge branch 'master' into scroll-chat-on-message 2018-08-03 21:50:00 +09:00
Dean Herbert
770f96d871
Merge pull request #3171 from peppy/update-framework
Update framework
2018-08-03 21:49:47 +09:00
Dean Herbert
8d98826f69 Update framework 2018-08-03 21:17:17 +09:00
Dean Herbert
fc8526d8ba
Merge branch 'master' into scroll-chat-on-message 2018-08-03 20:09:54 +09:00
Dean Herbert
b4ef3dd4dd Add LocalMessage 2018-08-03 20:03:43 +09:00
Dan Balasescu
920d988a9e
Merge pull request #3163 from peppy/improve-visual-settings-preview
Improve UX when adjusting visual settings at loading screen
2018-08-03 19:42:59 +09:00
Dean Herbert
4c57e629ff Use private implementation 2018-08-03 19:32:34 +09:00
Dan Balasescu
e3490b1270
Merge branch 'master' into improve-visual-settings-preview 2018-08-03 19:29:12 +09:00
Dan Balasescu
99d095ef8e
Merge pull request #3150 from peppy/split-mod-sections
Split out mods category sections
2018-08-03 19:27:42 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections 2018-08-03 18:48:31 +09:00
Dean Herbert
7097ecb740 Fix discrepancies in how elements of play mode fade when restarting/exiting 2018-08-02 19:08:23 +09:00
Dean Herbert
4a11f2ec2a Improve UX when adjusting visual settings at loading screen 2018-08-02 18:18:55 +09:00
Dean Herbert
1ed6b23306
Merge pull request #3156 from ekrctb/fix-playerloader-ready-check
Fix player loader not continuing when multiple mouse button is down
2018-08-02 18:15:38 +09:00
Dan Balasescu
77450ee402
Merge pull request #3159 from peppy/remove-net471-references
Remove remaining references to net471
2018-08-02 15:17:11 +09:00
Dean Herbert
9fdba887e4
Merge branch 'master' into fix-playerloader-ready-check 2018-08-02 11:37:45 +09:00
Dean Herbert
70ee7e4afd Scroll chat to end of buffer when posting a new message 2018-08-02 08:00:14 +09:00
Dean Herbert
d454dbfdc2 Fix artifact collection 2018-08-01 23:07:12 +09:00
Dean Herbert
21a19dc552 Remove remaining references to net471 2018-08-01 22:07:39 +09:00
Dan Balasescu
bc71ff76b1
Merge pull request #3157 from peppy/net-core-squirrel
Switch deployable build to .net core on windows
2018-08-01 20:37:08 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
4224d35a75 Use forked squirrel
Allows for updating SharpCompress, too.
2018-08-01 16:56:36 +09:00
ekrctb
ecc6d55380 Fix player loader not gets ready when multiple mouse button is down 2018-08-01 16:20:29 +09:00
Dean Herbert
139f6d8c4f Fix incorrect nuspec title 2018-08-01 12:30:09 +09:00
Dean Herbert
3d136bf207 Remove unused nuspec 2018-08-01 03:37:59 +09:00
Dean Herbert
854beaab5f Remove only remaining .NET desktop code 2018-08-01 02:58:49 +09:00
Dean Herbert
4f1736ceb2 Make squirrel work again 2018-08-01 02:58:39 +09:00
Dean Herbert
7a53cccdfa
Merge pull request #3151 from swoolcock/tabcontrol-compositedrawable
Update TabControl subclasses to use AddInternal
2018-07-31 21:04:02 +09:00
Shane Woolcock
4fdca2b198 Update framework 2018-07-31 21:21:26 +09:30
Shane Woolcock
47533f83c3 Update TabControl subclasses to use AddInternal 2018-07-31 20:52:11 +09:30
Dean Herbert
7192f98c42
Merge pull request #3147 from smoogipoo/disable-download-button
Disable beatmap download button if not supporter
2018-07-31 18:16:00 +09:00
Dean Herbert
582bc58715 Remove unused colour propagation 2018-07-31 18:05:14 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
bcc23f10c5
Merge branch 'master' into disable-download-button 2018-07-31 17:03:41 +09:00
Dean Herbert
bc92bed72f
Merge pull request #3106 from peppy/fix-repeat-arrow-interpolation
Add interpolation to repeat point during sliding
2018-07-31 17:03:26 +09:00
Dean Herbert
51506efd1a Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-31 16:49:31 +09:00
Dean Herbert
d2ce1e9d79
Merge pull request #3062 from peppy/open-downloaded-beatmas
Add ability to open already-downloaded beatmaps from osu!direct
2018-07-31 16:48:48 +09:00
Dean Herbert
ea6cab498e Add comment 2018-07-31 16:47:13 +09:00
Dean Herbert
49b2d8c355
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 16:41:09 +09:00
Dean Herbert
9ab56bc4ef Make Ruleset non-public 2018-07-31 16:35:51 +09:00
Dean Herbert
61b8181b0b
Merge pull request #3139 from tgi74/more-skinning
Make more gameplay elements skinnable
2018-07-31 16:24:45 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation 2018-07-31 16:21:15 +09:00
Dean Herbert
874b5636e4 Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning 2018-07-31 16:15:27 +09:00
Dean Herbert
976653fdf9 Minor formatting fixes 2018-07-31 16:13:52 +09:00