|
|
a6ecc2897a
|
Merge branch 'master' into master
|
2018-01-11 19:07:46 +09:00 |
|
|
|
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 |
|
|
|
c5c33e20bf
|
OverlayContainer changes in-line with framework
|
2018-01-11 19:03:01 +09:00 |
|
|
|
2a983efe0a
|
Merge pull request #1875 from james58899/fix-storyboard
Fix Storyboard not load in osu file
|
2018-01-11 17:10:00 +09:00 |
|
|
|
86581b6451
|
Remove extra braces
|
2018-01-11 17:02:09 +09:00 |
|
|
|
ab762045d6
|
Move back to using load(), fix testcase
|
2018-01-11 16:51:46 +09:00 |
|
|
|
d998936e9e
|
Fix testcase errors
|
2018-01-11 15:50:44 +09:00 |
|
|
|
9ae67b519b
|
Optimise nested hitobject position computations
|
2018-01-11 15:25:15 +09:00 |
|
|
|
428f8b6670
|
Fix up license header
|
2018-01-11 15:08:56 +09:00 |
|
|
|
9d00e5bb7d
|
Make ScrollingHitObjectContainer handle nested hitobjects
|
2018-01-11 15:08:30 +09:00 |
|
|
|
4fa038aa27
|
if not storyboard file
|
2018-01-11 13:53:41 +08:00 |
|
|
|
a6d8b28221
|
Add OSD + config value for scroll speed
|
2018-01-11 13:40:46 +09:00 |
|
|
|
3a869edf36
|
Add a flag to disable user scroll speed adjustments
|
2018-01-11 12:44:39 +09:00 |
|
|
|
6a5a3b01b2
|
Fix license headers
|
2018-01-11 12:39:06 +09:00 |
|
|
|
312f52072b
|
enable query
change Avatar animation too
add forgotten usings
|
2018-01-10 16:46:55 +01:00 |
|
|
|
118e0b63eb
|
fix CI error
|
2018-01-11 00:07:27 +09:00 |
|
|
|
cc0520d722
|
1. because set stage's width doesn't help, so use margin instead
2. adjust spacing when has different number of stages
|
2018-01-10 23:47:38 +09:00 |
|
|
|
fbffc8bb89
|
fix load storyboard in osu file
|
2018-01-10 18:55:04 +08:00 |
|
|
|
6255aaab68
|
Per-hitobject lifetime management
|
2018-01-10 19:17:43 +09:00 |
|
|
|
fb857c5e37
|
Merge branch 'master' into master
|
2018-01-10 18:48:00 +09:00 |
|
|
|
9036ea92eb
|
Run child updates for nested hitobjects when parent hitobjects are masked
|
2018-01-10 18:29:46 +09:00 |
|
|
|
f71d086a41
|
Fix post-merge issues
|
2018-01-10 18:08:43 +09:00 |
|
|
|
1c412e233a
|
Update submodules
|
2018-01-10 18:04:12 +09:00 |
|
|
|
86b5591583
|
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
|
2018-01-10 18:02:49 +09:00 |
|
|
|
d147683361
|
Cleanup
|
2018-01-10 17:39:15 +09:00 |
|
|
|
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 |
|
|
|
c010b48b29
|
Remove number format specified from OsuSliderBar, override ToolTipText
Better/cleaner solution.
|
2018-01-10 17:29:16 +09:00 |
|
|
|
97a3ad775c
|
Merge branch 'master' into master
|
2018-01-10 17:05:36 +09:00 |
|
|
|
58626e3b30
|
Allow rulesets to create their own instantiation info
|
2018-01-10 17:04:07 +09:00 |
|
|
|
17e7f75aca
|
More osu!-side bindable fixes
|
2018-01-10 15:41:13 +09:00 |
|
|
|
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 |
|
|
|
338eaad0e5
|
Merge remote-tracking branch 'upstream/master' into background-blur
|
2018-01-10 13:38:53 +09:00 |
|
|
|
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 |
|
|
|
9ec8f130a6
|
Ensure changes are only applied when we are the current screen
|
2018-01-10 13:24:26 +09:00 |
|
|
|
1c20fba6bc
|
Merge branch 'master' into drop-fruit
|
2018-01-10 12:29:53 +09:00 |
|
|
|
632e6fcdd3
|
Merge pull request #1852 from peppy/fix-catcher-width
Fix catcher width and playfield scaling
|
2018-01-10 12:19:37 +09:00 |
|
|
|
1a37812d1f
|
Merge branch 'master' into expand-social-tab
|
2018-01-10 11:52:08 +09:00 |
|
|
|
32e237d138
|
Merge branch 'master' into drop-fruit
|
2018-01-10 11:39:46 +09:00 |
|
|
|
9d099feadc
|
Merge branch 'master' into fix-catcher-width
|
2018-01-10 10:04:10 +09:00 |
|
|
|
77276e3e8e
|
Merge pull request #1864 from peppy/fix-dotsettings-file
FIx incorrect licence header template
|
2018-01-10 09:45:15 +09:00 |
|
|
|
9afd823d6e
|
Merge branch 'master' into fix-dotsettings-file
|
2018-01-10 09:35:49 +09:00 |
|
|
|
d0fd7fe1f4
|
Merge pull request #1848 from peppy/drawable-fruit-improvements
Improvements to osu!catch visuals
|
2018-01-10 09:34:49 +09:00 |
|
|
|
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 |
|
|
|
44d821172a
|
tidying up
|
2018-01-09 16:29:12 +01:00 |
|
|
|
c4490b5fe8
|
Fix incorrect licence header
|
2018-01-09 22:24:12 +09:00 |
|
|
|
fcb197f7b6
|
Simplify logic
|
2018-01-09 22:21:15 +09:00 |
|
|
|
4060583b10
|
Merge branch 'master' of https://github.com/ppy/osu
# Conflicts:
# osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
|
2018-01-09 22:09:25 +09:00 |
|
|
|
9c602f8770
|
Merge branch 'master' into drawable-fruit-improvements
|
2018-01-09 22:06:16 +09:00 |
|
|
|
2518d16a77
|
Denote unused variable
|
2018-01-09 21:34:31 +09:00 |
|
|
|
c2fadcfc1f
|
Merge branch 'master' into background-blur
|
2018-01-09 21:20:05 +09:00 |
|
