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

4345 Commits

Author SHA1 Message Date
Dean Herbert
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
Dan Balasescu
a27f92a4fb Merge pull request #740 from peppy/resizable-chat
Resizable chat
2017-05-12 19:52:41 +09:00
Dan Balasescu
a5ff3f4d32 Merge branch 'master' into resizable-chat 2017-05-12 19:46:11 +09:00
Dan Balasescu
65504e7cd4 Merge pull request #739 from peppy/multiple-chat-channels
Multiple chat channels
2017-05-12 19:41:28 +09:00
Dan Balasescu
8ec79f788a Merge branch 'master' into multiple-chat-channels 2017-05-12 19:35:12 +09:00
Dean Herbert
181a5a8a61 Merge pull request #682 from EVAST9919/percentage
Song Progress Info
2017-05-12 16:28:20 +09:00
EVAST9919
9a04069123 removed useless booleans, using nullables instead 2017-05-12 10:16:31 +03:00
Dean Herbert
9cf4998701 Make chat resizable via drag, save user set size 2017-05-12 15:36:37 +09:00
Dean Herbert
1420aa406c Add framework fix. 2017-05-12 14:24:32 +09:00
EVAST9919
34b4efc4e9 Applied suggested changes 2017-05-12 08:12:34 +03:00
Dean Herbert
f248efb01f CI Fixes 2017-05-12 13:25:50 +09:00
EVAST9919
79ed92a0d7 Simplified logic 2017-05-12 01:48:28 +03:00
EVAST9919
1f34cec5ce Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-11 22:22:57 +03:00
Dean Herbert
ffa59c6cb3 Support read-only channels, post to correct channel.
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
Dean Herbert
a77049213d Add basic hard-coded inefficient multi-channel support. 2017-05-11 23:10:48 +09:00
Dean Herbert
f044b95ce8 Allow OsuTabControl to handle non-enum types. 2017-05-11 23:10:19 +09:00
Dan Balasescu
f11ffb99ac Merge pull request #737 from peppy/general-fixes
Update framework
2017-05-11 22:02:00 +09:00
Dan Balasescu
02532e1dc8 Merge branch 'master' into general-fixes 2017-05-11 21:28:54 +09:00
Dan Balasescu
98e5b64d3f Merge pull request #736 from peppy/oauth-fixes
OAuth fixes
2017-05-11 21:26:28 +09:00
Dean Herbert
9a1c662d1f Update framework 2017-05-11 21:25:43 +09:00
Dan Balasescu
08f5cbca51 Merge branch 'master' into oauth-fixes 2017-05-11 21:07:13 +09:00
Dan Balasescu
c5f6a1ec93 Merge pull request #735 from peppy/general-fixes
Fix broken test cases, remove some recursive lookup methods.
2017-05-11 21:03:27 +09:00
Dean Herbert
c3d2cdd2f2 Fix typo 2017-05-11 19:49:28 +09:00
Dean Herbert
4e881644f6 Add thread-safety on access token validation logic. 2017-05-11 19:39:01 +09:00
Dean Herbert
7d221802a2 Fix refresh tokens not working correctly
Turns out there's plenty of slashes in refresh tokens.
2017-05-11 19:38:57 +09:00
Dean Herbert
b258109a9e Fix chat input box not always keeping focus as expected 2017-05-11 19:38:36 +09:00
Dean Herbert
a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
Dean Herbert
18b7c8e783 Merge pull request #730 from smoogipooo/mania-notes
Mania notes
2017-05-11 18:16:33 +09:00
smoogipooo
6cc54773e8 Fix taiko right background not scaling with the playfield as intended. 2017-05-11 17:18:22 +09:00
Dean Herbert
6fd95e0c52 Fix post-merge breakage 2017-05-11 17:16:01 +09:00
Dean Herbert
bc54b3c85f Merge branch 'master' into mania-notes 2017-05-11 17:13:29 +09:00
Dean Herbert
b0e522345c Combine DrawableHitObject classes into one 2017-05-11 17:07:46 +09:00
Dean Herbert
057d0cd523 Merge pull request #733 from smoogipooo/hitrenderer-improvements
Hitrenderer improvements
2017-05-11 15:16:45 +09:00
smoogipooo
a762f820c6 Fix possible nullrefs. 2017-05-11 14:50:18 +09:00
smoogipooo
2d2d1beddd More concrete method to determine if all hit objects have been judged.
Covers the case where nested hit objects are involved.
2017-05-11 14:48:08 +09:00
smoogipooo
6445bea864 Make Playfield.HitObjects internal to playfields.
Because not all playfields will be using this.
2017-05-11 14:44:11 +09:00
smoogipooo
cdf827df8e CI fixes. 2017-05-11 13:55:52 +09:00
smoogipooo
94585672b6 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-11 13:01:00 +09:00
Dean Herbert
ab58acad81 Merge pull request #732 from peppy/general-fixes
Update framework
2017-05-11 12:57:12 +09:00
Dan Balasescu
78ed48d5ef Merge branch 'master' into general-fixes 2017-05-11 12:29:10 +09:00
Dean Herbert
672c22178a Merge pull request #724 from huoyaoyuan/metadata
WorkingBeatmap enhancement
2017-05-11 12:28:15 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
Dean Herbert
fe47451dbc Merge (fix conflicting framework) 2017-05-11 11:17:44 +09:00
EVAST9919
ea0add2354 Fixed update condition 2017-05-11 02:34:57 +03:00
EVAST9919
c0acc1799b Now progress testcase has it's own clock 2017-05-11 01:49:57 +03:00
EVAST9919
d55c97a08a Stop progress as soon as we at 100% 2017-05-11 01:48:46 +03:00
smoogipooo
4614904409 Update framework. 2017-05-10 17:38:59 +09:00
smoogipooo
3b533de8ac Add xmldoc to HitWindows.cs. 2017-05-10 17:29:54 +09:00
EVAST9919
5b469eff69 Fixes 2017-05-10 10:33:02 +03:00
EVAST9919
d8f9e71b84 Applied suggested changes 2017-05-10 10:14:44 +03:00