1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 22:27:39 +08:00
Commit Graph

12048 Commits

Author SHA1 Message Date
Dean Herbert
2e9c91c32f
Merge branch 'master' into use-bindable-transforms 2018-05-10 11:45:29 +08:00
Dean Herbert
aa69e0ef12
Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change
Fix beatmap/ruleset being changeable while in the editor
2018-05-10 11:45:23 +08:00
Dean Herbert
fff34be814
Merge branch 'master' into fix-editor-beatmap-change 2018-05-10 11:37:36 +08:00
Dean Herbert
e44faebea6
Merge pull request #2501 from smoogipoo/remove-explicit-clock
Remove explicit clock in TestCaseBreakOverlay
2018-05-10 11:15:06 +08:00
Dean Herbert
5f5e97220d
Merge branch 'master' into remove-explicit-clock 2018-05-10 11:06:49 +08:00
Dan Balasescu
3c689359af
Merge pull request #2471 from UselessToucan/change_ruleset_via_direct_while_on_scorescreen
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
2018-05-09 14:09:54 +09:00
Dan Balasescu
929e8f16df
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen 2018-05-09 14:02:20 +09:00
smoogipoo
c7bc79bce3 Remove explicit clock in TestCaseBreakOverlay 2018-05-09 12:40:04 +09:00
Dan Balasescu
96baee4e5c
Merge pull request #2498 from peppy/update-cfs
Update CodeFileSanity
2018-05-08 10:24:21 +09:00
Dean Herbert
c2979a5c48 Update CodeFileSanity 2018-05-07 22:08:45 +09:00
smoogipoo
674e45d49b Fix beatmap/ruleset being changeable while in the editor 2018-05-07 16:32:15 +09:00
smoogipoo
fbd7ccc03f Make BeatmapInfoWedge display properly for converts 2018-05-07 15:51:08 +09:00
smoogipoo
09c70a9362 Add info label tests to TestCaseBeatmapInfoWedge 2018-05-07 15:51:08 +09:00
smoogipoo
6a9f139d9b Instantiate convertible hitobjects for beatmap info wedge 2018-05-07 15:51:08 +09:00
smoogipoo
251bdfdee8 Simplify statistics in osu ruleset 2018-05-07 15:51:08 +09:00
smoogipoo
7eb64ab590 Remove object counts from mania/taiko/catch 2018-05-07 15:51:08 +09:00
smoogipoo
b9e4b59e46 Actually construct catch beatmaps 2018-05-07 15:51:08 +09:00
smoogipoo
5f74dc2c17 Simplify osu-ruleset statistics 2018-05-07 15:51:08 +09:00
smoogipoo
b737644208 Add mania statistics 2018-05-07 15:51:08 +09:00
smoogipoo
8a4717d2e9 Add catch statistics 2018-05-07 15:51:08 +09:00
smoogipoo
accffda532 Add taiko statistics 2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo
30a3f4f29f Fix not being able to convert beatmaps with 0 hitobjects 2018-05-07 15:27:45 +09:00
Dean Herbert
1be1b10059
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen 2018-05-07 13:32:19 +08:00
smoogipoo
68441f1ef0 Output ruleset instantiation info 2018-05-07 14:28:30 +09:00
smoogipoo
6867886f4c Give conversion-tested beatmaps a ruleset 2018-05-07 14:04:37 +09:00
smoogipoo
7ee8228a37 Fix testcases 2018-05-07 13:28:01 +09:00
smoogipoo
ad2c2a5fe6 Restore star difficulty calculation 2018-05-07 12:25:21 +09:00
smoogipoo
268c14813b Fix resharper warnings 2018-05-07 11:38:41 +09:00
smoogipoo
e20323b5f6 Trim whitespace 2018-05-07 11:23:29 +09:00
smoogipoo
794418432f Fix incorrect method name 2018-05-07 11:22:25 +09:00
smoogipoo
db3e48c194 Rename GetBeatmap() to GetPlayableBeatmap() 2018-05-07 10:40:30 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
7e83c75888 Add xmldoc 2018-05-07 10:23:32 +09:00
smoogipoo
b68ee39136 Reword beatmap conversion error 2018-05-07 10:18:47 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
27c8591d48 Fix reference to old name 2018-05-07 10:07:50 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
20509b1cc2 Fix non-IBeatmap usage 2018-05-07 09:59:45 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
smoogipoo
f3aa9269ff Fix mania-specific beatmap conversion 2018-05-07 09:17:12 +09:00
Roman Kapustin
33e2b91ccc Decouple FilterControl.Ruleset from the game-wide ruleset bindable 2018-05-03 22:59:49 +03:00
Santeri Nogelainen
89db7f81cb Selecting a mod now triggers on mouseup 2018-05-02 17:11:55 +03:00
smoogipoo
2d6b2d10f7 Use bindable transforms 2018-05-02 18:26:23 +09:00
Dean Herbert
420e50b6da
Merge pull request #2479 from peppy/add-net471-dep
Add squirrel dependency on net471
2018-05-02 17:00:02 +08:00
Dean Herbert
6ecb09431f Update squirrel path 2018-05-02 16:37:44 +08:00
Dean Herbert
e92166b40f Update csproj defaults 2018-05-02 16:33:48 +08:00
Dean Herbert
b37acf7510 Update squirrel version for net471 prereq support 2018-05-02 16:23:48 +08:00
Dean Herbert
8b99a3b8e6 Add squirrel dependency on net471 2018-05-02 16:23:48 +08:00
Dean Herbert
036e62e2b1
Merge pull request #2481 from smoogipoo/revert-useroverlay-change
Revert breaking UserProfileOverlay change
2018-05-02 16:19:37 +08:00