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

12307 Commits

Author SHA1 Message Date
DrabWeb
136c57b824 Don't set size in ctor. 2018-05-19 02:27:33 -03:00
DrabWeb
ad878003f7 Add null room support to RoomInspector. 2018-05-19 02:23:09 -03:00
DrabWeb
4b2b2086df Create drawable hierarchy for RoomInspector in load, remove display* methods. 2018-05-19 01:26:39 -03:00
Dean Herbert
2938eadefb
Merge pull request #2582 from smoogipoo/fix-hr-application
Fix HR mod affecting original beatmap difficulty
2018-05-18 18:58:58 +09:00
Dean Herbert
33baaf8243 Update framework 2018-05-18 18:44:42 +09:00
Dean Herbert
e5aa1a038e
Merge branch 'master' into fix-hr-application 2018-05-18 18:37:51 +09:00
smoogipoo
e6e3758304 Fix HR mod affecting original beatmap difficulty
Fixes #2575.
2018-05-18 18:11:52 +09:00
Aergwyn
67db539172 prevent Overlays from showing in intro/outro sequences 2018-05-18 08:00:05 +02:00
Dean Herbert
cdd43f7909
Merge pull request #2472 from UselessToucan/back_mouse_button_support
Add ability to bind "back" action; add default mouse binding
2018-05-18 13:53:45 +09:00
Dean Herbert
d75fe4009a Add back action support to settings back button 2018-05-18 13:40:35 +09:00
Dean Herbert
e2389ad7a4 Allow using back button on PlayerLoader and Replay 2018-05-18 13:32:05 +09:00
Dean Herbert
1cda5f4de9
Merge branch 'master' into back_mouse_button_support 2018-05-18 12:55:52 +09:00
Dean Herbert
0ae7387396
Merge pull request #2557 from smoogipoo/mania-performance-calculator
Implement osu!mania performance calculator
2018-05-18 12:43:28 +09:00
Dean Herbert
6c00046835
Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
Dean Herbert
2582bf1440
Merge pull request #2567 from smoogipoo/fix-conversion-hitwindows
Fix converted beatmap hitwindows not working correctly
2018-05-18 12:18:01 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
Dean Herbert
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
Dean Herbert
14d67e0b1e
Merge branch 'master' into fix-taiko-slider-multiplier 2018-05-18 11:39:24 +09:00
Dean Herbert
ce9bfcc367
Merge pull request #2572 from smoogipoo/taiko-performance-calculator
Implement taiko performance calculation
2018-05-18 11:38:07 +09:00
Dean Herbert
e11a69e6ab
Merge branch 'master' into taiko-performance-calculator 2018-05-18 10:38:57 +09:00
Roman Kapustin
17d1759c37 Get rid of multiple blank lines in a row 2018-05-18 01:01:54 +03:00
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