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

1823 Commits

Author SHA1 Message Date
Dean Herbert
00ddcb11b4
Fix sliders playing hitsound twice at end. 2017-02-22 13:51:40 +09: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
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
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
Dean Herbert
aedce4d516
Merge remote-tracking branch 'upstream/master' into difficulty-calculator 2017-02-20 21:20:56 +09:00
Thomas Müller
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
Thomas Müller
444c3ba817 Merge branch 'master' into difficulty-calculator 2017-02-20 07:38:10 +01:00
Thomas Müller
1ead694c75 Merge branch 'master' into general-fixes 2017-02-20 07:37:31 +01:00
Dean Herbert
5916efd1c2 Merge pull request #373 from Jorolf/MoreOptions
Enable Parallax Option
2017-02-20 15:36:58 +09:00
Dean Herbert
a621a65eb5
Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:31:15 +09:00
Dean Herbert
7d08ccaae4
Update framework. 2017-02-20 15:30:58 +09:00
Thomas Müller
7a0cea332f Add support for varying circle size 2017-02-19 18:21:45 +01:00
Thomas Müller
502ad4aa53 Fix incorrect naming scheme 2017-02-19 18:21:15 +01:00
Thomas Müller
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
Jorolf
1e0a694ff8 replaced bool with Bindable<bool>
Also accounted for the ParallaxAmount when moving to default position
2017-02-19 17:11:36 +01:00
Jorolf
7f751d3653 Update ParallaxContainer.cs 2017-02-19 16:54:00 +01:00
Jorolf
e83ac8b04c Removed public ParallaxEnabled property 2017-02-19 13:47:26 +01:00
Andrey Zavadskiy
3106c52098 Removed unnecessary references 2017-02-19 13:25:41 +03:00
Andrey Zavadskiy
bd4af69461 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-19 13:10:34 +03:00
Jorolf
f166bb0f96 Moved movement to the default position to property 2017-02-18 22:26:48 +01:00
Jorolf
77bfe57d8c compacted code, made public bool to disable it 2017-02-18 22:00:07 +01:00
Jorolf
a48e4a31a7 Parallax Option works now 2017-02-18 21:34:21 +01:00
Jorolf
353581bf16 Merge remote-tracking branch 'refs/remotes/ppy/master' into MoreOptions 2017-02-18 21:13:28 +01:00
Thomas Müller
5721e7f2d2 Merge pull request #371 from peppy/general-fixes
Update framework.
2017-02-18 16:33:09 +01:00
Dean Herbert
837992d112
Update framework. 2017-02-19 00:27:00 +09:00
Thomas Müller
a53695347f Merge pull request #370 from peppy/general-fixes
General fixes.
2017-02-18 16:14:57 +01:00
Dean Herbert
c1194102b1
Remove second sample playback when clicking osu! logo. 2017-02-18 22:33:24 +09:00
Dean Herbert
ebc38917dc
Fix options sidebar not displaying correclty. 2017-02-18 22:29:20 +09:00
Andrey Zavadskiy
f028188398 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-18 13:47:45 +03:00
Andrey Zavadskiy
e803564b5a Added the specific exception 2017-02-18 13:46:47 +03:00
Thomas Müller
b92726c8ee Merge pull request #369 from peppy/general-fixes
General fixes.
2017-02-18 09:50:48 +01:00
Dean Herbert
1524b89753
Bump framework. 2017-02-18 17:44:49 +09:00
Dean Herbert
78c9348b5a
Make accuracy fixed width and improve feel. 2017-02-18 17:35:54 +09:00
Dean Herbert
1a31589abd
Add padding zeroes to score display (and fix not being applied initially). 2017-02-18 17:35:37 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Thomas Müller
7a29603800 Merge pull request #365 from peppy/general-fixes
Better screen hierarchy
2017-02-18 07:58:03 +01:00
Dean Herbert
cf8b6c0697
Fix backgrounds in TestCasePlayer dimming to gray instead of black. 2017-02-18 15:54:26 +09:00
Dean Herbert
94dd268fd2
Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing. 2017-02-18 14:16:46 +09:00
Dean Herbert
76cab600d9
Update framework. 2017-02-18 13:23:53 +09:00
Thomas Müller
ef775458dd Fix compilation error introduced in merge conflict resolution. 2017-02-17 21:27:17 +01:00
Thomas Müller
04de28d8b2 Merge branch 'refs/heads/update-framework' into general-fixes 2017-02-17 21:26:39 +01:00
Thomas Müller
1198705a6f Merge branch 'master' of github.com:ppy/osu into general-fixes
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2017-02-17 21:22:34 +01:00
Thomas Müller
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
Andrey Zavadskiy
2f4855b00f Added exception 2017-02-17 21:07:59 +03:00