1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 20:07:24 +08:00
Commit Graph

12018 Commits

Author SHA1 Message Date
smoogipoo
8ca67f63ec Fix score statistics not being read 2018-05-11 21:49:06 +09:00
Dean Herbert
ac514c5d20
Merge pull request #2492 from smoogipoo/ruleset-beatmap-statistics
Add mode-specific beatmap statistics
2018-05-11 17:54:15 +09:00
Dean Herbert
c19432dc6d
Merge branch 'master' into ruleset-beatmap-statistics 2018-05-11 17:37:50 +09:00
Dean Herbert
ed7d6f9268
Merge pull request #2518 from DrabWeb/breadcrumb-design-adjustments
BreadcrumbControl design adjustments
2018-05-11 17:37:06 +09:00
Dean Herbert
2afc0c1abd
Merge branch 'master' into breadcrumb-design-adjustments 2018-05-11 17:19:26 +09:00
Dean Herbert
3ddeeadb8b
Merge pull request #2519 from DrabWeb/multiplayer-folder-restructure
Multiplayer folder restructure
2018-05-11 16:31:00 +09:00
smoogipoo
fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
smoogipoo
816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
smoogipoo
2bab08c437 Fix post-merge errors 2018-05-11 14:08:17 +09:00
smoogipoo
73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
DrabWeb
a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
DrabWeb
bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
DrabWeb
2d206d258a Move multiplayer screen components to osu.Game/Screens/Multi/Components 2018-05-10 20:44:24 -03:00
DrabWeb
c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
DrabWeb
ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
Dean Herbert
0afe33d32f
Merge pull request #2491 from smoogipoo/beatmap-conversion-rework
Rework beatmap conversion process to use IBeatmap
2018-05-10 20:08:37 +08:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework 2018-05-10 19:10:07 +08:00
Dean Herbert
7fd38e4780
Merge pull request #2490 from smoogipoo/i-beatmap
Migrate the game to use an IBeatmap interface
2018-05-10 19:07:17 +08:00
Dean Herbert
9e26bcd571 Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap 2018-05-10 19:51:52 +09:00
Dean Herbert
40c1b24b3d Move IBeatmap to its own file 2018-05-10 19:51:40 +09:00
Dean Herbert
2bb671cf9e
Merge pull request #2516 from peppy/update-framework
Update framework
2018-05-10 17:18:39 +08:00
Dean Herbert
c7443e6b3b Update framework 2018-05-10 17:52:48 +09:00
Dean Herbert
3504f7393f
Merge pull request #2482 from smoogipoo/use-bindable-transforms
Use bindable transforms
2018-05-10 13:50:13 +08:00
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