1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:42:54 +08:00
Commit Graph

4861 Commits

Author SHA1 Message Date
smoogipooo
ecf81fa8d2 Cleanup. 2017-05-22 08:25:48 +09:00
Dean Herbert
aef7ae637f Merge branch 'master' into mania-endtime-object-conversion 2017-05-22 08:12:24 +09:00
Dean Herbert
0ad4a18c7b Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 08:12:09 +09:00
Dean Herbert
c9ac574db2 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 07:49:21 +09:00
MrTheMake
4056338203 Remove unnecessary track starting 2017-05-21 21:35:49 +02:00
MrTheMake
0539584578 CI fix 2017-05-21 21:33:54 +02:00
MrTheMake
b543b1f9fc Remove unnecessary restart 2017-05-21 21:20:59 +02:00
Jorolf
5b244367ee allow for solutions were the osu repository isn't at the solution level 2017-05-21 20:29:05 +02:00
MrTheMake
6219b8e6dd Fixed an error with looping 2017-05-21 20:27:41 +02:00
MrTheMake
974e8d1f82 Fix pressing up always goes to the first beatmap group difficulty, not the last 2017-05-21 19:27:34 +02:00
MrTheMake
9b87f5d8db Reformating 2017-05-21 18:16:54 +02:00
MrTheMake
6d7f70d0ea Fix CI warnings 2017-05-21 18:00:31 +02:00
MrTheMake
34653eb8c0 Fixed null references 2017-05-21 17:20:20 +02:00
MrTheMake
7db45cb58f Moved the whole looping assignments inside PlaySongSelect 2017-05-21 17:09:56 +02:00
MrTheMake
ec213efc49 Trimmed whitespaces 2017-05-21 16:13:20 +02:00
MrTheMake
cc35cc281c Fixed null reference in case there are no beatmaps 2017-05-21 16:10:10 +02:00
MrTheMake
48f4879157 Use the track's implemented looping algorithm to loop tracks in the song select screen 2017-05-21 15:57:41 +02:00
MrTheMake
043d1ed20a Updated preload condition to handle special case 2017-05-21 14:08:04 +02:00
MrTheMake
662ea0ec2d Repeat a beatmap's track if it has ended 2017-05-21 14:00:40 +02:00
MrTheMake
1546bbc66b Updated preload condition. 2017-05-21 13:04:04 +02:00
Dean Herbert
8f3ab79918 Simplify SpinnerTicks & CI fixes 2017-05-21 17:31:35 +09:00
Dean Herbert
95498fe6df Adjust spinner colours making use of EdgeEffect.Hollow 2017-05-21 17:21:49 +09:00
Dean Herbert
18a7271dc6 Update framework 2017-05-21 17:07:16 +09:00
MrTheMake
44cad4e0ac Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen. 2017-05-21 03:04:12 +02:00
Huo Yaoyuan
7357076c4d CI fixes. 2017-05-21 04:48:43 +08:00
Huo Yaoyuan
4a55666e03 Merge branch 'master' into sections 2017-05-21 04:43:39 +08:00
Huo Yaoyuan
f06f8b4dcd Make sidebar buttons working. 2017-05-21 04:33:05 +08:00
MrTheMake
33ebc8fd49 Trimmed more whitespaces 2017-05-20 22:23:49 +02:00
MrTheMake
97aadad113 Trimmed spaces. 2017-05-20 22:16:05 +02:00
MrTheMake
f76abe2329 Disallow clicking through the song select footer. 2017-05-20 22:13:23 +02:00
Huo Yaoyuan
aa409ac1a9 Move SearchTextBox out of SettingsHeader. 2017-05-21 04:12:16 +08:00
Huo Yaoyuan
a98f109d73 Use LayoutSize for header and footer layout. 2017-05-21 04:01:07 +08:00
Huo Yaoyuan
35712514a4 Update settings UI using SectionsContainer basically. 2017-05-21 03:50:04 +08:00
Huo Yaoyuan
93668e53a0 Add footer support. 2017-05-21 03:44:03 +08:00
Huo Yaoyuan
201b44dbf1 Do not make the name confusing. 2017-05-21 03:02:51 +08:00
Huo Yaoyuan
72621c81dc Handle null and invalidation of headers. 2017-05-21 02:37:34 +08:00
Huo Yaoyuan
e040f297c6 Set Masking = false and expose ScrollContainer. 2017-05-21 02:21:23 +08:00
MrTheMake
306feb177a Fix null pointer reference 2017-05-20 20:18:29 +02:00
Huo Yaoyuan
da47b0a260 Fix margin and offset calculating. 2017-05-21 02:11:55 +08:00
MrTheMake
031fddc995 Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set. 2017-05-20 19:53:18 +02:00
Dean Herbert
3ff5c271ea Merge branch 'master' into replay-no-pausing 2017-05-21 02:00:00 +09:00
MrTheMake
57b9ed0f54 Do not pause a running replay if the window is not focused. 2017-05-20 18:56:50 +02:00
ColdVolcano
07d148f708 Merge branch 'master' of ppy/osu into beat-syncing 2017-05-20 11:46:51 -05:00
ColdVolcano
38a566890f Add licence header 2017-05-20 11:44:19 -05:00
ColdVolcano
d5904499f7 Post merge fixes 2017-05-20 11:41:16 -05:00
ColdVolcano
2014d35301 Merge branch 'master' of ppy/osu into menu-flashes 2017-05-20 11:39:39 -05:00
ColdVolcano
4e83f12f34 Initial implementation
Note this won't work with the osu!bgm because it is not a beatmap
2017-05-20 11:02:42 -05:00
Dean Herbert
82f2927f1a Merge pull request #808 from DrabWeb/playlist-item-paragraph
Make PlaylistItem use Paragraphs
2017-05-20 15:54:54 +09:00
Dean Herbert
fb72693c96 Merge branch 'master' into playlist-item-paragraph 2017-05-20 15:47:54 +09:00
Dean Herbert
808f5c3ae3 Merge pull request #807 from DrabWeb/mod-tooltips
Mod button tooltips
2017-05-20 15:46:34 +09:00