Commit Graph

2067 Commits

Author SHA1 Message Date
af86220dcc Merge remote-tracking branch 'origin/master' into update-branch 2018-01-05 12:08:50 +09:00
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
d167663340 Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
faf1181fc3 Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01:00
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
e332683d18 Fix music controller draggability 2017-12-30 21:10:40 +09:00
442a649c63 Make all FocusedOverlays hide on clicks outside of themselves
Also allows wheel events to pass through around them.
2017-12-30 20:45:41 +09:00
ae79be7b51 small style fixes plus new assert in test 2017-12-28 21:45:58 +01:00
7454633f63 Refactor and general tidying up 2017-12-28 20:11:21 +01:00
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
cbfef7052e further CI adjustments 2017-12-25 21:02:48 +01:00
962e4d7c8a Removed LinkId and word wrapping (for now).
Also reimplemented the OsuHoverContainer properly
2017-12-25 20:46:04 +01:00
a30448095e Merge branch 'master' into url-parsing-support 2017-12-25 19:12:23 +01:00
1a318c5c2b Improve LineGraph invalidation logic 2017-12-22 18:58:35 +09:00
fc0b97065c Move hover sound/container to base implementation 2017-12-20 15:54:13 +09:00
a6496e35ec Merge branch 'master' into url-parsing-support 2017-12-20 14:41:12 +09:00
270d81f816 Made the Link's OnClick() Method return true 2017-12-19 19:37:43 +01:00
cf640d084e Use using 2017-12-18 16:38:15 +09:00
846750a190 Remove unnecessary flag 2017-12-18 16:36:11 +09:00
8fdaf6f8f4 Restructure DialogButton to support selection 2017-12-18 14:47:17 +09:00
fd9d900ae0 Simplify StarCounter and SpriteIcon 2017-12-15 18:40:03 +09:00
d0b7c92b46 Removed unnecessary usings. 2017-12-11 13:46:23 +01:00
bb0a32b555 Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization. 2017-12-11 11:28:16 +01:00
4d475f1c1b Changed it so ChatLinks handle hover and click sounds themselves 2017-12-11 11:05:32 +01:00
13bc50ad56 Removed ICanDisableHoverSounds interface 2017-12-11 10:42:36 +01:00
5546b8c316 Trimmed whitespace (CI) 2017-12-07 19:55:29 +01:00
68255095a6 Renamed the IHasHoverSounds interface to ICanDisableHoverSounds and made it so that if the interface is not implemented, it is just ignored (samples will always be played). If it is implemented, the ShouldPlayHoverSound bool is decisive of whether sounds are played or not 2017-12-07 19:52:40 +01:00
e05618a415 Removed unnecessary "using" directives 2017-12-07 19:36:56 +01:00
2ceb073b5d Renamed OnClick to OnLinkClicked to (what should be) obvious reasons 2017-12-07 16:30:15 +01:00
2129d6cede Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.
Also fixed the tooltip text up
2017-12-07 16:23:43 +01:00
ca40db2b97 Fixed a bug where the hover wouldn't work correctly due to OsuLinkSpriteText assigning Action to a private property. 2017-12-07 13:57:29 +01:00
a8599a1b75 Implemented new interface which allows parent containers to decide on whether a "OnHover" sound should be played. 2017-12-07 13:12:36 +01:00
ec8b5c2465 Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions 2017-12-07 10:31:02 +01:00
94eb853d3d Added centralised handling for some chat links 2017-12-06 16:41:57 +01:00
b04ddba2a0 Added basic "on click" actions to the in-chat links 2017-12-06 10:27:30 +01:00
bb138ccaf7 Added licence header and removed unnecessary whitespace 2017-12-04 13:55:57 +01:00
9b866d2248 Made it so the link ID is always added before loading the SpriteTexts (fixed weird bug where some sprites would be white instead of blue). Also improved XML doc on TextColour 2017-12-04 13:46:07 +01:00
cf96323980 Added new OsuLinkSpriteText.TextColour property that sets the internal content (OsuHoverContainer)'s colour instead of the whole container, so that text colour is always changed through that (e.g. link colouring, link hover fade).
Implemented it to be used when adding text to an OsuLinkTextFlowContainer.
2017-12-04 13:33:42 +01:00
319f43e209 Added "getIdFromUrl" call back to content.action because performance impact is small and no unnecessary id calculations are done 2017-12-04 13:29:56 +01:00
bf97f8b1b1 Added osu.ppy.sh/ss (screenshot) URL handling and calculate ID at assignment so it's not on click anymore 2017-12-03 23:55:34 +01:00
a839d0e91d LoadComponent before assigning URL to ensure dependency loading 2017-12-03 23:55:00 +01:00
3f336b8e61 Made the style a bit better, fixed a bug or two 2017-12-03 21:02:05 +01:00
2d270a1cfe Added ability to open other channels from chat links. 2017-12-03 20:45:30 +01:00
735dbddd17 Changed URL detection to be more reliable and generally work better 2017-12-03 06:52:57 +01:00
6d9dcc6691 Added all files to the .csproj and also introduced basic action filtering when you set the URL on an OsuLinkSpriteText object 2017-12-02 09:48:55 +01:00
86302716a6 Also moved LinkText to its own file so the chat could reuse it (ProfileHeader's private class ProfileLink also still inherits from this, though) 2017-12-01 20:32:08 +01:00
1f1c7dd70f Moved LinkFlowContainer out of ProfileHeader to make it available for other uses too (e.g. chat) and renamed it to LinkTextFlowContainer bc it can contain both links and text, not only one 2017-12-01 20:26:51 +01:00
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00