8e784d9104
Merge branch 'master' into fix-conversion-hitwindows
2018-05-18 11:59:16 +09:00
cebc0fcc0c
Merge pull request #2568 from smoogipoo/fix-taiko-slider-multiplier
...
Fix taiko slider multiplier being applied twice
2018-05-18 11:48:06 +09:00
14d67e0b1e
Merge branch 'master' into fix-taiko-slider-multiplier
2018-05-18 11:39:24 +09:00
ce9bfcc367
Merge pull request #2572 from smoogipoo/taiko-performance-calculator
...
Implement taiko performance calculation
2018-05-18 11:38:07 +09:00
e11a69e6ab
Merge branch 'master' into taiko-performance-calculator
2018-05-18 10:38:57 +09:00
17d1759c37
Get rid of multiple blank lines in a row
2018-05-18 01:01:54 +03:00
81d7e8a393
Resolve merge conflict
2018-05-18 00:25:47 +03:00
6f94c110a5
Fix submodule conflict
2018-05-17 23:09:13 +03:00
2492e34d3f
resolving codefactor styling issues
2018-05-17 19:44:09 +02:00
6a1abf4084
Merge branch 'master' into osu-hd-setting
2018-05-17 19:39:17 +02:00
f755ea534d
Merge pull request #2560 from DrabWeb/multiplayer-base-screen
...
Multiplayer base screen
2018-05-17 18:33:23 +09:00
ebfbe58abb
Move Header breadcrumbs to a subclass.
2018-05-17 06:19:55 -03:00
3091d3a014
Implement the taiko performance calculator
2018-05-17 17:56:44 +09:00
450d54eea9
Fix taiko difficulty calculator never considering mods
2018-05-17 17:56:37 +09:00
d20011ba58
Fix an endless feedback loop
2018-05-17 17:56:29 +09:00
7c9d3c9742
Merge branch 'master' into multiplayer-base-screen
2018-05-17 17:41:31 +09:00
cc24d4602b
Merge pull request #2570 from smoogipoo/fix-incorrect-namespace
...
Fix incorrect namespace of OsuPerformanceCalculator
2018-05-17 17:31:15 +09:00
eba1d309b6
Fix incorrect namespace of OsuPerformanceCalculator
2018-05-17 16:58:22 +09:00
532d65f6e8
Re-enable basic taiko beatmap conversion tests
2018-05-17 15:17:47 +09:00
b9ed976954
Fix taiko slider multiplier being applied twice
2018-05-17 14:44:30 +09:00
43cdbec0a3
Fix hold note hitwindow lenience
2018-05-17 13:59:04 +09:00
9e7728d6b3
Merge pull request #2566 from smoogipoo/beatmap-parsing-performance
...
Speed up beatmap parsing and conversion
2018-05-17 13:59:04 +09:00
1b64f86011
Merge branch 'master' into ParallaxContainerImprovement
2018-05-17 06:53:16 +02:00
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
d36c2686c9
Merge branch 'master' into beatmap-parsing-performance
2018-05-17 13:28:35 +09:00
0d9518c0ae
Merge pull request #2564 from smoogipoo/mania-performance-improvements
...
Fix hold notes never dying
2018-05-17 13:26:11 +09:00
397d93660a
Don't deep-clone beatmapinfo/control points
2018-05-17 13:17:33 +09:00
97e179b390
Merge branch 'master' into mania-performance-improvements
2018-05-17 12:54:04 +09:00
650d40f57f
Merge https://github.com/ppy/osu into multiplayer-base-screen
2018-05-17 00:34:40 -03:00
c67f372560
Don't create nested hitobjects unless absolutely required
2018-05-17 12:29:33 +09:00
5647e53f03
Merge pull request #2521 from DrabWeb/screen-breadcrumbs
...
Screen breadcrumbs
2018-05-17 12:19:47 +09:00
98159c3ab7
Merge branch 'master' into ParallaxContainerImprovement
2018-05-16 17:46:17 +02:00
2fc1939d65
Fix hold notes never dying
2018-05-16 19:43:01 +09:00
47cd9065bf
Merge branch 'master' into screen-breadcrumbs
2018-05-16 18:42:17 +09:00
7765a1aa3a
Merge pull request #2563 from smoogipoo/fix-hitobject-order
...
Use a stable sort for hitobjects
2018-05-16 18:41:47 +09:00
3f365c6621
Merge branch 'master' into editor-timeline-rework
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Compose.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
2018-05-16 18:04:24 +09:00
5aadc35a25
Stably-sort difficulty hitobjects to prevent future issues
2018-05-16 14:47:50 +09:00
0f817d18d4
Add explanatory comment
2018-05-16 13:59:51 +09:00
ad81357fb5
Merge branch 'master' into fix-hitobject-order
2018-05-16 13:33:27 +09:00
452564d0e0
Merge branch 'master' into screen-breadcrumbs
2018-05-16 13:31:38 +09:00
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
cf44357bdb
Use a stable sort for hitobjects
2018-05-16 13:30:48 +09:00
095f937ddd
Merge branch 'master' into fix-conversion-tests
2018-05-16 13:19:38 +09:00
2297a53342
Merge pull request #2561 from smoogipoo/hitresult-namings
...
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 13:18:50 +09:00
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
c1d9fcc140
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 12:46:31 +09:00
edbb3a5a57
Rename to use new hit result namings
2018-05-16 12:44:11 +09:00
8e053f2166
Add multiplayer screen test steps.
2018-05-15 21:20:34 -03:00
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
d2b2d3e2e0
Use the absolute value of ParallaxAmount to make sure we're not scaling things down when using a negative value for the Parallax (moving against the cursor instead of with it)
2018-05-16 01:38:46 +02:00
