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

4522 Commits

Author SHA1 Message Date
EVAST9919 eec813ad65 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 17:14:00 +03:00
Dean Herbert 3fd9edfcde Merge pull request #784 from peppy/general-fixes 
Fix CI warning
 2017-05-17 22:57:01 +09:00
EVAST9919 60ed7a2372 fixed license header 2017-05-17 16:54:49 +03:00
Dean Herbert d606b5b3a7 Fix CI warning 2017-05-17 22:13:56 +09:00
EVAST9919 e785f1ddf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 16:12:38 +03:00
EVAST9919 1e029d05a8 Added bindable to adjust playback speed 2017-05-17 16:10:49 +03:00
Dan Balasescu 8bcbc2cc26 Merge pull request #774 from peppy/fix-chat-after-disconnect 
Fix channels being unnecessarily recycled on disconnect
 2017-05-17 22:02:25 +09:00
EVAST9919 0867ef814c Visible only in replay 2017-05-17 15:54:12 +03:00
EVAST9919 e0625a9b30 More overlays and overall fixes 2017-05-17 15:39:26 +03:00
EVAST9919 fd2150aa49 Moved collectionsDropdown to it's own class 2017-05-17 15:32:16 +03:00
Dan Balasescu b21be8f3f5 Merge branch 'master' into fix-chat-after-disconnect 2017-05-17 17:51:35 +09:00
EVAST9919 1a4025ab3c ingame options basic logic 2017-05-17 10:36:57 +03:00
EVAST9919 5fb8830e3a Moved music controller buttons to it's own class 2017-05-17 10:36:24 +03:00
Dan Balasescu 12716d2ab4 Merge pull request #776 from peppy/fix-duplicate-messages 
Revert "Use generic IComparable for message."
 2017-05-17 13:51:13 +09:00
Dean Herbert 78c1d4581f
Revert "Use generic IComparable for message." 
This reverts commit aaaee5ed10.
 2017-05-17 13:44:43 +09:00
Dean Herbert 231f7939a6 Fix channels being unnecessarily recycled on disconnect 
Resolves #768
 2017-05-17 12:42:02 +09:00
Dean Herbert c78f4cc7ab Merge pull request #769 from huoyaoyuan/tidy-up 
Tidy up
 2017-05-17 09:29:05 +09:00
Dean Herbert 12cb530358 Merge branch 'master' into tidy-up 2017-05-17 09:24:11 +09:00
Dean Herbert 4f1c32a491 Merge pull request #771 from nyaamara/master 
Fix typo
 2017-05-17 07:59:46 +09:00
nyaamara a3e93afb37 Merge pull request #3 from ppy/master 
cool
 2017-05-16 16:57:45 -04:00
nyaamara b22c84287a Fix typo. 2017-05-16 16:54:33 -04:00
Huo Yaoyuan e2a7f00a52 Remove unused namespace. 2017-05-16 22:20:05 +08:00
Huo Yaoyuan f1d5a92950 Use generic IEqutable to avoid typeless Equals. 2017-05-16 21:49:38 +08:00
Huo Yaoyuan aaaee5ed10 Use generic IComparable for message. 2017-05-16 21:46:22 +08:00
Huo Yaoyuan e911441394 Why AbandonedMutexException? 2017-05-16 21:23:14 +08:00
Huo Yaoyuan d929de466a DateDisplay -> DateTimeDisplay for more exactly. 2017-05-16 21:16:52 +08:00
Huo Yaoyuan d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Huo Yaoyuan b9a40a841b Use IsAssignableFrom. 2017-05-16 21:04:54 +08:00
Dean Herbert 8b6d0864f0 Merge pull request #767 from peppy/general-fixes 
Update framework
 2017-05-16 21:42:56 +09:00
Dean Herbert 5a9745b492 Update API endpoint 2017-05-16 21:37:55 +09:00
Dean Herbert 3d74492c95 Update framework 2017-05-16 21:19:34 +09:00
Dean Herbert 18b46dc0d4 Merge pull request #766 from peppy/general-fixes 
Remove incorrect padding
 2017-05-16 21:18:08 +09:00
Dan Balasescu be3953aeb2 Merge branch 'master' into general-fixes 2017-05-16 20:52:38 +09:00
Dan Balasescu 14b06f3600 Merge pull request #765 from peppy/fix-guest-user 
Fix guest user being null
 2017-05-16 20:52:25 +09:00
Dan Balasescu a7df99c6d2 Merge branch 'master' into fix-guest-user 2017-05-16 20:46:28 +09:00
Dean Herbert 1112dbb113 Merge pull request #738 from smoogipooo/mania-timing-sections 
Mania timing sections
 2017-05-16 20:17:20 +09:00
Dean Herbert 85daddcf6f Merge branch 'master' into mania-timing-sections 2017-05-16 20:12:26 +09:00
Dean Herbert 041d4f93c0 Fix typo 2017-05-16 20:08:22 +09:00
Dean Herbert fdf0137fc2 Remove incorrect padding 2017-05-16 19:58:34 +09:00
Dean Herbert 23807aa3b9 Better handling of logged in state 2017-05-16 19:55:45 +09:00
Dean Herbert 2384f7b0c1 Ensure LocalUser is never null 2017-05-16 19:49:50 +09:00
smoogipooo 0eba553138 Comments? 2017-05-16 19:33:56 +09:00
smoogipooo bc629d193d InternalChildren -> Children. 2017-05-16 19:26:46 +09:00
Dan Balasescu d1c198d9bf Merge pull request #762 from peppy/player-fixes 
Player fixes
 2017-05-16 19:20:33 +09:00
smoogipooo 9b0aed7c48 Add tween to time span changing. 2017-05-16 19:14:27 +09:00
Dean Herbert a209a738ea Merge branch 'master' into player-fixes 2017-05-16 19:11:23 +09:00
Dean Herbert 5786efd379 Merge pull request #759 from peppy/on-screen-display 
On-screen display
 2017-05-16 19:10:45 +09:00
Dan Balasescu ca9c52ce38 Merge branch 'master' into player-fixes 2017-05-16 18:54:55 +09:00
Dean Herbert 0c7ceea4fd Merge branch 'master' into on-screen-display 2017-05-16 18:54:54 +09:00
Dean Herbert 3a12fbd581 Merge pull request #764 from peppy/fix-duplicate-channels 
Fix duplicate channels being created on connection loss
 2017-05-16 18:54:35 +09:00