Commit Graph

14478 Commits

Author SHA1 Message Date
c48c62ea04 Merge branch 'master' into player_loader_input_toggles 2018-05-21 16:20:08 +09:00
9e17eb2342 Reword settings text to be ruleset agnostic 2018-05-21 16:03:08 +09:00
5ec349de78 Reorder methods and remove useless comments 2018-05-21 15:59:33 +09:00
f53164843d Reduce spacing changes 2018-05-21 15:56:02 +09:00
cea935ea40 Merge branch 'master' into osu-hd-setting 2018-05-21 15:21:09 +09:00
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
4784538d73 Fixing minor bugs 2018-05-21 13:53:48 +08:00
c75ef7704a Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings 2018-05-21 14:49:34 +09:00
42519e3723 Rewrite code for clarity
This also uses the AvailableRulesets list rather than private IDs
2018-05-21 14:49:26 +09:00
193a298601 Fixing minor bugs 2018-05-21 13:36:57 +08:00
6d71f7f220 Minor fixes 2018-05-21 13:35:02 +08:00
2e5bc4323a Fixing null reference exception bugs 2018-05-21 13:31:00 +08:00
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
46c6c1d07e Allow drag clicking footer and filter on song select 2018-05-20 20:25:39 -07:00
871743204b Fixing parameters naming 2018-05-21 10:41:58 +08:00
68a929eb0c Fixing parameters naming 2018-05-21 10:39:16 +08:00
416356492b Merge pull request #2522 from DrabWeb/drawable-room-improvements
DrawableRoom improvements
2018-05-21 11:36:12 +09:00
886be8ce1f Adding lisence header 2018-05-21 10:16:32 +08:00
0405383e4e Fixing code style 2018-05-21 10:12:18 +08:00
92668f07e0 Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
44fd4b95bd We need DistanceToHyperDash for star rating calculation 2018-05-21 09:58:46 +08:00
0ef718a09e Fixes on categoryDifficulty 2018-05-21 09:55:07 +08:00
6bf5ea73d5 Fix CatcherWidth 2018-05-21 09:53:20 +08:00
79c64d16e4 Realization on Catch Star Rating 2018-05-21 09:49:23 +08:00
9f0cc7683b Merge branch 'master' into respect-showoverlay-bindable 2018-05-21 04:43:55 +09:00
29261e5a6c Merge pull request #2588 from DrabWeb/room-inspector-improvements
RoomInspector improvements
2018-05-21 04:29:48 +09:00
aaca7e92b4 Avoid excessive property lookups 2018-05-21 03:56:59 +09:00
4d528c4e67 fix VisualTests and Samples still playing 2018-05-20 10:57:15 +02:00
9cd0ec366e Cleanup. 2018-05-19 02:51:51 -03:00
1f37dca7b7 Fix HR / EZ being applied twice to AR 2018-05-19 14:47:06 +09:00
136c57b824 Don't set size in ctor. 2018-05-19 02:27:33 -03:00
ad878003f7 Add null room support to RoomInspector. 2018-05-19 02:23:09 -03:00
4b2b2086df Create drawable hierarchy for RoomInspector in load, remove display* methods. 2018-05-19 01:26:39 -03:00
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
33baaf8243 Update framework 2018-05-18 18:44:42 +09:00
e5aa1a038e Merge branch 'master' into fix-hr-application 2018-05-18 18:37:51 +09:00
f50c1c78a2 Update framework 2018-05-18 18:14:12 +09:00
e6e3758304 Fix HR mod affecting original beatmap difficulty
Fixes #2575.
2018-05-18 18:11:52 +09:00
757f898718 Add testcase for zoomable scroll container 2018-05-18 17:53:19 +09:00
82607b3eb3 Expose properties to control zoom 2018-05-18 17:53:09 +09:00
5e0bbe7d0a Merge branch 'master' into master 2018-05-18 10:19:16 +02:00
67db539172 prevent Overlays from showing in intro/outro sequences 2018-05-18 08:00:05 +02:00
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
d75fe4009a Add back action support to settings back button 2018-05-18 13:40:35 +09:00
e2389ad7a4 Allow using back button on PlayerLoader and Replay 2018-05-18 13:32:05 +09:00
bc3d195aa2 Fix line endings 2018-05-18 13:05:58 +09:00
1cda5f4de9 Merge branch 'master' into back_mouse_button_support 2018-05-18 12:55:52 +09:00
0ae7387396 Merge pull request #2557 from smoogipoo/mania-performance-calculator
Implement osu!mania performance calculator
2018-05-18 12:43:28 +09:00
6c00046835 Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
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