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

1888 Commits

Author SHA1 Message Date
Dean Herbert
aedce4d516
Merge remote-tracking branch 'upstream/master' into difficulty-calculator 2017-02-20 21:20:56 +09:00
Dean Herbert
6a83620589
Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
Dean Herbert
e3fa49dda7
Naively "send" messages that the user types (doesn't arrive yet). 2017-02-20 21:10:43 +09:00
Dean Herbert
4afa434962
Maintain a scroll position when scrolled to the bottom of a chat channel. 2017-02-20 21:10:23 +09:00
Dean Herbert
75b66871dd
Add colourised usernames. 2017-02-20 21:09:56 +09:00
Dean Herbert
7a2eedbd7e
Add message batching per-channel. 2017-02-20 21:09:34 +09:00
Dean Herbert
729f2eec8d
Increase maximum chat history. 2017-02-20 21:07:44 +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
Dean Herbert
737bd62c30
Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:27:48 +09:00
Alex Amadori
a0d0c1854b Merge remote-tracking branch 'upstream/master' 2017-02-19 19:09:55 +01: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
Dean Herbert
d13b82d073 Update framework. 2017-02-19 23:04:21 +09: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
Dean Herbert
c6fa5cc803 Fix order of execution when populating initial messages. 2017-02-19 18:46:19 +09:00
Dean Herbert
de87141e90 Remove unused using statements. 2017-02-19 18:39:54 +09:00
Dean Herbert
cde660a8ef Scroll to bottom. 2017-02-19 18:07:35 +09:00
Dean Herbert
aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
Dean Herbert
520e040396 Add FocusedTextBox abstraction. 2017-02-19 17:59:22 +09:00
Dean Herbert
2a099bb56c Stop TestCaseChatDisplay basically reimplementing ChatOverlay. 2017-02-19 17:06:51 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09: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
Alex Amadori
87ec0e36ea Complying with rule "Instance fields (private)" 2017-02-18 16:45:46 +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
Alex Amadori
21cf96ec10 More sorting rookie mistakes 2017-02-18 16:23:13 +01:00
Thomas Müller
a53695347f Merge pull request #370 from peppy/general-fixes
General fixes.
2017-02-18 16:14:57 +01:00
Alex Amadori
f48c83b787 Fix silly sorting mistakes 2017-02-18 15:56:29 +01:00
Alex Amadori
d92382c1aa Merge remote-tracking branch 'upstream/master' 2017-02-18 15:18:26 +01:00
Alex Amadori
6bbbbd8f96 Implemented sorting in TestCasePlaySong 2017-02-18 15:11:40 +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