1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 11:47:24 +08:00
Commit Graph

23965 Commits

Author SHA1 Message Date
Dean Herbert
5f122d88b9
Improve tournament screen transitions (#6767)
Improve tournament screen transitions
2019-11-08 19:09:36 +09:00
Dean Herbert
c1ad3114d6 Merge remote-tracking branch 'upstream/master' into tournament-improve-transitions 2019-11-08 19:09:19 +09:00
Dean Herbert
7c2400ca29
Tournament highlight active screen (#6764)
Tournament highlight active screen

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-08 19:08:18 +09:00
Dean Herbert
ac0ec0d66e
Read initial beat divisor value from the beatmap (#6765)
Read initial beat divisor value from the beatmap
2019-11-08 19:06:25 +09:00
Dean Herbert
a849bc0746 Move implementation into resetTrack for safety 2019-11-08 18:51:01 +09:00
Dan Balasescu
592368a320
Merge branch 'master' into tournament-highlight-active-screen 2019-11-08 18:28:51 +09:00
Dan Balasescu
adf3aff8ec
Merge pull request #6763 from peppy/fix-tourney-button-sounds
Fix tournament buttons playing sound effects
2019-11-08 18:28:31 +09:00
Dean Herbert
12b855d68f Make drawing screen transition properly 2019-11-08 17:56:11 +09:00
Dean Herbert
7b8ed1ac9a Improve tournament screen transitions 2019-11-08 17:56:04 +09:00
Dan Balasescu
f68013059f
Merge branch 'master' into fix-tourney-button-sounds 2019-11-08 17:47:38 +09:00
Dan Balasescu
4fc6aa940a
Merge pull request #6761 from peppy/fix-tournament-video-performance
Fix tournament videos stuttering when changing scenes
2019-11-08 17:46:50 +09:00
smoogipoo
e904928314 Seek to first hitobject when entering editor 2019-11-08 17:42:19 +09:00
smoogipoo
36cc79f04f Softly handle invalid beat divisors instead of throwing 2019-11-08 17:28:11 +09:00
smoogipoo
998e1dfe47 Fix non-1/1 initial beat divisor control display 2019-11-08 17:23:47 +09:00
smoogipoo
eb9fff96ba Read default beat divisor from beatmap 2019-11-08 17:22:58 +09:00
Dean Herbert
651a1e2ae1 Highlight selected tournament screen's button 2019-11-08 17:22:51 +09:00
Dean Herbert
380859e06e Set clock on video directly; ignore long frames 2019-11-08 17:13:45 +09:00
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
smoogipoo
df08a95734 Separate addition/removal into separate methods 2019-11-08 16:46:58 +09:00
smoogipoo
b4cb4c1243 Remove previous samples on change 2019-11-08 16:19:55 +09:00
smoogipoo
a9b4106075 Remove unnecessary (for now) scheduling 2019-11-08 16:19:43 +09:00
Dean Herbert
5fe764b2db Fix tournament videos stuttering when changing scenes 2019-11-08 16:19:34 +09:00
smoogipoo
df31acb294 Fix slider nested hitobject samples not getting updated 2019-11-08 15:43:34 +09:00
smoogipoo
53e6186b6d Fix drawable hitobject samples not updating 2019-11-08 14:59:47 +09:00
smoogipoo
6fc1be64c2 Make hitobject samples a bindable list 2019-11-08 14:04:57 +09:00
smoogipoo
864b8db638 Use three states for the hitsound menu items 2019-11-08 13:52:36 +09:00
smoogipoo
046f0b0fe5 Allow right-clicks to trigger selection 2019-11-08 13:40:47 +09:00
smoogipoo
573d11503e Remove unused using 2019-11-08 13:36:17 +09:00
smoogipoo
abb3a6ca5b Initial right click context menu implementation 2019-11-08 13:36:17 +09:00
smoogipoo
92d8526370 Adjust test namespaces 2019-11-08 13:34:27 +09:00
smoogipoo
e574aa0e94 Add toggle menu item test 2019-11-08 13:33:15 +09:00
smoogipoo
a2c265c147 Separate ThreeStates into its own file 2019-11-08 13:23:13 +09:00
smoogipoo
011bf09516 Add xmldocs and cleanup 2019-11-08 13:23:13 +09:00
smoogipoo
0a15a13fab Reorder parameters 2019-11-08 13:23:13 +09:00
smoogipoo
30f877c4ab Implement a three-state menu item 2019-11-08 13:23:13 +09:00
smoogipoo
ce08d664a5 Abstract statefulness of new menu item type 2019-11-08 13:23:13 +09:00
smoogipoo
4fe69dbc89 Fix context menu sub-menu display 2019-11-08 13:23:13 +09:00
Joehu
5235d2b319 Fix home button not closing login and now playing overlays 2019-11-07 14:38:06 -08:00
smoogipoo
c3a3b4091b Add basic implementation of a toggleable menu item 2019-11-07 22:26:35 +09:00
Dean Herbert
6805c029e7
Implement slider head control point snapping (#6753)
Implement slider head control point snapping
2019-11-07 18:48:29 +09:00
Dean Herbert
b1b354c420
Advance editor clock after a snapped placement (#6754)
Advance editor clock after a snapped placement
2019-11-07 18:48:17 +09:00
Dean Herbert
d18489f1d1
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0 (#6756)
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-11-07 16:04:39 +09:00
smoogipoo
29672c48e1 Make simple OsuMenuItem ctor invoke the complex one 2019-11-07 16:04:13 +09:00
smoogipoo
20d6eceecf Move DrawableOsuMenuItem out of OsuMenu 2019-11-07 16:03:35 +09:00
dependabot-preview[bot]
f2084df0bb
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.3...v16.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 06:19:49 +00:00
Andrei Zavatski
446e2894f7 Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-07 08:48:35 +03:00
smoogipoo
f3ddc4c00b Advance editor clock after a snapped placement 2019-11-07 14:08:02 +09:00
smoogipoo
b1da81571f Implement slider head control point snapping 2019-11-07 14:00:12 +09:00
smoogipoo
1f9f03dc66 Add temporary fix for null references 2019-11-07 13:36:54 +09:00
smoogipoo
8d42e45fd3 Make holdnote notes update lazily 2019-11-07 13:23:00 +09:00