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

4213 Commits

Author SHA1 Message Date
Dean Herbert
b1d5a56309
Update framework. 2017-04-10 19:44:45 +09:00
Dan Balasescu
ba4d654a21 Merge branch 'master' into has-bindable-value 2017-04-10 19:40:37 +09:00
Dean Herbert
44d2bc7a38 Merge pull request #615 from smoogipooo/more-taiko-relative-sizings
More taiko relative sizings
2017-04-10 19:30:41 +09:00
Dean Herbert
b9ce98efd6
Add AspectAdjust to HitRenderer to allow playfield to consume ful HitRenderer size when needed. 2017-04-10 19:22:27 +09:00
Dean Herbert
960ea27684
Make all Playfields completely relative. 2017-04-10 19:22:27 +09:00
Dean Herbert
cd016c57c8 Merge branch 'master' into more-taiko-relative-sizings 2017-04-10 17:34:18 +09:00
Dean Herbert
75bfc85d56 Merge pull request #611 from EVAST9919/key_retry
Retry on Tilde key
2017-04-10 17:31:30 +09:00
Dean Herbert
43a4657540
Remove unnecessary AlwaysPresent. 2017-04-10 17:26:05 +09:00
Dean Herbert
3a01cfccee
Adjust fade length and easing. 2017-04-10 17:25:56 +09:00
Dean Herbert
15c1013f5b
Don't schedule event, it's unreliable and doesn't match the fade. 2017-04-10 17:25:46 +09:00
Dean Herbert
5af4259ab4
Add back explicit binds. 2017-04-10 17:10:15 +09:00
Dean Herbert
ba03a98992
Add missing config set. 2017-04-10 16:39:10 +09:00
Dean Herbert
f12b5a8954
Unify disable logic. 2017-04-10 16:22:36 +09:00
Dean Herbert
b7cfdff8d1
Update SliderBar to use IHasCurrentValue. 2017-04-10 15:30:17 +09:00
Andrey Zavadskiy
7366640b95 Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry 2017-04-10 09:10:20 +03:00
Dan Balasescu
78ea5c3b8e Merge pull request #614 from peppy/has-bindable-value
Update UI control access in line with framework changes.
2017-04-10 15:05:58 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
smoogipooo
f587fe91d2 Merge branch 'master' into more-taiko-relative-sizings 2017-04-10 14:43:17 +09:00
smoogipooo
b57351f6e3 Update framework. 2017-04-10 14:43:13 +09:00
smoogipooo
f4094fbde2 Extend TestCaseTaikoPlayfield a bit. 2017-04-10 14:28:28 +09:00
smoogipooo
d6f388f8fd Add better scale adjustements to TaikoPlayfield.
It will now keep the original width while scaling everything inside to match the playfield height.
2017-04-10 14:28:01 +09:00
Andrey Zavadskiy
1879a05c7b Removed using 2017-04-10 06:10:12 +03:00
Andrey Zavadskiy
e73f543c4f Applied suggestions 2017-04-10 06:06:10 +03:00
smoogipooo
30b5b6f7e2 General cleanup. 2017-04-10 11:54:01 +09:00
Andrey Zavadskiy
c793878ae2 Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry 2017-04-10 05:50:28 +03:00
Dan Balasescu
d2a889d2bb Merge pull request #613 from ppy/peppy/general-fixes
Peppy/general fixes
2017-04-10 10:53:33 +09:00
smoogipooo
05ac73edcb Apply width modification to hit object container instead of hit objects, to preserve original size. 2017-04-10 10:33:52 +09:00
Dan Balasescu
862c7c7f3c Merge branch 'master' into peppy/general-fixes 2017-04-10 10:17:10 +09:00
smoogipooo
39adb60952 Update framework. 2017-04-10 10:16:07 +09:00
Dean Herbert
8c6e3e7e54 Merge pull request #610 from peppy/vscode-updates
Bring vscode launch/task configurations up to date.
2017-04-10 10:06:40 +09:00
smoogipooo
e95c7dfa37 Update framework. 2017-04-10 09:33:46 +09:00
smoogipooo
88666c865f Make hit objects default size relative to play field size, not the other way around. 2017-04-10 09:23:00 +09:00
smoogipooo
c882b9bafd Make taiko playfield scale by height. 2017-04-10 05:08:05 +09:00
Dean Herbert
1fe6b84dfc Update with new input changes from framework. 2017-04-10 01:24:50 +09:00
Andrey Zavadskiy
a7264aa84c Warning fix 2017-04-09 17:53:16 +03:00
Andrey Zavadskiy
425e96c45c Moved logic to it's own class 2017-04-09 17:44:19 +03:00
Andrey Zavadskiy
4ab4f65c83 Retry on Tilde key 2017-04-09 16:26:31 +03:00
DrabWeb
fc7eef091f current_colour -> currentColour, fix masked away playlist items not fading colours 2017-04-09 09:08:11 -03:00
DrabWeb
70756a069e Unused usings 2017-04-09 07:52:26 -03:00
DrabWeb
241895c85b Proper playlist item text wrapping 2017-04-09 07:36:41 -03:00
DrabWeb
67f1167172 Comments, play first song if current is nil and user presses play 2017-04-09 07:04:41 -03:00
Dean Herbert
667b52156a Bring vscode launch/task configurations up to date. 2017-04-09 18:59:43 +09:00
DrabWeb
7f2feab9e7 Proper search field focusing and exit on escape 2017-04-09 06:26:17 -03:00
DrabWeb
a88c82705b Use playlist queue 2017-04-09 06:11:53 -03:00
DrabWeb
fe17cb924d Cleanup 2017-04-09 04:50:35 -03:00
DrabWeb
7b5f8800bd Reimplement with MusicController 2017-04-09 04:26:21 -03:00
DrabWeb
2d6a2f41aa Reset MusicController 2017-04-09 04:12:30 -03:00
DrabWeb
963cd09bd0 Merge https://github.com/ppy/osu into playlist 2017-04-09 04:04:13 -03:00
DrabWeb
f65eaa6566 Show scroll dragger, change behaviour when selecting playing song 2017-04-09 03:52:48 -03:00
Jorolf
bcef1ce2b6 replace space in text with Spacing in FillFlowContainer 2017-04-08 13:59:22 +02:00