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

23555 Commits

Author SHA1 Message Date
Dean Herbert
f11ad7535d
Merge branch 'master' into rankings-tables 2019-11-13 15:39:13 +09:00
Dan Balasescu
4adf967801
Merge pull request #6416 from EVAST9919/favourite-beatmap
Add API functionality to beatmap favourite button
2019-11-13 13:55:56 +09:00
Dean Herbert
c751328665 Disable button when not logged in 2019-11-13 12:13:33 +09:00
Dean Herbert
f18263aa70 Add tests 2019-11-13 12:09:18 +09:00
Dan Balasescu
de59b00ef9
Merge pull request #6830 from peppy/fix-failing-direct-test
Fix osu!direct test failing
2019-11-13 12:03:01 +09:00
Dean Herbert
3c5008f94c Add test 2019-11-13 11:59:03 +09:00
Dean Herbert
2b8a105ec5 Fix osu!direct test fail
Unsure how this occurred only now; may warrant further investigation.
2019-11-13 11:49:36 +09:00
Andrei Zavatski
3903e59f2f Add null check for notification overlay 2019-11-13 00:01:13 +03:00
Andrei Zavatski
dfd5c88075 Typo fix 2019-11-13 00:00:08 +03:00
Andrei Zavatski
cb8eaaf072 Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap 2019-11-12 23:59:58 +03:00
Dean Herbert
70a02d27a9 Update solution paths 2019-11-12 22:53:01 +09:00
Dean Herbert
da819261e0 Shrink and darken loading layer to better suit button 2019-11-12 21:38:16 +09:00
Dean Herbert
5110ae82a1 Tidy up implementation 2019-11-12 21:38:08 +09:00
Dean Herbert
61464c5c89 Fix potential nullref in unrelated test 2019-11-12 21:27:15 +09:00
Dean Herbert
58df6930b2 Get error message from server 2019-11-12 19:34:20 +09:00
Dean Herbert
f04d7f733f Merge remote-tracking branch 'upstream/master' into favourite-beatmap 2019-11-12 19:19:29 +09:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables 2019-11-12 18:59:43 +09:00
Dean Herbert
574de39b0d
Merge pull request #6818 from smoogipoo/slider-controlpoint-addition
Implement slider control point additions
2019-11-12 18:22:09 +09:00
Dean Herbert
4b66ce0c52
Merge branch 'master' into slider-controlpoint-addition 2019-11-12 18:13:27 +09:00
Dean Herbert
dd196385cb
Add Ctrl+A to select all and Escape to deselect all (#6803)
Add Ctrl+A to select all and Escape to deselect all

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 18:10:45 +09:00
Dean Herbert
9223a00396
Add delete option to the right-click menu (#6770)
Add delete option to the right-click menu

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 18:00:08 +09:00
Dean Herbert
cdd87a6903
Merge branch 'master' into delete-selection 2019-11-12 17:59:43 +09:00
Dean Herbert
2066da6c3c
Lookup tournament player statistics for the correct ruleset (#6807)
Lookup tournament player statistics for the correct ruleset
2019-11-12 17:53:39 +09:00
Dean Herbert
46d02d9077 Update framework 2019-11-12 17:37:01 +09:00
Dean Herbert
faa5997b48
Move scaling container to OsuGame so OsuGameBase doesn't apply… (#6804)
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
2019-11-12 16:40:49 +09:00
Dean Herbert
0113ab5e56
Add local preserving container to OsuTestScene to ensure correc… (#6805)
Add local preserving container to OsuTestScene to ensure correct test dimensions
2019-11-12 16:40:40 +09:00
Dean Herbert
3ab332e60b
Implement hitobject sound adjustment (#6762)
Implement hitobject sound adjustment

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 16:40:15 +09:00
Dean Herbert
e32f88c770
Fix home button not closing login and now playing overlays (#6758)
Fix home button not closing login and now playing overlays

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 15:40:28 +09:00
Dean Herbert
a442e363b8
Fix preview track manager allowing playback of multiple tracks (#6768)
Fix preview track manager allowing playback of multiple tracks

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 15:40:05 +09:00
Dean Herbert
47be20fa37 Private set on track for safety 2019-11-12 15:13:47 +09:00
Dean Herbert
712a2f6918 Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks 2019-11-12 15:10:42 +09:00
smoogipoo
a0884fe9d4 Fix being able to add while not selected 2019-11-12 15:07:54 +09:00
Dean Herbert
35351d7f7c Use variable instead of duplicated list 2019-11-12 15:04:51 +09:00
Dean Herbert
25eb964290 Simplify overlay adding logic 2019-11-12 15:03:58 +09:00
smoogipoo
93d8cd38ca Implement addition via ctrl+click 2019-11-12 15:02:27 +09:00
smoogipoo
407ca41ba4 Simplify using existing tools 2019-11-12 15:02:27 +09:00
smoogipoo
316dcae614 Use squared distance 2019-11-12 15:02:27 +09:00
smoogipoo
13b11996e0 Improve closest segment algorithm 2019-11-12 15:02:27 +09:00
smoogipoo
10fd5ef5a7 Merge context menus 2019-11-12 15:02:27 +09:00
smoogipoo
461f76926f Add right-click menu to support control point addition 2019-11-12 15:02:01 +09:00
Dean Herbert
b4525c1f6e Fix right clicking to select not showing context menu 2019-11-12 14:42:30 +09:00
smoogipoo
3f8928ca25 Suppress warnings 2019-11-12 13:41:54 +09:00
smoogipoo
ed11c72d0b Merge remote-tracking branch 'origin/master' into selection-hitsound-addition 2019-11-12 13:40:25 +09:00
smoogipoo
9f1d490ac9 Only handle selection input on blueprints 2019-11-12 12:18:24 +09:00
Dean Herbert
e28ddec8d6
Merge branch 'master' into fix-home-not-closing-all-overlays 2019-11-12 12:05:19 +09:00
Dean Herbert
46971e9aef
Fix mod section overflowing mod select overlay at higher ui sca… (#6700)
Fix mod section overflowing mod select overlay at higher ui scale

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 11:54:32 +09:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow 2019-11-12 11:35:01 +09:00
Dean Herbert
2f8768a4b1 Move LabelledDropdown local to usage 2019-11-12 11:04:49 +09:00
Dean Herbert
bedd136c81 Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset 2019-11-12 11:02:36 +09:00
Dean Herbert
a43b0ee01b Apply naming and styling changes 2019-11-12 10:45:46 +09:00