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

4823 Commits

Author SHA1 Message Date
Dean Herbert
3a12fbd581 Merge pull request #764 from peppy/fix-duplicate-channels
Fix duplicate channels being created on connection loss
2017-05-16 18:54:35 +09:00
Dean Herbert
71b14bb8af Merge branch 'master' into fix-duplicate-channels 2017-05-16 18:50:21 +09:00
Dan Balasescu
0215b45088 Merge branch 'master' into player-fixes 2017-05-16 18:39:21 +09:00
smoogipooo
3c8d75effb Fix unused directive. 2017-05-16 18:36:38 +09:00
smoogipooo
6231a19b8c Merge remote-tracking branch 'origin/master' into mania-timing-sections 2017-05-16 18:35:32 +09:00
Dan Balasescu
4e569f72c9 Merge pull request #761 from peppy/smoother-chat-tab-bold
Fade bold state of chat tabs better
2017-05-16 18:31:38 +09:00
Dean Herbert
712bd21e25 Fix duplicate channels being created on connection loss
Resolves #763
2017-05-16 18:28:42 +09:00
smoogipooo
235a5b1dff Add notes to test case. 2017-05-16 18:27:33 +09:00
smoogipooo
be4ff5c038 Fix possible no-children-in-sequence exception. 2017-05-16 18:26:49 +09:00
smoogipooo
620b4bf863 Cleanup. 2017-05-16 18:17:34 +09:00
smoogipooo
60666dc824 Rename. 2017-05-16 18:05:09 +09:00
smoogipooo
f4a03ec1cf Fix usings. 2017-05-16 18:03:30 +09:00
smoogipooo
8ed97a8335 Let's invert the playfield by default for now. 2017-05-16 18:02:54 +09:00
Dean Herbert
3673e4af1f
Fade bold state of chat tabs better 2017-05-16 18:00:29 +09:00
Dean Herbert
6487bf45cf
Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
Dean Herbert
b016d53b85
Fix TwoLayerButton not capturing MouseDown events
Caused clicks to pass through the skip button to the progress bar.
2017-05-16 17:59:07 +09:00
smoogipooo
ac02d1ab10 TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation). 2017-05-16 17:50:09 +09:00
smoogipooo
7039205363 Invert the playfield by default to make calculations a bit simpler and clean up a lot of code. 2017-05-16 17:34:41 +09:00
Dean Herbert
5bb4666c4d Merge branch 'master' into on-screen-display 2017-05-16 17:07:18 +09:00
Dean Herbert
318549ec33 Merge pull request #757 from peppy/margin-padding-namespace
Update namespaces in line with framework
2017-05-16 17:07:08 +09:00
smoogipooo
62139015fb Clamp TimeSpan. 2017-05-16 17:06:54 +09:00
smoogipooo
8d19bafc19 Add ability to hold down speed-changing keys. 2017-05-16 17:04:05 +09:00
smoogipooo
da932276e8 Make timing sections scroll again. 2017-05-16 17:03:43 +09:00
Dean Herbert
0feaa407f2 Merge branch 'margin-padding-namespace' into on-screen-display 2017-05-16 16:40:06 +09:00
Dean Herbert
ed92a1ee4e Update framework 2017-05-16 16:37:05 +09:00
Dean Herbert
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
Dean Herbert
694b85c4b0 Update framework 2017-05-16 16:29:18 +09:00
Dan Balasescu
91de72e161 Merge branch 'master' into on-screen-display 2017-05-16 16:27:19 +09:00
Dan Balasescu
e501176e1c Merge pull request #758 from peppy/general-fixes
General fixes
2017-05-16 16:27:02 +09:00
Dan Balasescu
fe3d035474 Merge branch 'master' into general-fixes 2017-05-16 16:16:43 +09:00
Dan Balasescu
e69469f4fb Merge pull request #756 from peppy/logo-shockwave
Adjust osu! logo metrics and add shockwave impact animation
2017-05-16 16:16:11 +09:00
Dan Balasescu
83a8a27161 Merge branch 'master' into logo-shockwave 2017-05-16 16:10:34 +09:00
Dan Balasescu
6cbaf1ba05 Merge pull request #760 from peppy/message-fetch-fix
Fix initial requests of channel mesages not being performed
2017-05-16 16:07:40 +09:00
Dean Herbert
f0ea445e46 Fix initial requests of channel mesages not being performed
fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
2017-05-16 15:59:01 +09:00
Dan Balasescu
0e45277416 Merge pull request #755 from peppy/chat-error-messages
Add error message in chat when attempting to use commands
2017-05-16 15:30:47 +09:00
Dan Balasescu
2ad9aa2ae5 Merge branch 'master' into chat-error-messages 2017-05-16 15:12:59 +09:00
Dean Herbert
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
Dean Herbert
e09f1c7c91 Remove AudioDevice from game-level setting
Should be (and is already)  in FrameworkConfig.
2017-05-16 12:59:47 +09:00
Dean Herbert
696c53646d Change severity of unaccessed private collections to hint 2017-05-16 12:59:42 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
23760d6805 Adjust osu! logo metrics and add shockwave impact animation 2017-05-15 19:36:03 +09:00
Dean Herbert
dced452667 Merge pull request #749 from EVAST9919/cursor_size
Automatic gameplay cursor size
2017-05-15 16:51:06 +09:00
Dean Herbert
fa889c4340 Update framework 2017-05-15 16:20:02 +09:00
Dean Herbert
3b1d5ce7df CI fix 2017-05-15 13:31:51 +09:00
Dean Herbert
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
Dean Herbert
1f3039926f Reword settings text slightly 2017-05-15 12:57:55 +09:00
Dean Herbert
f730769186 Rewrite to make better 2017-05-15 12:54:56 +09:00
Dean Herbert
3b87a938db Merge branch 'master' into cursor_size. 2017-05-15 12:23:49 +09:00
Dean Herbert
eb55d9a1ae Merge pull request #744 from EVAST9919/mod_fix
Fixed IncompatibleMods for OsuModAutoplay
2017-05-15 12:06:43 +09:00
Dean Herbert
240d73bbf1 Merge branch 'master' into mod_fix 2017-05-15 11:59:19 +09:00