Commit Graph

4437 Commits

Author SHA1 Message Date
2384f7b0c1 Ensure LocalUser is never null 2017-05-16 19:49:50 +09:00
d1c198d9bf Merge pull request #762 from peppy/player-fixes
Player fixes
2017-05-16 19:20:33 +09:00
a209a738ea Merge branch 'master' into player-fixes 2017-05-16 19:11:23 +09:00
5786efd379 Merge pull request #759 from peppy/on-screen-display
On-screen display
2017-05-16 19:10:45 +09:00
ca9c52ce38 Merge branch 'master' into player-fixes 2017-05-16 18:54:55 +09:00
0c7ceea4fd Merge branch 'master' into on-screen-display 2017-05-16 18:54:54 +09:00
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
71b14bb8af Merge branch 'master' into fix-duplicate-channels 2017-05-16 18:50:21 +09:00
0215b45088 Merge branch 'master' into player-fixes 2017-05-16 18:39:21 +09:00
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
712bd21e25 Fix duplicate channels being created on connection loss
Resolves #763
2017-05-16 18:28:42 +09:00
3673e4af1f Fade bold state of chat tabs better 2017-05-16 18:00:29 +09:00
6487bf45cf Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
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
5bb4666c4d Merge branch 'master' into on-screen-display 2017-05-16 17:07:18 +09:00
318549ec33 Merge pull request #757 from peppy/margin-padding-namespace
Update namespaces in line with framework
2017-05-16 17:07:08 +09:00
0feaa407f2 Merge branch 'margin-padding-namespace' into on-screen-display 2017-05-16 16:40:06 +09:00
ed92a1ee4e Update framework 2017-05-16 16:37:05 +09:00
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
694b85c4b0 Update framework 2017-05-16 16:29:18 +09:00
91de72e161 Merge branch 'master' into on-screen-display 2017-05-16 16:27:19 +09:00
e501176e1c Merge pull request #758 from peppy/general-fixes
General fixes
2017-05-16 16:27:02 +09:00
fe3d035474 Merge branch 'master' into general-fixes 2017-05-16 16:16:43 +09:00
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
83a8a27161 Merge branch 'master' into logo-shockwave 2017-05-16 16:10:34 +09:00
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
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
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
2ad9aa2ae5 Merge branch 'master' into chat-error-messages 2017-05-16 15:12:59 +09:00
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
e09f1c7c91 Remove AudioDevice from game-level setting
Should be (and is already)  in FrameworkConfig.
2017-05-16 12:59:47 +09:00
696c53646d Change severity of unaccessed private collections to hint 2017-05-16 12:59:42 +09:00
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
23760d6805 Adjust osu! logo metrics and add shockwave impact animation 2017-05-15 19:36:03 +09:00
dced452667 Merge pull request #749 from EVAST9919/cursor_size
Automatic gameplay cursor size
2017-05-15 16:51:06 +09:00
fa889c4340 Update framework 2017-05-15 16:20:02 +09:00
3b1d5ce7df CI fix 2017-05-15 13:31:51 +09:00
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
1f3039926f Reword settings text slightly 2017-05-15 12:57:55 +09:00
f730769186 Rewrite to make better 2017-05-15 12:54:56 +09:00
3b87a938db Merge branch 'master' into cursor_size. 2017-05-15 12:23:49 +09:00
eb55d9a1ae Merge pull request #744 from EVAST9919/mod_fix
Fixed IncompatibleMods for OsuModAutoplay
2017-05-15 12:06:43 +09:00
240d73bbf1 Merge branch 'master' into mod_fix 2017-05-15 11:59:19 +09:00
1632380002 Merge pull request #754 from peppy/settings-not-options
Change all instances of options to settings where applicable
2017-05-15 11:20:45 +09:00
d969507f65 Update framework 2017-05-15 11:14:19 +09:00
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
b6460d89c9 Cleanup 2017-05-14 10:26:52 +03:00
2b95b92429 Merge remote-tracking branch 'refs/remotes/ppy/master' into cursor_size 2017-05-14 09:48:18 +03:00
ca2bf29194 Merge pull request #748 from EVAST9919/spinner_speed
Spinner's difficulty depends on beatmap's OD
2017-05-14 15:41:16 +09:00