1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 16:07:31 +08:00
Commit Graph

23736 Commits

Author SHA1 Message Date
smoogipoo
3f8928ca25 Suppress warnings 2019-11-12 13:41:54 +09:00
smoogipoo
ed11c72d0b Merge remote-tracking branch 'origin/master' into selection-hitsound-addition 2019-11-12 13:40:25 +09:00
smoogipoo
9f1d490ac9 Only handle selection input on blueprints 2019-11-12 12:18:24 +09:00
Dean Herbert
e28ddec8d6
Merge branch 'master' into fix-home-not-closing-all-overlays 2019-11-12 12:05:19 +09:00
Dean Herbert
46971e9aef
Fix mod section overflowing mod select overlay at higher ui sca… (#6700)
Fix mod section overflowing mod select overlay at higher ui scale

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 11:54:32 +09:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow 2019-11-12 11:35:01 +09:00
Dean Herbert
2f8768a4b1 Move LabelledDropdown local to usage 2019-11-12 11:04:49 +09:00
Dean Herbert
bedd136c81 Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset 2019-11-12 11:02:36 +09:00
Dean Herbert
a43b0ee01b Apply naming and styling changes 2019-11-12 10:45:46 +09:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
Dean Herbert
2a7761bd56
Implement stateful menu items (#6760)
Implement stateful menu items

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 10:40:25 +09:00
Dean Herbert
52ab309295
Merge branch 'master' into stateful-menu-items 2019-11-12 10:31:50 +09:00
Dean Herbert
5da4db6889
Merge pull request #6802 from smoogipoo/edit-fadeout-time
Increase fade-out time of hitobjects in the editor
2019-11-12 10:30:50 +09:00
Dan Balasescu
5818a362da
Merge pull request #6809 from huoyaoyuan/code-style
Port code style updates from framework
2019-11-12 10:27:29 +09:00
Dean Herbert
5bb65d0716 Rename button class 2019-11-12 10:21:06 +09:00
Dean Herbert
576b7b3f95 Merge remote-tracking branch 'upstream/master' into code-style 2019-11-12 10:11:47 +09:00
Dean Herbert
dbabecc449
Merge pull request #6811 from recapitalverb/master
Fix capitalisation in README.md
2019-11-12 10:07:10 +09:00
Dean Herbert
8402fb1490 Move to const and add some xmldoc for future visitors 2019-11-12 10:02:42 +09:00
Dean Herbert
662318a635 Merge remote-tracking branch 'upstream/master' into edit-fadeout-time 2019-11-12 09:53:16 +09:00
Dean Herbert
0f23844c5d Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset 2019-11-12 09:47:12 +09:00
Joseph Madamba
9efcc6addd
Fix remaining proper nouns 2019-11-11 08:53:05 -08:00
recapitalverb
810cfab870 Fix capitalisation and grammar in README.md 2019-11-11 22:53:16 +07:00
recapitalverb
851b414e98
Update README.md
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-11-11 22:37:15 +07:00
recapitalverb
e690a8a301
Fix capitalisation in README.md 2019-11-11 22:15:19 +07:00
Andrei Zavatski
4145e25f7b Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-11 17:55:10 +03:00
Huo Yaoyuan
1ef645a710 Turn off some more not applied styles. 2019-11-11 21:02:48 +08:00
Huo Yaoyuan
d385862267 Add dotnet format check. 2019-11-11 20:32:32 +08:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
d8482448dc Save iOS projects with BOM to avoid VS continuously changing them. 2019-11-11 20:13:13 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Huo Yaoyuan
3d1c31f2ae Copy configs from framework repo. 2019-11-11 20:13:12 +08:00
Dean Herbert
28afc9e162
Remove redundant package references in iOS props (#6808)
Remove redundant package references in iOS props
2019-11-11 20:30:53 +09:00
Huo Yaoyuan
9c1a9c29e4 Remove redundant package references in iOS props. 2019-11-11 19:00:19 +08:00
Dean Herbert
54da8e4035 Combine similar tests 2019-11-11 19:09:38 +09:00
Dean Herbert
82cc6aa0c5 Remove unused constructor 2019-11-11 19:00:14 +09:00
Dean Herbert
1155f0b0de
Bump Newtonsoft.Json from 12.0.2 to 12.0.3 (#6806)
Bump Newtonsoft.Json from 12.0.2 to 12.0.3

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-11-11 18:58:47 +09:00
Dean Herbert
bed62e0d2f Rename ThreeState -> TernaryState and add basic tests 2019-11-11 18:56:18 +09:00
Dean Herbert
ce4843be22 Move tests to parent namespace for now 2019-11-11 18:42:32 +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
5d96e6d90a Populate users centrally, using the correct ruleset 2019-11-11 17:39:48 +09:00
Dean Herbert
702a1c496b Add ruleset selection to tournament client 2019-11-11 17:39:28 +09:00
Dean Herbert
fced262c41 Add labelled dropdown component 2019-11-11 17:39:24 +09:00
Dan Balasescu
97075c49e9
Merge pull request #6671 from huoyaoyuan/infrastructure
Port merged tooling updates from framework
2019-11-11 16:16:56 +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
9a88b901eb
Merge pull request #6801 from smoogipoo/edit-disable-input
Disable ruleset input in the editor
2019-11-11 15:34:07 +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