Dan Balasescu
|
ff6bfc453b
|
Merge pull request #6718 from peppy/update-framework
Update framework
|
2019-11-06 16:38:15 +09:00 |
|
Dan Balasescu
|
e4ad657353
|
Merge pull request #6736 from peppy/fix-tourney-crash
Fix tournament client crashing if beatmap added with an ID of zero
|
2019-11-06 15:42:20 +09:00 |
|
smoogipoo
|
0b09fb293e
|
Fix background being coloured
|
2019-11-06 15:16:00 +09:00 |
|
Dan Balasescu
|
1c1f5abac8
|
Merge branch 'master' into fix-tourney-crash
|
2019-11-06 15:05:35 +09:00 |
|
Dan Balasescu
|
8a83537f7f
|
Merge pull request #6634 from peppy/editor-timing-screen
Add editor timing screen
|
2019-11-06 15:05:22 +09:00 |
|
Dean Herbert
|
5e416bd18d
|
Fix tournament client crashing if beatmap added with an ID of zero
|
2019-11-06 14:47:31 +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
|
55018339c9
|
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.1106.0' into update-framework
|
2019-11-06 12:10:31 +09:00 |
|
Dean Herbert
|
19dd00e8b4
|
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.1106.0' into update-framework
|
2019-11-06 12:10:14 +09:00 |
|
Dean Herbert
|
b4ae02cc69
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2019-11-06 12:09:51 +09:00 |
|
dependabot-preview[bot]
|
1d83f51a80
|
Bump ppy.osu.Framework.Android from 2019.1029.0 to 2019.1106.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.1029.0 to 2019.1106.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1029.0...2019.1106.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-11-06 03:05:05 +00:00 |
|
dependabot-preview[bot]
|
892ef017ef
|
Bump ppy.osu.Framework.iOS from 2019.1029.0 to 2019.1106.0
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.1029.0 to 2019.1106.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1029.0...2019.1106.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-11-06 03:05:03 +00:00 |
|
Dan Balasescu
|
b5a8bbaa60
|
Merge branch 'master' into editor-timing-screen
|
2019-11-06 12:02:00 +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 |
|
Dean Herbert
|
3680b9a380
|
Merge branch 'master' into fix-selection-priority
|
2019-11-05 17:51:30 +09:00 |
|
Dean Herbert
|
86f05154f5
|
Fix slider selection input handled outside path (#6720)
Fix slider selection input handled outside path
|
2019-11-05 17:51:14 +09:00 |
|
smoogipoo
|
d77882c21b
|
Fix slider selection input handled outside path
|
2019-11-05 17:31:52 +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 |
|
Dean Herbert
|
fe374eabe0
|
Update framework
|
2019-11-05 15:47:01 +09:00 |
|
Dean Herbert
|
621f4387c9
|
Improve iOS importing and file system (#5574)
Improve iOS importing and file system
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-11-05 15:12:01 +09:00 |
|
Dan Balasescu
|
7ecd1ea0e9
|
Merge branch 'master' into fix-ios-import
|
2019-11-05 14:51:30 +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 |
|
smoogipoo
|
08bd811326
|
Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
|
2019-11-05 13:07:06 +09:00 |
|
Dan Balasescu
|
af7322a763
|
Merge pull request #6685 from peppy/game-handles-links
Move link handling code to OsuGame
|
2019-11-05 12:51:18 +09:00 |
|
Dan Balasescu
|
23ad516348
|
Merge branch 'master' into game-handles-links
|
2019-11-05 12:33:32 +09:00 |
|
Dan Balasescu
|
48711299f8
|
Merge pull request #6699 from peppy/fix-slider-creation
Fix slider creation regressing with path selection changes
|
2019-11-05 11:56:48 +09:00 |
|
smoogipoo
|
64d900b387
|
Disable input for non-selected blueprints
|
2019-11-05 11:33:37 +09:00 |
|
Dan Balasescu
|
84f0f691d7
|
Merge branch 'master' into fix-slider-creation
|
2019-11-05 11:32:59 +09:00 |
|
Dean Herbert
|
66253a0bd4
|
Handle selection on mouse down instead of click
This is how other elements work, and feels better with drag preselection
|
2019-11-05 02:21:50 +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 |
|
Bartłomiej Dach
|
3ec9580ba8
|
Add test for retry overlay presence
Add visual tests checking presence (or lack thereof) of the
hold-to-retry overlay in the results screen.
|
2019-11-04 01:55:30 +01:00 |
|
Dean Herbert
|
6c74563703
|
Highlight user's top score on beatmap leaderboard (#6693)
Highlight user's top score on beatmap leaderboard
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-04 09:45:38 +09: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
|
bcf8a6d514
|
Fix slider creation regressing with path selection changes
|
2019-11-03 19:59:37 +09:00 |
|
Dean Herbert
|
f69a641d35
|
Merge branch 'master' into slider-controlpoint-deletion
|
2019-11-03 19:32:10 +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 |
|