1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 10:02:55 +08:00
Commit Graph

4545 Commits

Author SHA1 Message Date
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
Dan Balasescu
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
Dean Herbert
d969507f65 Update framework 2017-05-15 11:14:19 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
EVAST9919
b6460d89c9 Cleanup 2017-05-14 10:26:52 +03:00
EVAST9919
2b95b92429 Merge remote-tracking branch 'refs/remotes/ppy/master' into cursor_size 2017-05-14 09:48:18 +03:00
Dan Balasescu
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
EVAST9919
7055c99df0 Added default value 2017-05-14 09:36:09 +03:00
EVAST9919
a4d5660e41 Cast SpinsRequired value to int 2017-05-14 09:22:49 +03:00
EVAST9919
49f5364e9e CI fixes 2017-05-14 07:35:23 +03:00
EVAST9919
12dab6f75c iplemented stable-like algorithm 2017-05-14 07:28:12 +03:00
EVAST9919
ef23405733 Applied suggested changes 2017-05-14 06:45:35 +03:00
EVAST9919
ca6df533bd Automatic gameplay cursor size 2017-05-13 03:46:37 +03:00
EVAST9919
6d9e11a74f CI fixes 2017-05-13 03:10:13 +03:00
EVAST9919
5532d3ec49 storing OD value only 2017-05-13 03:04:40 +03:00
EVAST9919
86ebd9d663 spinner's progress depends on current map OD now 2017-05-13 02:51:58 +03:00
smoogipooo
a25f11e809 Initial removal of TimingSection. 2017-05-12 22:23:32 +09:00
EVAST9919
19728b3d98 Fixed IncompatibleMods for OsuModAutoplay 2017-05-12 15:13:02 +03:00
Dean Herbert
08f980ccae Merge pull request #722 from DrabWeb/playlist-commit
Play first visible set in playlist on commit
2017-05-12 20:53:13 +09:00
Dean Herbert
fd9218b6d5 Use FirstOrDefault 2017-05-12 20:48:25 +09:00
Dean Herbert
24db423c4f Merge remote-tracking branch 'upstream/master' into playlist-commit 2017-05-12 20:39:50 +09:00
Dean Herbert
cf9b121634 Merge pull request #743 from peppy/fix-beatmap-population
Fix ruleset not always getting populated in a WorkingBeatmap
2017-05-12 20:38:45 +09:00
Dean Herbert
e096dd8126 Merge branch 'master' into fix-beatmap-population 2017-05-12 20:30:06 +09:00
Dean Herbert
a9b8e57be8 Merge pull request #728 from Jorolf/new-option-search
add search box and the ability to search
2017-05-12 20:29:53 +09:00
Dan Balasescu
815379646c Merge branch 'master' into new-option-search 2017-05-12 20:22:11 +09:00
Dan Balasescu
d60da82c4c Merge branch 'master' into fix-beatmap-population 2017-05-12 20:15:10 +09:00
Dan Balasescu
4c2ec046f0 Merge pull request #741 from peppy/chat-design-update
Update chat design
2017-05-12 20:10:52 +09:00
Dean Herbert
6c117f15af Remove unnecessary usings 2017-05-12 20:06:38 +09:00