1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 08:12:55 +08:00
Commit Graph

12775 Commits

Author SHA1 Message Date
Dean Herbert
1eb465b4ee
Merge pull request #2532 from ocboogie/ruleset-keybindings
Add global key bindings for changing current ruleset
2018-05-21 14:59:16 +09:00
Dean Herbert
c75ef7704a Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings 2018-05-21 14:49:34 +09:00
Dean Herbert
42519e3723 Rewrite code for clarity
This also uses the AvailableRulesets list rather than private IDs
2018-05-21 14:49:26 +09:00
Dean Herbert
dc1027341d
Merge pull request #2594 from Joehuu/drag-clicking
Allow drag clicking footer and filter on song select
2018-05-21 13:33:39 +09:00
Joehu
46c6c1d07e Allow drag clicking footer and filter on song select 2018-05-20 20:25:39 -07:00
Dean Herbert
416356492b
Merge pull request #2522 from DrabWeb/drawable-room-improvements
DrawableRoom improvements
2018-05-21 11:36:12 +09:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
Dean Herbert
9f0cc7683b
Merge branch 'master' into respect-showoverlay-bindable 2018-05-21 04:43:55 +09:00
Dean Herbert
29261e5a6c
Merge pull request #2588 from DrabWeb/room-inspector-improvements
RoomInspector improvements
2018-05-21 04:29:48 +09:00
Dean Herbert
aaca7e92b4 Avoid excessive property lookups 2018-05-21 03:56:59 +09:00
Aergwyn
4d528c4e67 fix VisualTests and Samples still playing 2018-05-20 10:57:15 +02:00
DrabWeb
9cd0ec366e Cleanup. 2018-05-19 02:51:51 -03:00
smoogipoo
1f37dca7b7 Fix HR / EZ being applied twice to AR 2018-05-19 14:47:06 +09:00
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
f50c1c78a2 Update framework 2018-05-18 18:14:12 +09:00
smoogipoo
e6e3758304 Fix HR mod affecting original beatmap difficulty
Fixes #2575.
2018-05-18 18:11:52 +09:00
smoogipoo
757f898718 Add testcase for zoomable scroll container 2018-05-18 17:53:19 +09:00
smoogipoo
82607b3eb3 Expose properties to control zoom 2018-05-18 17:53:09 +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
smoogipoo
bc3d195aa2 Fix line endings 2018-05-18 13:05:58 +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
AlFasGD
6f94c110a5 Fix submodule conflict 2018-05-17 23:09:13 +03:00
Vidalee
2492e34d3f
resolving codefactor styling issues 2018-05-17 19:44:09 +02:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02: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