RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,247 Commits 4 Branches 650 Tags 351 MiB
Commit Graph

23247 Commits

Author SHA1 Message Date
Ganendra Afrasya d985d04857 Add background colour to music player ProgressBar 2019-11-06 14:07:34 +07: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
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
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
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 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
Dean Herbert f849926049
Merge branch 'master' into slider-controlpoint-deletion 2019-11-03 19:05:17 +09:00
Dean Herbert 92ed6d16d7
Implement slider control point selection (#6678) 
Implement slider control point selection

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-03 19:04:32 +09:00
Dean Herbert 4dbdfcdd3c Change control to toggle rather than always select 2019-11-03 18:41:29 +09:00
Dean Herbert 6bc62385b6
Merge branch 'master' into slider-controlpoint-selection 2019-11-03 15:28:50 +09:00
Dean Herbert fe3583b6ee Move schedule call 2019-11-03 13:16:54 +09:00
Dean Herbert 5127b52c25 Merge remote-tracking branch 'upstream/master' into game-handles-links 2019-11-03 13:04:18 +09:00
Dean Herbert cacb036c79
Add retry button and hotkey support to results screen (#6691) 
Add retry button and hotkey support to results screen

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-11-02 21:41:00 +09:00
Dean Herbert 6dde755ef2
Merge branch 'master' into add-retry-button 2019-11-02 21:23:16 +09:00
Dean Herbert fd13f0bc55
Move ReplayDownloadButton to correct namespace (#6689) 
Move ReplayDownloadButton to correct namespace
 2019-11-02 21:22:23 +09:00
Dean Herbert 551032803d
Fix GameplayClockContainer operating on beatmap's track after s… (#6688) 
Fix GameplayClockContainer operating on beatmap's track after screen exited
 2019-11-02 21:22:13 +09:00