Commit Graph

1294 Commits

Author SHA1 Message Date
d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
aef0eb49a1 Add loading screen. 2017-02-22 21:53:59 +09:00
0d3cc39cbc Merge branch 'master' into general-fixes 2017-02-22 08:01:34 +01:00
44bedb5407 Merge branch 'master' into chat-improvement 2017-02-22 07:36:42 +01:00
2d2660c1c5 Improve transition when retrying a beatmap. 2017-02-22 14:14:37 +09:00
d00ea4564f Fix API coming online too early in race scenarios. 2017-02-22 14:09:48 +09:00
190bed8939 Add top padding. 2017-02-22 13:38:22 +09:00
b7a9fd85ea Assert single channel support for now. 2017-02-22 13:38:10 +09:00
afba4fbfad Merge remote-tracking branch 'upstream/master' into chat-improvement 2017-02-21 15:46:28 +09:00
5f29b0dc4f Update in line with framework changes. 2017-02-21 15:46:04 +09:00
cbd061d573 Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
aedce4d516 Merge remote-tracking branch 'upstream/master' into difficulty-calculator 2017-02-20 21:20:56 +09:00
6a83620589 Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
e3fa49dda7 Naively "send" messages that the user types (doesn't arrive yet). 2017-02-20 21:10:43 +09:00
4afa434962 Maintain a scroll position when scrolled to the bottom of a chat channel. 2017-02-20 21:10:23 +09:00
75b66871dd Add colourised usernames. 2017-02-20 21:09:56 +09:00
7a2eedbd7e Add message batching per-channel. 2017-02-20 21:09:34 +09:00
729f2eec8d Increase maximum chat history. 2017-02-20 21:07:44 +09: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
a621a65eb5 Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:31:15 +09:00
737bd62c30 Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:27:48 +09: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
c6fa5cc803 Fix order of execution when populating initial messages. 2017-02-19 18:46:19 +09:00
de87141e90 Remove unused using statements. 2017-02-19 18:39:54 +09:00
cde660a8ef Scroll to bottom. 2017-02-19 18:07:35 +09:00
aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
520e040396 Add FocusedTextBox abstraction. 2017-02-19 17:59:22 +09:00
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09: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
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
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
94dd268fd2 Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
bf33cc6f53 Make disclaimer actually be a thing. 2017-02-18 14:16:46 +09:00
ef775458dd Fix compilation error introduced in merge conflict resolution. 2017-02-17 21:27:17 +01:00
04de28d8b2 Merge branch 'refs/heads/update-framework' into general-fixes 2017-02-17 21:26:39 +01:00
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
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
7a45ea58b2 Add comment explaining why the branch is necessary 2017-02-17 18:17:18 +01:00
72306e8757 Fix beatmap import crash when the first timingPoint starts later than a slider 2017-02-17 17:36:00 +01:00
fe3a6248ec Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
e6ef9f67aa GameMode -> Screen. 2017-02-17 19:23:58 +09:00