Commit Graph

1833 Commits

Author SHA1 Message Date
6c161fb167 Merge remote-tracking branch 'upstream/master' 2017-02-21 18:15:46 +01:00
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
b744f3a3a7 Re-nest code and handle even more potential exceptions. 2017-02-21 14:15:46 +09:00
461a22bccb Add resiliency to update process when delta patching fails. 2017-02-21 13:52:52 +09:00
cbd061d573 Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
bc032aa0a6 Catch http errors in full update process (could happen during downloads too). 2017-02-21 12:58:56 +09:00
a6fbfc8349 Using random generator from osu-framework 2017-02-20 17:49:02 +01:00
9e1a3b5d4e Merge pull request #367 from EVAST9919/connection_fix
Fix client crash without internet connection
2017-02-20 21:37:38 +09:00
68876b4553 Merge branch 'master' into connection_fix 2017-02-20 21:33:15 +09:00
fb7e27616e Merge pull request #377 from Tom94/difficulty-calculator
Add difficulty calculation
2017-02-20 21:27:33 +09:00
aedce4d516 Merge remote-tracking branch 'upstream/master' into difficulty-calculator 2017-02-20 21:20:56 +09:00
86a3d7b2c0 Merge pull request #378 from peppy/general-fixes
Fix GlobalHotkeys not working (regression due to masking rules).
2017-02-20 08:00:17 +01:00
444c3ba817 Merge branch 'master' into difficulty-calculator 2017-02-20 07:38:10 +01:00
1ead694c75 Merge branch 'master' into general-fixes 2017-02-20 07:37:31 +01:00
5916efd1c2 Merge pull request #373 from Jorolf/MoreOptions
Enable Parallax Option
2017-02-20 15:36:58 +09:00
a621a65eb5 Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:31:15 +09:00
7d08ccaae4 Update framework. 2017-02-20 15:30:58 +09:00
a0d0c1854b Merge remote-tracking branch 'upstream/master' 2017-02-19 19:09:55 +01:00
7a0cea332f Add support for varying circle size 2017-02-19 18:21:45 +01:00
502ad4aa53 Fix incorrect naming scheme 2017-02-19 18:21:15 +01:00
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
1e0a694ff8 replaced bool with Bindable<bool>
Also accounted for the ParallaxAmount when moving to default position
2017-02-19 17:11:36 +01:00
7f751d3653 Update ParallaxContainer.cs 2017-02-19 16:54:00 +01:00
e83ac8b04c Removed public ParallaxEnabled property 2017-02-19 13:47:26 +01:00
3106c52098 Removed unnecessary references 2017-02-19 13:25:41 +03:00
bd4af69461 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-19 13:10:34 +03:00
f166bb0f96 Moved movement to the default position to property 2017-02-18 22:26:48 +01:00
77bfe57d8c compacted code, made public bool to disable it 2017-02-18 22:00:07 +01:00
a48e4a31a7 Parallax Option works now 2017-02-18 21:34:21 +01:00
353581bf16 Merge remote-tracking branch 'refs/remotes/ppy/master' into MoreOptions 2017-02-18 21:13:28 +01:00
87ec0e36ea Complying with rule "Instance fields (private)" 2017-02-18 16:45:46 +01:00
5721e7f2d2 Merge pull request #371 from peppy/general-fixes
Update framework.
2017-02-18 16:33:09 +01:00
837992d112 Update framework. 2017-02-19 00:27:00 +09:00
21cf96ec10 More sorting rookie mistakes 2017-02-18 16:23:13 +01:00
a53695347f Merge pull request #370 from peppy/general-fixes
General fixes.
2017-02-18 16:14:57 +01:00
f48c83b787 Fix silly sorting mistakes 2017-02-18 15:56:29 +01:00
d92382c1aa Merge remote-tracking branch 'upstream/master' 2017-02-18 15:18:26 +01:00
6bbbbd8f96 Implemented sorting in TestCasePlaySong 2017-02-18 15:11:40 +01:00
c1194102b1 Remove second sample playback when clicking osu! logo. 2017-02-18 22:33:24 +09:00
ebc38917dc Fix options sidebar not displaying correclty. 2017-02-18 22:29:20 +09:00
f028188398 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-18 13:47:45 +03:00
e803564b5a Added the specific exception 2017-02-18 13:46:47 +03:00
b92726c8ee Merge pull request #369 from peppy/general-fixes
General fixes.
2017-02-18 09:50:48 +01:00
1524b89753 Bump framework. 2017-02-18 17:44:49 +09:00
78c9348b5a Make accuracy fixed width and improve feel. 2017-02-18 17:35:54 +09:00
1a31589abd Add padding zeroes to score display (and fix not being applied initially). 2017-02-18 17:35:37 +09:00
32ce8cf723 Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
1cd93f79b3 General sorting improvements 2017-02-18 07:59:01 +01:00
7a29603800 Merge pull request #365 from peppy/general-fixes
Better screen hierarchy
2017-02-18 07:58:03 +01:00
cf8b6c0697 Fix backgrounds in TestCasePlayer dimming to gray instead of black. 2017-02-18 15:54:26 +09:00