Dean Herbert
|
23eab68c72
|
Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2
|
2019-11-06 16:22:55 +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
|
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 |
|
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 |
|
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
|
c71a082ffe
|
Merge branch 'master' into user-score-highlight
|
2019-11-04 08:18:18 +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
|
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 |
|
Dan Balasescu
|
8a5d3ab40a
|
Merge branch 'master' into add-retry-button
|
2019-11-02 10:51:14 +09:00 |
|
Dan Balasescu
|
5be7d439ae
|
Add null check for nullable dependency
|
2019-11-02 10:32:23 +09:00 |
|
Ganendra Afrasya
|
8da15f6897
|
Fix all score are highlighted on local scope
|
2019-11-01 23:19:15 +07:00 |
|
Ganendra Afrasya
|
ce3b34a768
|
Fix UserTopScoreContainer is also tinted
|
2019-11-01 23:00:55 +07:00 |
|
Dan Balasescu
|
036e67bbc2
|
Merge pull request #6676 from peppy/fix-multi-logout-crash
Fix multi logout crash
|
2019-11-01 17:13:16 +09:00 |
|
Dean Herbert
|
156d0ae9b9
|
Remove braces
Co-Authored-By: Salman Ahmed <email@iisalman.me>
|
2019-11-01 16:08:44 +09:00 |
|
Dean Herbert
|
daa0ebe2b5
|
Add xmldoc
|
2019-11-01 15:51:45 +09:00 |
|
Dean Herbert
|
14453da1d2
|
Centralise MakeCurrent call
|
2019-11-01 15:51:10 +09:00 |
|
Dean Herbert
|
c532f77657
|
Add hold-to-retry support to results
|
2019-11-01 15:49:42 +09:00 |
|
Dean Herbert
|
84d17f3702
|
Add retry button
|
2019-11-01 15:41:51 +09:00 |
|
Dean Herbert
|
14fec6f1f3
|
Move ReplayDownloadButton to correct namespace
|
2019-11-01 15:06:36 +09:00 |
|
Dean Herbert
|
dcc8f6e827
|
Better group cancel conditional
|
2019-11-01 14:43:52 +09:00 |
|
Dean Herbert
|
d089e47a56
|
Merge branch 'master' into master
|
2019-11-01 14:15:57 +09:00 |
|
Dean Herbert
|
ac02bb005d
|
Fix GameplayClockContainer operating on beatmap's track after scren exited
|
2019-11-01 14:11:18 +09:00 |
|
Dean Herbert
|
898520935e
|
Move link handling code to OsuGame
This allows for future calls from arguments / associations
|
2019-11-01 11:40:51 +09:00 |
|
Dean Herbert
|
5b405abc52
|
Schedule forcefullyExit call for safety
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
|
2019-10-31 13:43:25 +09:00 |
|
Dean Herbert
|
32dabf80a6
|
Ensure forceful exit completely exits from mutliplayer
Previously it may have gotten blocked by being in a sub screen.
|
2019-10-31 13:42:28 +09:00 |
|
Dean Herbert
|
5b5703544b
|
Fix crash when quickly exiting multiplayer after joining a room (#6666)
Fix crash when quickly exiting multiplayer after joining a room
|
2019-10-31 13:15:46 +09:00 |
|
Dean Herbert
|
7b67701e57
|
Merge branch 'master' into editor-timing-screen
|
2019-10-30 19:27:24 +09:00 |
|
Dean Herbert
|
7f2916454d
|
Simplify EditorClock.Seek method
|
2019-10-30 19:09:46 +09:00 |
|
Dean Herbert
|
93076ad6a1
|
Merge branch 'master' into editor-timing-screen
|
2019-10-30 18:42:20 +09:00 |
|
smoogipoo
|
45af796943
|
Remove usages of EF internals
|
2019-10-30 17:05:15 +09:00 |
|
Dan Balasescu
|
514c9f1eef
|
Merge branch 'master' into bindable-control-points
|
2019-10-30 16:20:54 +09:00 |
|
smoogipoo
|
f56d9fe50c
|
Forcefully part room when multiplayer exits
|
2019-10-30 14:42:14 +09:00 |
|
smoogipoo
|
b6457f0ce9
|
Cancel room joins on part
|
2019-10-30 14:41:54 +09:00 |
|
smoogipoo
|
95ff48c123
|
Don't log cancelled join requests
|
2019-10-30 14:38:06 +09:00 |
|
Dean Herbert
|
3f192ca915
|
Fix song progress not displaying correctly (#6640)
Fix song progress not displaying correctly
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-10-29 18:16:54 +09:00 |
|
Dean Herbert
|
e3a1613d2a
|
Fix PlayerSettingsOverlay being shown by default (#6641)
Fix PlayerSettingsOverlay being shown by default
|
2019-10-29 18:16:33 +09:00 |
|
Dan Balasescu
|
f4ae65c3e8
|
Merge branch 'master' into fix-song-progress-display
|
2019-10-29 18:06:58 +09:00 |
|