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

1888 Commits

Author SHA1 Message Date
Alex Amadori
e2ae03e798 Merge with upstream/master 2017-02-24 16:54:27 +01:00
Dean Herbert
60d9e9f02e Merge pull request #391 from Tom94/remove-usings
Remove unnecessary using statements
2017-02-24 11:38:16 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Dean Herbert
a8135332d6 Merge pull request #392 from Tom94/refactor
Fix warnings; add "Async" suffix
2017-02-24 11:28:21 +09:00
Dean Herbert
3f49518322
Update framework. 2017-02-24 11:21:20 +09:00
Thomas Müller
0264c44a20 Do not shadow Colour in TwoLayerButton
Renames Colour to BackgroundColour instead.
2017-02-23 22:33:37 +01:00
Thomas Müller
9e8fb698c6 Remove incorrectly shadowed variable 2017-02-23 22:33:07 +01:00
Thomas Müller
37bc75a7b6 Remove unused variables 2017-02-23 22:32:49 +01:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
c3ab467e24 Merge pull request #387 from 2yangk23/master
Enable Tabbing in LoginOptions
2017-02-23 18:08:58 +09:00
Kelvin
fd622286fe Enable Tabbing in LoginOptions 2017-02-23 00:50:09 -08:00
Dean Herbert
5076ff7684 Merge pull request #386 from peppy/general-fixes
Framework updates.
2017-02-23 17:40:25 +09:00
Dean Herbert
f1538791c3
Correctly hook up window mode dropdown. 2017-02-23 17:35:14 +09:00
Dean Herbert
9bba4b66ba
Update framework. 2017-02-23 17:20:28 +09:00
Dean Herbert
6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert
f812641696 Merge pull request #383 from peppy/player-loading-screen
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
011d2cc7cc
oops 2017-02-23 16:44:59 +09:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Thomas Müller
bcb5b86392 Merge pull request #382 from peppy/general-fixes
General fixes
2017-02-22 19:21:40 +01:00
Thomas Müller
ac0b2b5aa5 Merge branch 'master' into general-fixes 2017-02-22 19:12:02 +01:00
Dean Herbert
74ea5e7343 Fix updates downloading in non-deploy builds. 2017-02-23 00:41:04 +09:00
Dean Herbert
d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
Dean Herbert
c83d2bbe6e
Make panels fade in again. 2017-02-22 21:54:49 +09:00
Dean Herbert
aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09:00
Dean Herbert
7cda82d016
Space to skip. 2017-02-22 21:28:40 +09:00
Dean Herbert
735961977b
Improve feel of spinners. 2017-02-22 18:23:06 +09:00
Dean Herbert
202976c0c3 Merge pull request #381 from peppy/general-fixes
General fixes.
2017-02-22 16:20:20 +09:00
Thomas Müller
0d3cc39cbc Merge branch 'master' into general-fixes 2017-02-22 08:01:34 +01:00
Thomas Müller
0096b8c535 Merge pull request #379 from peppy/chat-improvement
Basic ChatOverlay design implementation
2017-02-22 07:54:43 +01:00
Thomas Müller
44bedb5407 Merge branch 'master' into chat-improvement 2017-02-22 07:36:42 +01:00
Dean Herbert
2d2660c1c5
Improve transition when retrying a beatmap. 2017-02-22 14:14:37 +09:00
Dean Herbert
d00ea4564f
Fix API coming online too early in race scenarios. 2017-02-22 14:09:48 +09:00
Dean Herbert
00ddcb11b4
Fix sliders playing hitsound twice at end. 2017-02-22 13:51:40 +09:00
Dean Herbert
190bed8939
Add top padding. 2017-02-22 13:38:22 +09:00
Dean Herbert
b7a9fd85ea
Assert single channel support for now. 2017-02-22 13:38:10 +09:00
Alex Amadori
fbb16295ae Improved delegate syntax 2017-02-21 18:43:10 +01:00
Alex Amadori
3d19199218 Fixed for star difficulty 2017-02-21 18:27:39 +01:00
Alex Amadori
6c161fb167 Merge remote-tracking branch 'upstream/master' 2017-02-21 18:15:46 +01:00
Thomas Müller
c65569bcbb Merge pull request #380 from peppy/updater-fixes
Add resiliency to update process when delta patching fails.
2017-02-21 07:55:22 +01:00
Dean Herbert
afba4fbfad
Merge remote-tracking branch 'upstream/master' into chat-improvement 2017-02-21 15:46:28 +09:00
Dean Herbert
5f29b0dc4f
Update in line with framework changes. 2017-02-21 15:46:04 +09:00
Dean Herbert
b744f3a3a7
Re-nest code and handle even more potential exceptions. 2017-02-21 14:15:46 +09:00
Dean Herbert
461a22bccb
Add resiliency to update process when delta patching fails. 2017-02-21 13:52:52 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert
bc032aa0a6
Catch http errors in full update process (could happen during downloads too). 2017-02-21 12:58:56 +09:00
Alex Amadori
a6fbfc8349 Using random generator from osu-framework 2017-02-20 17:49:02 +01:00
Dean Herbert
9e1a3b5d4e Merge pull request #367 from EVAST9919/connection_fix
Fix client crash without internet connection
2017-02-20 21:37:38 +09:00
Dean Herbert
68876b4553 Merge branch 'master' into connection_fix 2017-02-20 21:33:15 +09:00
Dean Herbert
fb7e27616e Merge pull request #377 from Tom94/difficulty-calculator
Add difficulty calculation
2017-02-20 21:27:33 +09:00