Roman Kapustin
81d7e8a393
Resolve merge conflict
2018-05-18 00:25:47 +03:00
Dean Herbert
f755ea534d
Merge pull request #2560 from DrabWeb/multiplayer-base-screen
...
Multiplayer base screen
2018-05-17 18:33:23 +09:00
DrabWeb
ebfbe58abb
Move Header breadcrumbs to a subclass.
2018-05-17 06:19:55 -03:00
smoogipoo
3091d3a014
Implement the taiko performance calculator
2018-05-17 17:56:44 +09:00
smoogipoo
450d54eea9
Fix taiko difficulty calculator never considering mods
2018-05-17 17:56:37 +09:00
Dean Herbert
d20011ba58
Fix an endless feedback loop
2018-05-17 17:56:29 +09:00
Dean Herbert
7c9d3c9742
Merge branch 'master' into multiplayer-base-screen
2018-05-17 17:41:31 +09:00
Dean Herbert
cc24d4602b
Merge pull request #2570 from smoogipoo/fix-incorrect-namespace
...
Fix incorrect namespace of OsuPerformanceCalculator
2018-05-17 17:31:15 +09:00
smoogipoo
eba1d309b6
Fix incorrect namespace of OsuPerformanceCalculator
2018-05-17 16:58:22 +09:00
smoogipoo
532d65f6e8
Re-enable basic taiko beatmap conversion tests
2018-05-17 15:17:47 +09:00
smoogipoo
b9ed976954
Fix taiko slider multiplier being applied twice
2018-05-17 14:44:30 +09:00
smoogipoo
43cdbec0a3
Fix hold note hitwindow lenience
2018-05-17 13:59:04 +09:00
Dean Herbert
9e7728d6b3
Merge pull request #2566 from smoogipoo/beatmap-parsing-performance
...
Speed up beatmap parsing and conversion
2018-05-17 13:59:04 +09:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
Dean Herbert
d36c2686c9
Merge branch 'master' into beatmap-parsing-performance
2018-05-17 13:28:35 +09:00
Dean Herbert
0d9518c0ae
Merge pull request #2564 from smoogipoo/mania-performance-improvements
...
Fix hold notes never dying
2018-05-17 13:26:11 +09:00
smoogipoo
397d93660a
Don't deep-clone beatmapinfo/control points
2018-05-17 13:17:33 +09:00
Dean Herbert
97e179b390
Merge branch 'master' into mania-performance-improvements
2018-05-17 12:54:04 +09:00
DrabWeb
650d40f57f
Merge https://github.com/ppy/osu into multiplayer-base-screen
2018-05-17 00:34:40 -03:00
smoogipoo
c67f372560
Don't create nested hitobjects unless absolutely required
2018-05-17 12:29:33 +09:00
Dean Herbert
5647e53f03
Merge pull request #2521 from DrabWeb/screen-breadcrumbs
...
Screen breadcrumbs
2018-05-17 12:19:47 +09:00
smoogipoo
2fc1939d65
Fix hold notes never dying
2018-05-16 19:43:01 +09:00
Dean Herbert
47cd9065bf
Merge branch 'master' into screen-breadcrumbs
2018-05-16 18:42:17 +09:00
Dean Herbert
7765a1aa3a
Merge pull request #2563 from smoogipoo/fix-hitobject-order
...
Use a stable sort for hitobjects
2018-05-16 18:41:47 +09:00
smoogipoo
5aadc35a25
Stably-sort difficulty hitobjects to prevent future issues
2018-05-16 14:47:50 +09:00
smoogipoo
0f817d18d4
Add explanatory comment
2018-05-16 13:59:51 +09:00
Dan Balasescu
ad81357fb5
Merge branch 'master' into fix-hitobject-order
2018-05-16 13:33:27 +09:00
Dean Herbert
452564d0e0
Merge branch 'master' into screen-breadcrumbs
2018-05-16 13:31:38 +09:00
Dean Herbert
222307eb8a
Merge pull request #2562 from smoogipoo/fix-conversion-tests
...
Fix conversion tests for ruleset-specific beatmaps not working
2018-05-16 13:31:05 +09:00
smoogipoo
cf44357bdb
Use a stable sort for hitobjects
2018-05-16 13:30:48 +09:00
Dean Herbert
095f937ddd
Merge branch 'master' into fix-conversion-tests
2018-05-16 13:19:38 +09:00
Dean Herbert
2297a53342
Merge pull request #2561 from smoogipoo/hitresult-namings
...
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 13:18:50 +09:00
smoogipoo
8d8b7e6fa2
Fix conversion tests for ruleset-specific beatmaps not working
...
TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...
2018-05-16 13:09:48 +09:00
smoogipoo
c1d9fcc140
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 12:46:31 +09:00
smoogipoo
edbb3a5a57
Rename to use new hit result namings
2018-05-16 12:44:11 +09:00
DrabWeb
8e053f2166
Add multiplayer screen test steps.
2018-05-15 21:20:34 -03:00
DrabWeb
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
DrabWeb
1450bf64f5
Add multiplayer screen header.
2018-05-15 20:34:14 -03:00
DrabWeb
dda253758b
Cleanup test step wording.
2018-05-15 19:56:47 -03:00
DrabWeb
f67ad7b8e8
Add exit test.
2018-05-15 19:52:28 -03:00
DrabWeb
b9d99b5f40
Fix nullref when exiting the last screen.
2018-05-15 19:42:50 -03:00
DrabWeb
c9cf0e6e8f
Merge branch 'screen-breadcrumbs' of https://github.com/DrabWeb/osu into screen-breadcrumbs
2018-05-15 19:29:45 -03:00
smoogipoo
de63a1b578
Remove construction of new ruleset
2018-05-16 01:43:58 +09:00
smoogipoo
ed902d9325
Cleanup
2018-05-16 01:36:28 +09:00
smoogipoo
1fdc77d579
Update with the rebalance changes
2018-05-16 01:34:07 +09:00
smoogipoo
4019683f6c
Implement osu!mania performance calculation
2018-05-16 01:24:53 +09:00
Dean Herbert
c0c449e453
Remove unused using
2018-05-15 22:53:33 +09:00
Dean Herbert
07e00fb7a1
Merge pull request #2556 from smoogipoo/more-diffcalc-improvements
...
Bring osu! difficulty calculation on par with osu!stable
2018-05-15 22:52:43 +09:00
smoogipoo
3f67d04429
Cap CS to 10 also
2018-05-15 21:57:08 +09:00
smoogipoo
cf08293be1
Remove extra newline
2018-05-15 21:49:44 +09:00
