RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,494 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

141 Commits

Author SHA1 Message Date
smoogipooo ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
EVAST9919 e737ded382 Applied suggested changes 2017-05-30 12:23:53 +03:00
Dan Balasescu 6918368afc Merge branch 'master' into ingame_options 2017-05-29 18:12:02 +09:00
MrTheMake 9de7e7bc40 Fixes 2017-05-25 17:49:47 +02:00
MrTheMake c32d816f9c Removed new line 2017-05-25 14:19:04 +02:00
MrTheMake 9ea70b849b Fix initialize beatmap change animation of the music controller 2017-05-25 14:16:51 +02:00
EVAST9919 5fb8830e3a Moved music controller buttons to it's own class 2017-05-17 10:36:24 +03:00
Dean Herbert efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Huo Yaoyuan 146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
Dean Herbert f1d0b77d10 Base the music controller transform direction on relative indices in playlist. 2017-05-02 16:40:29 +09:00
Dean Herbert 737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
Dean Herbert 3943e4ae95 Fix comma. 2017-05-01 19:32:31 +09:00
Dean Herbert 580cf93147 Refactoring part 4. 2017-05-01 15:03:11 +09:00
Dean Herbert 97a7f16ab7 Refactoring part 3. 2017-05-01 13:41:22 +09:00
Dean Herbert 7c2e193db1 Refactoring part 2. 2017-05-01 13:25:32 +09:00
Dean Herbert 37944bb04e Initial refactoring. 2017-05-01 13:01:08 +09:00
DrabWeb 9bdf462dd1 Possible null reference exception 2017-04-29 06:36:06 -03:00
DrabWeb 067b572245 Formatting 2017-04-29 06:28:57 -03:00
DrabWeb ef811f3cf3 More formatting 2017-04-29 06:17:50 -03:00
DrabWeb 3f73799975 Formatting 2017-04-29 06:10:12 -03:00
DrabWeb c193a90a16 Merge https://github.com/ppy/osu into playlist 2017-04-29 05:39:52 -03:00
Huo Yaoyuan 061c3cacbd CI fixes. 2017-04-26 20:04:32 +08:00
Huo Yaoyuan 4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Dean Herbert 3c98170330 Use method group for MusicController fault. 2017-04-24 20:22:21 +09:00
ColdVolcano 6a05440e6c Only schedule when faulted 2017-04-23 00:53:21 -05:00
ColdVolcano 1d254f4a56 Take MusicController back to life 2017-04-23 00:13:58 -05:00
DrabWeb 70756a069e Unused usings 2017-04-09 07:52:26 -03:00
DrabWeb 67f1167172 Comments, play first song if current is nil and user presses play 2017-04-09 07:04:41 -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
Dean Herbert e1e9772d46 Flash buttons on click. 2017-04-08 19:28:29 +09:00
Dean Herbert e40ad69a3b Adjust icon scale of play button. 2017-04-08 19:25:40 +09:00
Thomas Müller b99cbe6962 Add back nice scaling of music controller buttons 2017-04-08 19:17:20 +09:00
smoogipooo a9d938e7ed Fix brace style. 2017-04-07 15:57:00 +09:00
Dean Herbert 2c2a4169c6
Better structure for button layout. 2017-04-07 15:28:18 +09:00
Dean Herbert 361e187949
Temporarily disable button scaling. 2017-04-07 14:33:58 +09:00
Dean Herbert fa28e7bdc3
Improve clickability and visuals of MusicController buttons. 2017-04-07 14:09:26 +09:00
Dean Herbert 7c9f30c288
MusicController regression fixes. 2017-04-07 13:15:57 +09:00
Dean Herbert 7c74951454
Update bindables. 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
 2017-04-04 11:34:13 +09:00
Dean Herbert bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert 6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert 4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
DrabWeb 215b016f32 Initial implementation 2017-03-24 05:59:26 -03:00
Dean Herbert 54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Thomas Müller 9af0104e3e Fix NaN when dragging music controller 
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
 2017-03-18 12:46:12 +01:00