1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 22:52:54 +08:00
Commit Graph

20338 Commits

Author SHA1 Message Date
Dean Herbert
cc9e46f8ee Merge remote-tracking branch 'upstream/master' into catch-catcher-skinning 2019-06-24 17:45:33 +09:00
Dean Herbert
2473a9487a Add missing using 2019-06-24 17:38:11 +09:00
Dean Herbert
6e2138491b
Merge branch 'master' into useroverlay-tabs 2019-06-24 17:27:47 +09:00
Dean Herbert
303fb508af
Add SkinnableSprite class (#5137)
Add SkinnableSprite class
2019-06-24 17:11:21 +09:00
Dean Herbert
1830362337 Move task out of ctor to avoid initialisation ordering issues 2019-06-24 17:10:50 +09:00
Dean Herbert
36d54fdbfc
Merge branch 'master' into skinnable-sprite 2019-06-24 16:33:17 +09:00
Dan Balasescu
dfbcbf443a
Merge pull request #5109 from Aergwyn/add-numberbox
Add OsuNumberBox
2019-06-24 15:33:04 +09:00
Dean Herbert
06eaba766b Move method below ctor 2019-06-24 15:27:46 +09:00
Dean Herbert
9593e66a96 Add some more xmldoc 2019-06-24 15:25:01 +09:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Dean Herbert
aca9289d89 Use SkinnableSprite for approach circle 2019-06-24 15:17:56 +09:00
Dean Herbert
3f22c0a311 Add SkinnableSprite implementation 2019-06-24 15:17:35 +09:00
Dean Herbert
9ab5204947 Make test a bit more sane 2019-06-24 15:10:50 +09:00
Dean Herbert
9baf8160d1 Remove pointless SkinReloadableDrawable specification 2019-06-24 15:10:50 +09:00
Dean Herbert
d9f7011769 Use SkinnableSprite to reduce complexity of implementation 2019-06-24 15:10:50 +09:00
Joehu
7ac6558f59 Allow controlling music and effect volume by arrow keys when hovering 2019-06-23 22:53:02 -07:00
Dan Balasescu
85fdf7d97f
Merge pull request #5127 from peppy/custom-tournament-header
Allow customisation of the colour portion of the tournament logo header
2019-06-24 14:45:08 +09:00
Dean Herbert
06b087db70 Add SkinnableSprite implementation 2019-06-24 14:39:20 +09:00
Dan Balasescu
8708d69351
Merge branch 'master' into custom-tournament-header 2019-06-24 14:35:51 +09:00
Dan Balasescu
5f05b9ac0b
Merge branch 'master' into async-beatmap-load 2019-06-24 14:24:07 +09:00
smoogipoo
2a4bd612d7 Rename test scene 2019-06-24 13:47:37 +09:00
smoogipoo
003bdda765 Merge remote-tracking branch 'origin/master' into catch-catcher-skinning 2019-06-24 13:40:51 +09:00
Dan Balasescu
0265f57f55
Merge pull request #5116 from EVAST9919/useroverlay-overall-improvements
Update user overlay sections design in line with the web version
2019-06-24 13:40:37 +09:00
Dean Herbert
6d864cb47e Load beatmap content asynchronously in the background 2019-06-24 13:38:30 +09:00
smoogipoo
4cd8b6a2bd Fix unsafe caching of dependencies 2019-06-24 13:37:06 +09:00
Dan Balasescu
00a2aa7881
Merge branch 'master' into useroverlay-overall-improvements 2019-06-24 13:28:17 +09:00
smoogipoo
5272b3a929 Use .Darken() instead of hex-based colour 2019-06-24 13:27:58 +09:00
Dean Herbert
1057301322
Fix multiplayer create button appearing in match song selection (#5132)
Fix multiplayer create button appearing in match song selection
2019-06-24 12:31:39 +09:00
Dean Herbert
0717eccd04
Merge pull request #5130 from mulraf/master
Fix dialog going off-screen when UI scaling is applied
2019-06-24 12:30:26 +09:00
Dan Balasescu
64628e6174
Merge branch 'master' into master 2019-06-24 12:15:06 +09:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Dan Balasescu
e89fb409ae
Merge pull request #5131 from peppy/fix-timing-tests
Fix test timing regressions due to increased step count
2019-06-24 11:49:16 +09:00
Dean Herbert
c988dfbdaa Make things a bit more sensible 2019-06-24 11:43:34 +09:00
Dean Herbert
024157b13f Remove unnecessary type specification 2019-06-24 11:10:29 +09:00
Dean Herbert
da2ba5bf09 Allow tests to be run in non-sequential order 2019-06-24 11:09:59 +09:00
Dean Herbert
4ec064e179 Fix test timing regressions due to increased step count 2019-06-24 11:00:00 +09:00
Andrei Zavatski
bbdb114f04 Add missing blank line 2019-06-24 02:09:00 +03:00
Andrei Zavatski
35db20a337 Remove useless bindable check 2019-06-24 02:01:00 +03:00
Andrei Zavatski
94e819578e Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
2019-06-24 01:55:35 +03:00
Andrei Zavatski
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
mulraf
dfb791ed3e Update PopupDialog.cs
Changed Spacings
2019-06-23 22:59:14 +02:00
mulraf
7bbd6b810f Update PopupDialog.cs
New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)
2019-06-23 20:33:43 +02:00
Andrei Zavatski
8430ac6d1c remove unused using 2019-06-23 19:19:36 +03:00
Andrei Zavatski
1c20df780a Adjust triangles colour 2019-06-23 17:08:18 +03:00
Andrei Zavatski
f5f041acc8 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-overall-improvements 2019-06-23 16:35:42 +03:00
Lucas A
03829611ae Merge branch 'master' into catch-catcher-skinning 2019-06-23 14:55:24 +02:00
Dean Herbert
d595860b14 Remove background from team intro screen 2019-06-23 20:09:42 +09:00
Dean Herbert
ba97b887b4 Allow cusotmisation of the colour portion of the tournament logo header 2019-06-23 20:05:55 +09:00
Lucas A
332ac0b82b Fix CI inspections 2019-06-22 18:23:20 +02:00
Lucas A
b6cae57694 Add TestSceneCatcherSkinning 2019-06-22 18:14:29 +02:00