1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 00:12:57 +08:00
Commit Graph

6829 Commits

Author SHA1 Message Date
Huo Yaoyuan
d24f78ea24 Merge branch 'master' into profile 2017-06-25 10:29:14 +08:00
Huo Yaoyuan
a187e50889 Unify usages of field and property. 2017-06-25 10:07:54 +08:00
Huo Yaoyuan
18295a9b97 Handle scrolling in SectionsContainer. 2017-06-25 10:06:54 +08:00
DrabWeb
5e1cb14e62 Use Vertical instead of Top and Bottom. 2017-06-24 19:11:02 -03:00
DrabWeb
091d786d47 Split long MarginPadding onto multiple lines. 2017-06-24 18:37:28 -03:00
MrTheMake
d914a1b00e Added animation parameter 2017-06-24 13:47:34 +02:00
MrTheMake
ba783f984c Change usage of ScrollIntoView to ScrollTo in the setttings overlay 2017-06-24 13:36:57 +02:00
Thomas Müller
1bca9ca0e9 Update framework with better children list 2017-06-24 12:56:35 +02:00
MrTheMake
cc71c10488 Merge branch 'master' into musiccontroller-canbeatmapchange 2017-06-24 12:26:40 +02:00
DrabWeb
68915d79a6 Remove unused fields. 2017-06-24 06:03:40 -03:00
DrabWeb
9f417743b6 Cleanup. 2017-06-24 05:54:00 -03:00
DrabWeb
bcd82a02f4 Licenses. 2017-06-24 05:45:34 -03:00
DrabWeb
fe875957a7 Share ruleset and type displaying, fix tag team icon. 2017-06-24 05:43:52 -03:00
DrabWeb
35951ffc40 Line endings. 2017-06-24 05:23:31 -03:00
DrabWeb
05b5fe8ae7 Share host/participant info displaying. 2017-06-24 05:21:42 -03:00
Jai Sharma
a0262e32b1 CI Fixes 2017-06-24 09:15:53 +01:00
Jai Sharma
e16b646014 Add readonly to fill 2017-06-24 09:14:55 +01:00
DrabWeb
0de55776c0 Update DrawableRoom design. 2017-06-24 05:05:48 -03:00
Jai Sharma
e073100498 Merge branch 'master' into remove-dragbar 2017-06-24 08:55:02 +01:00
Dean Herbert
f70bdd80aa Merge pull request #967 from Tom94/better-input
Get rid of AlwaysReceiveInput (update framework)
2017-06-24 16:43:40 +09:00
Thomas Müller
494a77aa0d Update framework 2017-06-24 09:35:54 +02:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +02:00
DrabWeb
b2c516238e Cleanup. 2017-06-24 01:48:55 -03:00
DrabWeb
0133f9c086 Medal sprite, make MedalOverlay auto-show when loaded. 2017-06-24 01:19:44 -03:00
DrabWeb
c71f34c507 Make the background strip expand from the disc edges. 2017-06-23 23:51:28 -03:00
DrabWeb
3c97f04826 Particles. 2017-06-23 23:18:44 -03:00
DrabWeb
e09625e49d Merge https://github.com/ppy/osu into medal-splash 2017-06-23 22:42:36 -03:00
DrabWeb
15cd4f77b2 Proper dismissing. 2017-06-23 22:35:06 -03:00
EVAST9919
817d2c3da1 Fixed logo heartbeat playing even without beating 2017-06-23 23:57:57 +03:00
Jai Sharma
de50a1694f Merge branch 'master' into remove-dragbar 2017-06-23 19:26:47 +01:00
Jai Sharma
a327f49d68 Updating progressBar.EndTime is more thread safe 2017-06-23 18:24:46 +01:00
Thomas Müller
f5829860a2 Get rid of AlwaysReceiveInput 2017-06-23 18:02:24 +02:00
Huo Yaoyuan
674e2a4395 Align placeholder. 2017-06-23 23:37:19 +08:00
Dean Herbert
b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09:00
Dean Herbert
7e5b920c92 Merge pull request #885 from DrabWeb/multiplayer-room-inspector
Multiplayer room inspector
2017-06-23 22:47:53 +09:00
Dean Herbert
f314f5f7ea CI fixes 2017-06-23 22:34:36 +09:00
Dean Herbert
1a8f207db3 Code formatting 2017-06-23 22:19:41 +09:00
Dean Herbert
81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
EVAST9919
3150bdb54b Fixed wrong display string 2017-06-23 14:56:43 +03:00
EVAST9919
a59af5b005 Applied suggested changes 2017-06-23 10:01:28 +03:00
EVAST9919
17494aed85 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes 2017-06-23 10:00:51 +03:00
Dean Herbert
e91348ff85 Merge pull request #952 from smoogipooo/fix-invalid-depth
Fix an invalid depth operation.
2017-06-23 15:37:54 +09:00
smoogipooo
5533ebabfc Update framework. 2017-06-23 15:32:45 +09:00
Dean Herbert
a0e7751cd1 Merge branch 'master' into fix-invalid-depth 2017-06-23 14:48:12 +09:00
EVAST9919
608f3fe8c5 oops 2017-06-23 08:41:48 +03:00
EVAST9919
b020fe0d50 Added TestCase 2017-06-23 08:36:47 +03:00
EVAST9919
266e1a29c3 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes 2017-06-23 08:34:30 +03:00
Dean Herbert
5dc0b87ef5 Apply some fixes for my own comments 2017-06-23 14:02:19 +09:00
Dean Herbert
076d561615 Merge branch 'master' into profile 2017-06-23 13:12:36 +09:00
Dean Herbert
eafd05e98f Fade shadow effect in to avoid appearing too early in transition 2017-06-23 11:54:32 +09:00