Andrei Zavatski
|
b35b3484ca
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
|
2019-11-06 12:46:28 +03:00 |
|
Andrei Zavatski
|
4330507da8
|
Use api.IsLoggedIn
|
2019-11-06 12:46:25 +03:00 |
|
Dean Herbert
|
46a0fbe561
|
Share framework file-exclusion function (#6668)
Share framework file-exclusion function
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-11-06 18:40:22 +09:00 |
|
Dean Herbert
|
a6d000baa2
|
Fix audio preview muting game audio indefinitely when beatmap p… (#6738)
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-11-06 18:34:17 +09:00 |
|
Dean Herbert
|
0df0260dd9
|
Disallow selections to be moved outside of the playfield (#6742)
Disallow selections to be moved outside of the playfield
|
2019-11-06 18:29:06 +09:00 |
|
Andrei Zavatski
|
1f3b209a6c
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
|
2019-11-06 12:26:41 +03:00 |
|
Dean Herbert
|
813d3a0bfa
|
Fix adjustments not being removed correctly on retry from pause (#6728)
Fix adjustments not being removed correctly on retry from pause
|
2019-11-06 17:54:20 +09:00 |
|
Dan Balasescu
|
402eedce03
|
Merge branch 'master' into reuse-framework-exclusuion-function
|
2019-11-06 17:48:26 +09:00 |
|
Dan Balasescu
|
1e52c83804
|
Merge branch 'master' into fix-preview-not-stopping
|
2019-11-06 17:47:54 +09:00 |
|
Dean Herbert
|
09e9ef0e4b
|
Add background colour to music player ProgressBar (#6741)
Add background colour to music player ProgressBar
|
2019-11-06 17:44:08 +09:00 |
|
smoogipoo
|
2c1bfd62ef
|
Disallow selections to be moved outside of the playfield
|
2019-11-06 17:28:04 +09:00 |
|
Dean Herbert
|
c631a05a44
|
Add ability to edit individual ControlPoint attributes from tim… (#6638)
Add ability to edit individual ControlPoint attributes from timing screen
|
2019-11-06 17:24:51 +09:00 |
|
Dean Herbert
|
a2963b66f6
|
Limit distance snap between two adjacent hit objects (#6740)
Limit distance snap between two adjacent hit objects
|
2019-11-06 17:18:00 +09:00 |
|
Dan Balasescu
|
ff6bfc453b
|
Merge pull request #6718 from peppy/update-framework
Update framework
|
2019-11-06 16:38:15 +09:00 |
|
Dean Herbert
|
23eab68c72
|
Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2
|
2019-11-06 16:22:55 +09:00 |
|
Ganendra Afrasya
|
02c21a1379
|
Make progress bar hoverable
|
2019-11-06 14:11:47 +07:00 |
|
Ganendra Afrasya
|
d985d04857
|
Add background colour to music player ProgressBar
|
2019-11-06 14:07:34 +07:00 |
|
Dean Herbert
|
c1a6cb1def
|
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
|
2019-11-06 15:58:47 +09:00 |
|
smoogipoo
|
020b08b450
|
Initial implementation of limited distance snap
|
2019-11-06 15:27:48 +09:00 |
|
smoogipoo
|
0b09fb293e
|
Fix background being coloured
|
2019-11-06 15:16:00 +09:00 |
|
Dean Herbert
|
a3d8738cab
|
Merge branch 'master' into vote-pill-fix
|
2019-11-06 14:52:06 +09:00 |
|
Dean Herbert
|
ebfb5d050d
|
Move section update code to abstract method to avoid incorrect BindValue usage
|
2019-11-06 14:36:43 +09:00 |
|
Dean Herbert
|
4ce3450cfc
|
Move button implementation to OsuButton
|
2019-11-06 14:08:52 +09:00 |
|
smoogipoo
|
322a1f0a86
|
Fix potential nullref
|
2019-11-06 12:45:35 +09:00 |
|
smoogipoo
|
7cd4cb8a93
|
Rename selectedPoints to selectedGroup
|
2019-11-06 12:32:12 +09:00 |
|
smoogipoo
|
9dd7f997d2
|
Reoder SampleSection to match others
|
2019-11-06 12:17:18 +09:00 |
|
smoogipoo
|
f20bfe7a55
|
Fix extra semicolon
|
2019-11-06 12:16:48 +09:00 |
|
Dean Herbert
|
8cf349c1ee
|
Update once more
|
2019-11-06 12:10:53 +09:00 |
|
Dean Herbert
|
b4ae02cc69
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2019-11-06 12:09:51 +09:00 |
|
Dan Balasescu
|
b5a8bbaa60
|
Merge branch 'master' into editor-timing-screen
|
2019-11-06 12:02:00 +09:00 |
|
Dean Herbert
|
cd1dd0f898
|
Fix adjustments not being removed correctly on retry from pause
|
2019-11-06 10:38:04 +09:00 |
|
Dean Herbert
|
52dba69a64
|
Implement slider control point deletion (#6679)
Implement slider control point deletion
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-05 19:15:15 +09:00 |
|
Dean Herbert
|
f0a6fbdeb0
|
Fix selecting underneath selected blueprints (#6719)
Fix selecting underneath selected blueprints
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-05 18:48:46 +09:00 |
|
Dean Herbert
|
3b8dc57ad3
|
Disable input for non-selected blueprints (#6717)
Disable input for non-selected blueprints
|
2019-11-05 18:34:43 +09:00 |
|
Dean Herbert
|
f4b93ec943
|
Add exception when holding control
|
2019-11-05 18:29:08 +09:00 |
|
Dean Herbert
|
f77de7d880
|
Simplify implementation
|
2019-11-05 18:25:38 +09:00 |
|
smoogipoo
|
0db34a47f8
|
Fix selecting underneath selected blueprints
|
2019-11-05 17:28:42 +09:00 |
|
Dean Herbert
|
44d0791676
|
Update button usage
|
2019-11-05 16:26:31 +09:00 |
|
Dan Balasescu
|
0758025b6b
|
Merge branch 'master' into reuse-framework-exclusuion-function
|
2019-11-05 16:18:16 +09:00 |
|
Dean Herbert
|
fe374eabe0
|
Update framework
|
2019-11-05 15:47:01 +09:00 |
|
smoogipoo
|
7c20a589f2
|
Remove unused usings
|
2019-11-05 13:56:21 +09:00 |
|
smoogipoo
|
c8beb5296f
|
Use PlatformAction.Delete instead of Delete key
|
2019-11-05 13:26:44 +09:00 |
|
Dan Balasescu
|
23ad516348
|
Merge branch 'master' into game-handles-links
|
2019-11-05 12:33:32 +09:00 |
|
smoogipoo
|
64d900b387
|
Disable input for non-selected blueprints
|
2019-11-05 11:33:37 +09:00 |
|
Dean Herbert
|
eb1ec78b33
|
Disable retry hotkey overlay when viewing results from leaderbo… (#6702)
Disable retry hotkey overlay when viewing results from leaderboard
|
2019-11-04 12:34:18 +09:00 |
|
Bartłomiej Dach
|
539f8ad6dd
|
Remove overlay when viewing leaderboard scores
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
|
2019-11-04 01:57:31 +01:00 |
|
Dean Herbert
|
1a7b803d4d
|
Change colour to green to match web implementation
|
2019-11-04 08:39:51 +09:00 |
|
Dean Herbert
|
c71a082ffe
|
Merge branch 'master' into user-score-highlight
|
2019-11-04 08:18:18 +09:00 |
|
Dean Herbert
|
1155aacd90
|
Update sliders when control points change (#6680)
Update sliders when control points change
|
2019-11-03 19:05:48 +09:00 |
|
Dean Herbert
|
6bc62385b6
|
Merge branch 'master' into slider-controlpoint-selection
|
2019-11-03 15:28:50 +09:00 |
|