Commit Graph

11064 Commits

Author SHA1 Message Date
eaffd496f2 Merge pull request #1661 from peppy/fix-async-is-loaded
Fix IsValueCreated method not checking whether the async task was completed
2017-12-07 01:28:28 +09:00
94eb853d3d Added centralised handling for some chat links 2017-12-06 16:41:57 +01:00
8e3cce798d Merge branch 'master' into fix-async-is-loaded 2017-12-06 23:01:38 +09:00
34596b3368 Rename and comment for clarification 2017-12-06 21:47:48 +09:00
b04ddba2a0 Added basic "on click" actions to the in-chat links 2017-12-06 10:27:30 +01:00
ed5f7e5353 Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder 2017-12-06 16:28:34 +09:00
f9e34dfa3d Assume that control points are already sequentially-ordered
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
04ae64e9fd Add missing IsCompleted check to ensureValid 2017-12-06 16:20:49 +09:00
887b81148d Don't ignore RulesetId for now 2017-12-06 14:14:07 +09:00
44edb8724f Add JsonIgnores to CommandTimelineGroup 2017-12-06 13:48:44 +09:00
988cc27f0e Update framework 2017-12-06 11:59:53 +09:00
15ed3b4aac Fix IsValueCreated method not cecking whether the async task was completed
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
e199ee5225 Add a few xmldocs 2017-12-06 00:42:17 +09:00
d2dc7c8937 Add OsuJsonDecoder 2017-12-06 00:38:12 +09:00
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
fb6408257a Add shader precompile step
Resolves  https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
abf5f3b390 Merge pull request #1658 from peppy/add-wait-for-restart
Wait until track has restarted before continuing operation
2017-12-05 14:24:25 +09:00
c1b607fed9 Wait until track has restarted before continuing operation
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
63a6a8b669 Fixed messages sent by yourself not being formatted 2017-12-04 19:31:48 +01:00
634700fae5 Merge pull request #1649 from Aergwyn/fix-playlist-audio-issue
Fix MusicController constantly trying to start a track
2017-12-05 01:11:13 +09:00
b4641142a8 Update framework once more 2017-12-05 01:00:06 +09: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
caee6c1cf1 Use Restart instead of Start 2017-12-04 21:40:26 +09:00
fd13bacf4a Made default link ID -1 (if no link is present) because linkId is currently being set to link.index which can be 0. 2017-12-04 13:34:16 +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
dcdc186a53 Added chatoverlay caching to testcase so test still works (chat needs to be injected so channels can be opened) 2017-12-04 13:27:14 +01:00
7649a31157 Update framework 2017-12-04 20:32:50 +09:00
a83add8540 Tidy up events 2017-12-04 20:30:56 +09:00
12665fb8cf remove unnecessary declaration + revert accidental formatting 2017-12-04 12:11:28 +01:00
011223048b fix crash if any amount of maps were restored from main menu
also fixes preview not playing if an entire set is restored
2017-12-04 11:47:27 +01:00
22656233d3 Merge branch 'master' into fix-playlist-audio-issue 2017-12-04 19:24:03 +09:00
58777a9674 Merge pull request #1636 from smoogipoo/editor-composer
Implement structure for Editor HitObject composition
2017-12-04 13:05:27 +09:00
d75db5046b Merge branch 'master' into editor-composer 2017-12-04 12:41:40 +09:00
23c0bec678 Merge pull request #1653 from smoogipoo/osuscreen-exit
Add OnKeyDown override to OsuScreen
2017-12-04 11:51:36 +09:00
7cfe694a3f Update framework 2017-12-04 11:37:19 +09:00
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09: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
14096c90cc removed looping if only one song is in the list (temporarily)
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00
0c9ebcd58c fix possible NullRef 2017-12-03 14:15:08 +01:00
a1dbd7916b fixes MusicController constantly trying to start a track
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
c574cc4308 Removed unnecessary "using" statements 2017-12-03 11:16:34 +01:00
735dbddd17 Changed URL detection to be more reliable and generally work better 2017-12-03 06:52:57 +01:00
7957e55710 Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00