Dan Balasescu
|
fe2cc4daad
|
Merge pull request #1663 from peppy/input-revamp
Apply changes in line with framework input adjustments
|
2017-12-07 18:47:40 +09:00 |
|
Dean Herbert
|
13d0524542
|
Update framework
|
2017-12-07 18:37:54 +09:00 |
|
FreezyLemon
|
1b971c01e6
|
Fixed a bug where links would be out of order in their List which would cause the game to crash
|
2017-12-07 10:31:44 +01:00 |
|
FreezyLemon
|
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 |
|
FreezyLemon
|
006ac44e11
|
Fixed up style in the ChatDisplay test
|
2017-12-07 10:29:54 +01:00 |
|
FreezyLemon
|
65afbd5c1b
|
Added new test case for URL parsing / link display in chat
|
2017-12-07 10:29:33 +01:00 |
|
FreezyLemon
|
541c25e995
|
Renamed ChatLinkSpriteText to ChatLink for convenience
|
2017-12-07 10:28:12 +01:00 |
|
FreezyLemon
|
7bf25bdd4d
|
Changed it so the ":" character does not appear after usernames when the displayed message is an action (e.g. /np). Just makes more sense imo
|
2017-12-07 10:23:57 +01:00 |
|
Dean Herbert
|
c35c8263b9
|
Merge remote-tracking branch 'upstream/master' into input-revamp
|
2017-12-07 18:07:26 +09:00 |
|
Dean Herbert
|
2a0b37e192
|
Merge pull request #1638 from Aergwyn/fix-beatmap-carousel-lag
Fix lagging beatmap carousel because of storyboard-loading
|
2017-12-07 18:04:38 +09:00 |
|
Dean Herbert
|
2a1a9b9f1f
|
Fix post-merge issue
|
2017-12-07 17:26:39 +09:00 |
|
Dean Herbert
|
44ee11e75f
|
Merge branch 'master' into fix-beatmap-carousel-lag
|
2017-12-07 15:30:50 +09:00 |
|
Dean Herbert
|
a78441bc5a
|
Apply changes in line with framework input adjustments
|
2017-12-07 13:16:59 +09:00 |
|
Dan Balasescu
|
de6d1cc647
|
Merge pull request #1660 from peppy/shader-precompile
Add shader precompile step
|
2017-12-07 04:25:15 +09:00 |
|
Dan Balasescu
|
9c4ca46786
|
Merge branch 'master' into shader-precompile
|
2017-12-07 04:15:24 +09:00 |
|
Dan Balasescu
|
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 |
|
FreezyLemon
|
94eb853d3d
|
Added centralised handling for some chat links
|
2017-12-06 16:41:57 +01:00 |
|
Dan Balasescu
|
8e3cce798d
|
Merge branch 'master' into fix-async-is-loaded
|
2017-12-06 23:01:38 +09:00 |
|
Dean Herbert
|
34596b3368
|
Rename and comment for clarification
|
2017-12-06 21:47:48 +09:00 |
|
FreezyLemon
|
b04ddba2a0
|
Added basic "on click" actions to the in-chat links
|
2017-12-06 10:27:30 +01:00 |
|
Dean Herbert
|
04ae64e9fd
|
Add missing IsCompleted check to ensureValid
|
2017-12-06 16:20:49 +09:00 |
|
Dean Herbert
|
988cc27f0e
|
Update framework
|
2017-12-06 11:59:53 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
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 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
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 |
|
FreezyLemon
|
63a6a8b669
|
Fixed messages sent by yourself not being formatted
|
2017-12-04 19:31:48 +01:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
b4641142a8
|
Update framework once more
|
2017-12-05 01:00:06 +09:00 |
|
FreezyLemon
|
bb138ccaf7
|
Added licence header and removed unnecessary whitespace
|
2017-12-04 13:55:57 +01:00 |
|
FreezyLemon
|
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 |
|
Dean Herbert
|
caee6c1cf1
|
Use Restart instead of Start
|
2017-12-04 21:40:26 +09:00 |
|
FreezyLemon
|
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 |
|
FreezyLemon
|
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 |
|
FreezyLemon
|
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 |
|
FreezyLemon
|
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 |
|
Dean Herbert
|
7649a31157
|
Update framework
|
2017-12-04 20:32:50 +09:00 |
|
Dean Herbert
|
a83add8540
|
Tidy up events
|
2017-12-04 20:30:56 +09:00 |
|
Aergwyn
|
12665fb8cf
|
remove unnecessary declaration + revert accidental formatting
|
2017-12-04 12:11:28 +01:00 |
|
Aergwyn
|
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 |
|
Dean Herbert
|
22656233d3
|
Merge branch 'master' into fix-playlist-audio-issue
|
2017-12-04 19:24:03 +09:00 |
|
Dean Herbert
|
58777a9674
|
Merge pull request #1636 from smoogipoo/editor-composer
Implement structure for Editor HitObject composition
|
2017-12-04 13:05:27 +09:00 |
|
Dean Herbert
|
d75db5046b
|
Merge branch 'master' into editor-composer
|
2017-12-04 12:41:40 +09:00 |
|
Dean Herbert
|
23c0bec678
|
Merge pull request #1653 from smoogipoo/osuscreen-exit
Add OnKeyDown override to OsuScreen
|
2017-12-04 11:51:36 +09:00 |
|
smoogipoo
|
7cfe694a3f
|
Update framework
|
2017-12-04 11:37:19 +09:00 |
|
smoogipoo
|
5f9de399e4
|
Add keydown override
|
2017-12-04 11:30:25 +09:00 |
|
FreezyLemon
|
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 |
|
FreezyLemon
|
a839d0e91d
|
LoadComponent before assigning URL to ensure dependency loading
|
2017-12-03 23:55:00 +01:00 |
|
FreezyLemon
|
3f336b8e61
|
Made the style a bit better, fixed a bug or two
|
2017-12-03 21:02:05 +01:00 |
|
FreezyLemon
|
2d270a1cfe
|
Added ability to open other channels from chat links.
|
2017-12-03 20:45:30 +01:00 |
|