Commit Graph

2395 Commits

Author SHA1 Message Date
8787b0dc90 Remove a lot of constants (use object initialisers instead). 2017-02-23 12:17:59 +09:00
521a9b7728 Remove need for waves array; use generic container. 2017-02-23 11:26:50 +09:00
d154cf7938 Abstract wave logic to class. 2017-02-23 11:22:01 +09:00
9f367bcc0e Fix line endings. 2017-02-23 11:16:23 +09:00
9746877903 Merge remote-tracking branch 'upstream/master' into mod-overlay 2017-02-23 11:11:52 +09:00
7e7bf07d03 Remove unused whitebox. 2017-02-23 11:11:46 +09:00
79ff96de0d Typo 2017-02-22 16:38:36 -04:00
a58a0a4edf Fix transition stutter 2017-02-22 16:37:58 -04:00
cf5258ceb0 Thanks refactoring 2017-02-22 13:17:06 -04:00
bf1d13e734 Comply to formatting style 2017-02-22 13:12:39 -04:00
8cd7ebcb43 readonly -> const 2017-02-22 13:03:19 -04:00
416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
bac0431102 Fixed build failing 2017-02-22 12:28:34 -04:00
cc956bc8ec Newline 2017-02-22 12:23:46 -04:00
584a514267 Cleanup part 2 2017-02-22 12:22:29 -04:00
4821f323b8 Cleanup 2017-02-22 12:12:41 -04:00
337a1004d3 Made mod disabling better 2017-02-22 11:34:22 -04:00
d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
c83d2bbe6e Make panels fade in again. 2017-02-22 21:54:49 +09:00
aef0eb49a1 Add loading screen. 2017-02-22 21:53:59 +09:00
7cda82d016 Space to skip. 2017-02-22 21:28:40 +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
3d19199218 Fixed for star difficulty 2017-02-21 18:27:39 +01:00
6c161fb167 Merge remote-tracking branch 'upstream/master' 2017-02-21 18:15:46 +01: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
a0d0c1854b Merge remote-tracking branch 'upstream/master' 2017-02-19 19:09:55 +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
c6fa5cc803 Fix order of execution when populating initial messages. 2017-02-19 18:46:19 +09:00