1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 18:52:56 +08:00
Commit Graph

9788 Commits

Author SHA1 Message Date
smoogipoo
9036ea92eb Run child updates for nested hitobjects when parent hitobjects are masked 2018-01-10 18:29:46 +09:00
smoogipoo
f71d086a41 Fix post-merge issues 2018-01-10 18:08:43 +09:00
smoogipoo
1c412e233a Update submodules 2018-01-10 18:04:12 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09: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
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
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
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
Dean Herbert
8fe319286f
Merge branch 'master' into fix-dotsettings-file 2018-01-08 20:18:24 +09:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
Dean Herbert
bf98c16595
Merge pull request #1865 from Aergwyn/improve-hidden
Minor standard hidden improvements
2018-01-08 09:35:10 +09:00
Aergwyn
54c0197eb0 remove early fadeout of sliderball on hidden
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42 remove unnecessary change of spinner end sequence
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
smoogipoo
4ab3b0d76b Implement local scrolling hit object container 2018-01-07 13:24:09 +09:00
smoogipoo
117ab8a26d Split out scrolling algorithm 2018-01-07 13:23:16 +09:00
Dean Herbert
f660eff4d4 FIx incorrect licence header template 2018-01-07 12:02:42 +09:00
smoogipoo
2d345b2f80 Fix mania hold note tick positioning 2018-01-07 11:43:31 +09:00
Dean Herbert
8a4ab6c03d
Merge pull request #1862 from FreezyLemon/fix-mania-hitobject-test
Fix TestCaseManiaHitObjects exception on load
2018-01-07 11:37:45 +09:00
smoogipoo
98fd4f6ff2 Fix up precision + sizing issues 2018-01-07 11:33:59 +09:00
FreezyLemon
47f5b23dcf fix child size == 0 exception 2018-01-07 00:53:44 +01:00
Aergwyn
140a09ba3d fix requests not cancelling properly + formatting 2018-01-05 19:13:54 +01:00
smoogipoo
7526225282 Use DP for most of the code to avoid unnecessary computations 2018-01-05 20:56:21 +09:00
Dean Herbert
35297f000c
Merge pull request #1857 from peppy/udpate-licence-header
Update licence headers
2018-01-05 20:46:55 +09:00