18959 Commits

Author SHA1 Message Date
Dean Herbert
bed62e0d2f Rename ThreeState -> TernaryState and add basic tests 2019-11-11 18:56:18 +09:00
Dean Herbert
c0f6e4687a
Merge branch 'master' into stateful-menu-items 2019-11-11 18:33:50 +09:00
dependabot-preview[bot]
a345fd8a86
Bump Newtonsoft.Json from 12.0.2 to 12.0.3
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...12.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 09:26:56 +00:00
iiSaLMaN
6d3d7c5d95 Remove unnecessary use of local 2019-11-11 11:57:14 +03:00
Dean Herbert
fced262c41 Add labelled dropdown component 2019-11-11 17:39:24 +09:00
Dan Balasescu
f27398e899
Merge branch 'master' into infrastructure 2019-11-11 16:02:05 +09:00
Dean Herbert
df51f138c0
Merge branch 'master' into edit-select-all 2019-11-11 15:44:26 +09:00
Dean Herbert
13fd95d513 Remove misplaced usings 2019-11-11 14:03:29 +09:00
Dean Herbert
8ac708ada5 Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale 2019-11-11 13:58:35 +09:00
Dean Herbert
dc88bd3d61 Add local preserving container to OsuTestScene to ensure correct test dimensions 2019-11-11 13:52:04 +09:00
smoogipoo
f3dc38e342 Add Ctrl+A to select all (esc to deselect all) 2019-11-11 13:41:10 +09:00
smoogipoo
e924a5d51e Disable ruleset input in the editor 2019-11-11 13:04:43 +09:00
Dean Herbert
fd7bdc03ab Merge remote-tracking branch 'upstream/master' into infrastructure 2019-11-11 11:11:59 +09:00
Dean Herbert
9db73d33cc
Remove horizontal padding on toolbar ruleset selector (#6780)
Remove horizontal padding on toolbar ruleset selector
2019-11-11 10:02:30 +09:00
Andrei Zavatski
93954c8da0 Use BindableList for selected mods 2019-11-10 23:58:07 +03:00
iiSaLMaN
8f4916ad2d Add inline comment 2019-11-10 23:53:31 +03:00
Andrei Zavatski
e3d8e29cdd Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-10 23:38:41 +03:00
iiSaLMaN
9d61d73ced Change Track and TrackManagerPreviewTrack accessibilities 2019-11-10 23:09:04 +03:00
iiSaLMaN
20ed6c4d52 Use track check solution for this 2019-11-10 23:07:51 +03:00
Dean Herbert
45e1501c02
Merge branch 'master' into infrastructure 2019-11-09 16:23:58 +09:00
Dean Herbert
5c47641608
Reorder conditional 2019-11-09 16:23:22 +09:00
Joehu
b675024161 Remove horizontal padding on toolbar ruleset selector 2019-11-08 20:28:24 -08:00
Dean Herbert
683916967c
Merge branch 'master' into vote-pill-fix 2019-11-09 12:15:48 +09:00
Dean Herbert
2dd514012a Update framework 2019-11-08 23:28:22 +09:00
Joehu
ff225c3691 Remove toolbarElements 2019-11-08 06:04:18 -08:00
Huo Yaoyuan
6ebe02f409 Merge branch 'master' into infrastructure 2019-11-08 21:19:59 +08:00
smoogipoo
97ea07db0e Add delete option to the right-click menu 2019-11-08 19:44:47 +09:00
iiSaLMaN
8ef9ccc39e Schedule new track assignment after stopping current track 2019-11-08 13:19:06 +03:00
Dean Herbert
c70c05c896
Less sickening parallax (#6743)
Less sickening parallax
2019-11-08 19:15:25 +09:00
Dean Herbert
5699f3e22b
Seek to the first hitobject when entering the editor (#6766)
Seek to the first hitobject when entering the editor

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-08 19:15:08 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +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
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
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
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
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