Commit Graph

158 Commits

Author SHA1 Message Date
c34f6180e6 Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
9dedd62d9a Revert a hotfix in multi screen
since it's been fixed in a framework
2019-06-24 22:57:18 +03:00
bbdb114f04 Add missing blank line 2019-06-24 02:09:00 +03:00
94e819578e Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
2019-06-24 01:55:35 +03:00
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
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
f26a1cff6c Fix beatmap import crashing during room creation 2019-05-07 12:14:57 +09:00
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
56496d28ba Reset mods when exiting match 2019-04-09 12:59:32 +09:00
cbb3fdaca8 Fix various crashes due to bindable being disabled 2019-04-09 12:59:32 +09:00
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
9a11a08acc Update textbox usages 2019-03-23 02:00:27 +09:00
c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
c34e110a2c Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
50c1b3a576 Move room resetting logic from MatchSubScreen to LoungeSubScreen 2019-03-07 16:49:48 +09:00
ee076bbbe3 Fix chat channel ids not being updated on room creation 2019-03-07 15:35:57 +09:00
6e5ea78ca2 Fix some nullref crashes when escaping out of new room creation 2019-03-06 20:03:37 +09:00
5de6e29294 Reset currentRoom state when cancelling room creation 2019-03-06 20:03:37 +09:00
fd147dae21 Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
a37445a938 Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
7c2ffb1826 Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
3015d40f8f Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
452caabd40 Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
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
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
d5cce850a8 Revert some unnecessary complications in logo logic 2019-02-12 13:29:41 +09:00
272584eb79 Improve file layouts 2019-02-12 13:02:33 +09:00
78b47f9fe3 Fix starting matches not working 2019-02-12 11:19:42 +09:00
e4422167b6 Fix starting gameplay 2019-02-11 19:13:57 +09:00
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
e2e615cc5c Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
a30d3739cf Merge remote-tracking branch 'upstream/master' into cmc-rooms 2019-02-08 18:45:39 +09:00
f52cac966b Fix multiple blank lines 2019-02-08 18:45:32 +09:00
6c4d289901 Pass item rather than ID 2019-02-08 18:33:49 +09:00