Dean Herbert
|
8025a97b2b
|
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
|
2019-05-21 17:18:23 +09:00 |
|
Dan Balasescu
|
2024cdf16d
|
Merge branch 'master' into hover-container-disabled-hover-effect
|
2019-05-21 17:04:50 +09:00 |
|
Dan Balasescu
|
ad2a495dbc
|
Merge branch 'master' into screen-title-custom-icon
|
2019-05-21 15:56:56 +09:00 |
|
Dean Herbert
|
d09101b43c
|
Merge remote-tracking branch 'upstream/master' into hover-container-disabled-hover-effect
|
2019-05-21 15:02:44 +09:00 |
|
Dean Herbert
|
5ed1540a12
|
Handle unhover state change better
|
2019-05-21 15:02:31 +09:00 |
|
Dan Balasescu
|
67ac76aae7
|
Merge branch 'master' into move-tooltip-text
|
2019-05-21 15:00:09 +09:00 |
|
Dean Herbert
|
e0da919fe9
|
Allow custom icon specification in ScreenTitle
Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
|
2019-05-21 14:10:21 +09:00 |
|
Dean Herbert
|
587e4bb5d5
|
Remove unnecessary getters from ScreenTitle
|
2019-05-21 14:10:16 +09:00 |
|
Dean Herbert
|
89e62c3d30
|
Only play OsuHoverContainer hover effect if action is present
|
2019-05-21 14:07:40 +09:00 |
|
Dean Herbert
|
e7c8c4f787
|
Fix incorrectly changed colour
|
2019-05-21 14:02:17 +09:00 |
|
Dean Herbert
|
247dad7e86
|
Use OsuColour for profile overlay
|
2019-05-21 13:54:19 +09:00 |
|
Dean Herbert
|
bc962bf8f0
|
Move TooltipText to OsuClickableContainer
|
2019-05-21 13:51:38 +09:00 |
|
Dean Herbert
|
808b45ac64
|
Allow custom icon specification in ScreenTitle
Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
|
2019-05-21 11:50:03 +09:00 |
|
Dean Herbert
|
6c26d6fdf9
|
Remove unnecessary getters from ScreenTitle
|
2019-05-21 11:13:36 +09:00 |
|
Dean Herbert
|
455301de2c
|
Use OsuColour for profile overlay
|
2019-05-20 15:58:40 +09:00 |
|
Dean Herbert
|
dae315ec0a
|
Move TooltipText to OsuClickableContainer
|
2019-05-19 11:28:24 +09:00 |
|
Dean Herbert
|
3fa1545ea4
|
Huge refactor pass focusing on ChangelogContent
|
2019-05-19 02:09:08 +09:00 |
|
Dean Herbert
|
9bc3aa3d46
|
Move new classes for now
|
2019-05-17 19:15:25 +09:00 |
|
Dean Herbert
|
dbc42fd59e
|
Remove StreamColour class and implement locally
|
2019-05-17 18:31:53 +09:00 |
|
Dean Herbert
|
5d33a742c6
|
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
|
2019-05-16 18:55:28 +09:00 |
|
Dean Herbert
|
409d89eecf
|
Match header titles with web (pt size)
|
2019-05-16 18:53:52 +09:00 |
|
Dan Balasescu
|
29a415de48
|
Merge branch 'master' into TextLengthLimit
|
2019-05-15 19:21:01 +09:00 |
|
Dean Herbert
|
cc558cf073
|
Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay
|
2019-05-14 13:36:17 +09:00 |
|
Dean Herbert
|
4abe987e11
|
Add new colour palette
|
2019-05-14 13:28:16 +09:00 |
|
Dean Herbert
|
27ca094421
|
Update outdated licence headers
|
2019-05-13 17:14:52 +09:00 |
|
Dean Herbert
|
31b72f168d
|
Fix deprecated calls and code styling (partly)
|
2019-05-13 00:46:22 +09:00 |
|
Dean Herbert
|
34f54aa945
|
Resolve compile-time issues
|
2019-05-13 00:36:05 +09:00 |
|
Dean Herbert
|
943e1574a4
|
Merge branch 'master' into changelog-overlay
|
2019-05-13 00:24:18 +09:00 |
|
smoogipoo
|
13b9b04bb8
|
Apply more cases/fix some existing ones
|
2019-05-07 13:23:09 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dean Herbert
|
fa340a9eff
|
Merge branch 'master' into profile-header-update
|
2019-04-27 23:48:23 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
3b0d4c1bad
|
Merge branch 'turn-on-warnings' into profile-header-update
|
2019-04-25 17:43:10 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
smoogipoo
|
4106da2430
|
Rename facade + cleanup usage
|
2019-04-17 17:05:33 +09:00 |
|
smoogipoo
|
3a1587fa53
|
Throw exception when not relatively positioned
|
2019-04-17 17:04:11 +09:00 |
|
smoogipoo
|
9f92b3a8ba
|
Add xmldoc
|
2019-04-17 16:34:53 +09:00 |
|
jorolf
|
c1db635933
|
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
|
2019-04-09 20:42:39 +02:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
David Zhao
|
8a01995668
|
Remove need for tracking bool and backing logo
|
2019-04-08 16:14:41 +09:00 |
|
David Zhao
|
376bed3a30
|
Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container
|
2019-04-08 15:24:59 +09:00 |
|
David Zhao
|
a690302d00
|
Apply reviews
|
2019-04-08 15:24:09 +09:00 |
|
Dan Balasescu
|
d7655bc579
|
Use .Value instead of cast
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
|
2019-04-08 11:22:01 +09:00 |
|
Dean Herbert
|
46ecaf3d6c
|
Merge branch 'master' into facade-container
|
2019-04-05 21:14:21 +09:00 |
|
David Zhao
|
e06fe7950b
|
Cleanup
|
2019-04-05 15:06:37 +09:00 |
|
David Zhao
|
5fa93f4a05
|
Add test for checking exception
|
2019-04-05 15:05:11 +09:00 |
|
smoogipoo
|
15fbb6f176
|
Use common AddUserLink method
|
2019-04-05 14:15:36 +09:00 |
|
David Zhao
|
b1d74e57e5
|
Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size
|
2019-04-05 13:56:08 +09:00 |
|
David Zhao
|
7047f305a1
|
Apply reviews, add safety for multiple facades
|
2019-04-05 12:02:47 +09:00 |
|
David Zhao
|
6f5e9fe50d
|
Correct xmldoc
|
2019-04-04 13:33:13 +09:00 |
|