Dean Herbert
|
cc0f61f545
|
Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
|
2016-11-12 20:18:26 +09:00 |
|
Drew DeVault
|
ee24cd310c
|
Convert everything to DI pattern
|
2016-11-10 16:41:18 -05:00 |
|
Dean Herbert
|
b86f308af6
|
Add async workflow.
|
2016-11-01 23:24:14 +09:00 |
|
Dean Herbert
|
28a41dcca6
|
Fix FlowContainers.
|
2016-10-22 18:05:46 +09:00 |
|
Dean Herbert
|
cdef75c98b
|
Fix AutoSize references.
|
2016-10-22 17:50:42 +09:00 |
|
Thomas Müller
|
7751a85e14
|
Update framework.
|
2016-10-16 14:10:06 +02:00 |
|
Huo Yaoyuan
|
aad5c6a44d
|
Use DateTimeOffset for message timestamp.
|
2016-10-13 21:42:51 +08:00 |
|
Dean Herbert
|
8707c7f746
|
Fix regression causing multi-line (wrapped) chat messages to overlap.
|
2016-10-13 03:06:06 +09:00 |
|
Dean Herbert
|
aa96d98822
|
Merge branch 'master' into limit-game-access
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
osu.Game/GameModes/Menu/ButtonSystem.cs
osu.Game/Online/Chat/Display/ChatLine.cs
osu.Game/OsuGame.cs
osu.Game/Overlays/ToolbarButton.cs
|
2016-10-12 20:44:33 +09:00 |
|
Dean Herbert
|
4052a665bf
|
Remove all non-load Game access.
|
2016-10-12 15:47:08 +09:00 |
|
Dean Herbert
|
1c0b769451
|
Centralise the maximum chat history variable.
|
2016-10-12 15:25:07 +09:00 |
|
Dean Herbert
|
05031d18ef
|
Fix some display regressions in ChatConsole.
|
2016-10-12 13:35:21 +09:00 |
|
Dean Herbert
|
c0ea061bd4
|
Update framework; amend ToolbarButton to use padding and Children initialiser.
|
2016-10-12 12:24:07 +09:00 |
|
Dean Herbert
|
97c2dcf590
|
Use PaddingContainer for better layout.
|
2016-10-08 23:25:38 +09:00 |
|
Dean Herbert
|
47faf8f40d
|
Add in-game chat display, along with a global hotkey handling method.
|
2016-10-08 19:23:21 +09:00 |
|
Dean Herbert
|
3067c890ce
|
General improvements to chat querying and logic organisation.
|
2016-10-08 19:23:21 +09:00 |
|
Dean Herbert
|
ac16bffe49
|
Bring framework and resources up-to-date.
|
2016-10-01 19:05:26 +09:00 |
|
Dean Herbert
|
b4c9dca54b
|
Merge remote-tracking branch 'upstream/master' into api-channels-messages
Conflicts:
osu.Game/Online/Chat/Message.cs
|
2016-09-29 23:54:33 +09:00 |
|
Dean Herbert
|
a69c5b4fc0
|
Fix a few warnings.
|
2016-09-29 23:46:27 +09:00 |
|
Dean Herbert
|
7c98ef1b3d
|
Move initialisation of ChatLine to Load.
|
2016-09-28 16:33:20 +09:00 |
|
Dean Herbert
|
67652a6d8e
|
Improve formatting of chat lines.
|
2016-09-27 20:45:26 +09:00 |
|
Dean Herbert
|
754d9c78bd
|
Simple chat message display functionality.
|
2016-09-27 19:22:22 +09:00 |
|
Dean Herbert
|
28045b7136
|
Add back basic API support for channel/message retrieval.
|
2016-09-27 18:33:52 +09:00 |
|
Dean Herbert
|
8870935a4b
|
Add basic online API support.
|
2016-08-31 20:14:01 +09:00 |
|