1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 13:47:38 +08:00
Commit Graph

9807 Commits

Author SHA1 Message Date
Dean Herbert
0a06f8069f Remove panel fade out for now
Should be implemented at one level above using a dedicated container.
2018-01-12 17:22:51 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +09:00
Dean Herbert
ee23c33422
Merge pull request #1881 from james58899/fix-background-dim
Fix background dim not being applied correctly
2018-01-12 15:53:26 +09:00
james58899
f83c84a0a6
keep BlurTo 2018-01-12 14:24:42 +08:00
james58899
61c8fd4ab9
useless using 2018-01-12 12:39:32 +08:00
james58899
1985e5bdb2
fix background dim 2018-01-12 12:21:37 +08:00
Dean Herbert
f6e6701749
Merge pull request #1877 from smoogipoo/overlaycontainer-mouse-block
Allow mouse wheel to change volume in overlays
2018-01-11 20:28:39 +09:00
Dean Herbert
35c3ee261d Update framework 2018-01-11 20:18:46 +09:00
smoogipoo
5cfb2c2ffe Make VolumeControlReceptor handle global input
Fixes volume not being able to be changed in dead areas of OverlayContainers.
2018-01-11 19:03:31 +09:00
smoogipoo
c5c33e20bf OverlayContainer changes in-line with framework 2018-01-11 19:03:01 +09:00
Dan Balasescu
2a983efe0a
Merge pull request #1875 from james58899/fix-storyboard
Fix Storyboard not load in osu file
2018-01-11 17:10:00 +09:00
Dan Balasescu
86581b6451
Remove extra braces 2018-01-11 17:02:09 +09:00
james58899
4fa038aa27
if not storyboard file 2018-01-11 13:53:41 +08:00
Aergwyn
312f52072b enable query
change Avatar animation too
add forgotten usings
2018-01-10 16:46:55 +01:00
james58899
fbffc8bb89
fix load storyboard in osu file 2018-01-10 18:55:04 +08:00
Dean Herbert
5b6ddb984f
Merge pull request #1873 from peppy/rulesetinfo-refactor
Allow rulesets to create their own instantiation info
2018-01-10 17:34:01 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
Dean Herbert
fe7ce26b84
Merge pull request #1754 from ColdVolcano/background-blur
Add setting to adjust background blur level during gameplay
2018-01-10 13:50:08 +09:00
Dean Herbert
338eaad0e5 Merge remote-tracking branch 'upstream/master' into background-blur 2018-01-10 13:38:53 +09:00
Dan Balasescu
4f8ce272ae
Merge pull request #1853 from peppy/drop-fruit
Drop fruit when last in combo is not caught
2018-01-10 13:35:18 +09:00
Dean Herbert
9ec8f130a6 Ensure changes are only applied when we are the current screen 2018-01-10 13:24:26 +09:00
Dean Herbert
1c20fba6bc Merge branch 'master' into drop-fruit 2018-01-10 12:29:53 +09:00
Dan Balasescu
632e6fcdd3
Merge pull request #1852 from peppy/fix-catcher-width
Fix catcher width and playfield scaling
2018-01-10 12:19:37 +09:00
Dean Herbert
1a37812d1f
Merge branch 'master' into expand-social-tab 2018-01-10 11:52:08 +09:00
Dean Herbert
32e237d138
Merge branch 'master' into drop-fruit 2018-01-10 11:39:46 +09:00
Dean Herbert
9d099feadc
Merge branch 'master' into fix-catcher-width 2018-01-10 10:04:10 +09:00
Dean Herbert
77276e3e8e
Merge pull request #1864 from peppy/fix-dotsettings-file
FIx incorrect licence header template
2018-01-10 09:45:15 +09:00
Dan Balasescu
9afd823d6e
Merge branch 'master' into fix-dotsettings-file 2018-01-10 09:35:49 +09:00
Dan Balasescu
d0fd7fe1f4
Merge pull request #1848 from peppy/drawable-fruit-improvements
Improvements to osu!catch visuals
2018-01-10 09:34:49 +09:00
Aergwyn
4ce125478a remove unnecessary Schedules
one was bugging out when rapidly switching display styles and the other was... unnecessary
2018-01-09 19:03:23 +01:00
Aergwyn
44d821172a tidying up 2018-01-09 16:29:12 +01:00
Dean Herbert
c4490b5fe8 Fix incorrect licence header 2018-01-09 22:24:12 +09:00
Dean Herbert
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert
2518d16a77 Denote unused variable 2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
51513b45eb
Merge branch 'master' into fix-dotsettings-file 2018-01-09 14:32:40 +09:00
Dan Balasescu
96226e1f27
Merge pull request #1870 from peppy/mod-per-file
Move mod implementations to individual files
2018-01-09 14:30:51 +09:00
Dean Herbert
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
Dean Herbert
bb57d33239
Merge pull request #1819 from LittleEndu/fix-randomizer
Don't allow randomizer to select invisible maps
2018-01-09 12:52:25 +09:00
Dean Herbert
722eb2515f Improve variable names 2018-01-09 12:44:52 +09:00
Dean Herbert
a3f05ca9ec Avoid unnecessary use of linq 2018-01-09 12:43:10 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
Dean Herbert
cab702cc94
Merge pull request #1854 from james58899/fix-storyboard-variables
Fix storyboard variable parsing
2018-01-09 11:59:53 +09:00
Dean Herbert
4c0259a040
Merge branch 'master' into fix-storyboard-variables 2018-01-09 11:50:03 +09:00
Dean Herbert
e7f9c9f22b
Merge pull request #1869 from Aergwyn/ingame-keybinds
Add skip cutscene as "in game" keybinding
2018-01-09 11:49:32 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
Dean Herbert
805e91c625
Merge pull request #1858 from Aergwyn/fix-leaderboard-requests
Fix Leaderboard loading scores multiple times
2018-01-08 20:30:34 +09:00
Dean Herbert
22665337a5
Merge branch 'master' into fix-leaderboard-requests 2018-01-08 20:21:18 +09:00