Commit Graph

227 Commits

Author SHA1 Message Date
smoogipoo cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
smoogipoo f0d7728e81 Fix failures with a null-model 2019-05-23 17:01:22 +09:00
smoogipoo 7971261fbc Don't create a new drawable for the first background 2019-05-23 15:59:22 +09:00
smoogipoo a00e2b18a9 Fix background unloading/reloading sometimes crashing 2019-05-07 17:24:05 +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
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
Dean Herbert f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
Dean Herbert 59897bbeb5 Refactor UpdateableBeatmapBackground lookup logic for clarity
Closes #4401. Alternative to #4439.
2019-03-11 19:00:39 +09:00
Jamie Taylor ab0ac7a82a
Pass through timeBeforeLoad instead of hardcoding 2019-03-06 19:12:37 +09:00
Jamie Taylor 06b65e00c4
Prevent null beatmap from creating an extra drawable 2019-03-06 19:12:28 +09:00
Jamie Taylor eb80549782
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites 2019-03-06 19:12:22 +09:00
Dean Herbert 9441f88033
Use actual reference to default beatmap for fallback
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-03-06 13:01:37 +09:00
David Zhao 89987210c3 Merge remote-tracking branch 'upstream/master' into LobbyList 2019-03-05 18:59:38 +09:00
David Zhao 34b2553b95 Remove redundant boolean 2019-03-05 18:59:25 +09:00
David Zhao 52558c5cf6 Fix metadata potentially being null 2019-03-05 16:59:02 +09:00
David Zhao 166a8c8bbb Add back fallback behavior for match creation 2019-03-05 16:41:59 +09:00
David Zhao fc62877fdc Fall back to default background 2019-03-05 15:51:43 +09:00
David Zhao 7c53c7b602 Remove local background logic 2019-03-05 15:33:39 +09:00
David Zhao aecbc31ffa Use BeatmapSetCoverType.List for lobby listing 2019-03-05 12:08:14 +09:00
Dean Herbert 0ff17103e8
Merge branch 'master' into update-difficulty-brackets 2019-03-05 10:16:18 +09:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert 367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo 4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo 0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Poyo 66de451b53 Update difficulty color bracket thresholds 2019-02-14 02:19:41 -08:00
Dean Herbert 88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
Dean Herbert 327a34f12a Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert 21e79f51b1 Remove necessity of BeatmapSetDownloader 2019-01-18 14:28:06 +09:00
Dean Herbert 55607634b4 Fix covers being loaded even when off-screen 2018-12-28 13:30:05 +09:00
Dean Herbert cf079690e5 Use LargeTextureStore for online retrievals 2018-12-27 22:13:51 +09:00
smoogipoo eaba9e1378 Fix mode icon not being updated for correct ruleset 2018-12-27 18:16:30 +09:00
Dean Herbert 26834abd33 Fade and no schedule 2018-12-26 21:18:55 +09:00
Dean Herbert c902c1587a Add tests and modify fallback logic 2018-12-25 19:17:32 +09:00
Dean Herbert 9542e3e24a Add Updateable beatmap sprite 2018-12-25 18:04:13 +09:00
smoogipoo a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
Dean Herbert 7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
smoogipoo 5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00