RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,018 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

408 Commits

Author SHA1 Message Date
Dean Herbert bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
smoogipoo cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
Dean Herbert 4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +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 f26a1cff6c Fix beatmap import crashing during room creation 2019-05-07 12:14:57 +09:00
Dean Herbert 6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +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
Joehu 0838206ddd Shorten multiplayer header to multi 2019-04-22 22:44:43 -07:00
smoogipoo 414d555484 Fix possible exit from non-current screen 2019-04-22 19:24:57 +09:00
smoogipoo 0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo 4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +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 56496d28ba Reset mods when exiting match 2019-04-09 12:59:32 +09:00
smoogipoo cbb3fdaca8 Fix various crashes due to bindable being disabled 2019-04-09 12:59:32 +09:00
smoogipoo c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +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
smoogipoo 15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
jorolf ccc804a9b2 get everything working again 2019-04-04 00:24:42 +02: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 612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert de47e0a8e8 Merge remote-tracking branch 'upstream/master' into screen-title-class 2019-03-29 14:01:08 +09:00
Dean Herbert 2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert 9a6576c0a1 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-25 12:40:31 +09:00
Dean Herbert 9a11a08acc Update textbox usages 2019-03-23 02:00:27 +09:00
jorolf 7873022a8b Merge branch 'master' of git://github.com/ppy/osu into screen-title-class 2019-03-21 22:18:59 +01:00
jorolf 454c82c49e Don't go outside of the container bounds 2019-03-21 22:18:45 +01:00
Dean Herbert acbcca4462
Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
Dean Herbert baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert 392a0a1d74
Merge branch 'master' into update-framework 2019-03-18 11:34:59 +09:00
Dean Herbert c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
Dean Herbert f0114d776d Use interface to access API 
Allows for better testability.
 2019-03-13 12:58:18 +09:00
jorolf f91e4a1fdd make ScreenTitle abstract and properties protected 2019-03-11 19:10:37 +01:00
jorolf f3ab5070b9 apply suggestions 2019-03-11 18:37:36 +01:00
David Zhao 63b9fa58ef Cleanup 2019-03-11 19:52:28 +09:00
David Zhao 6a1e600099 Create new OsuScreenStack for use in Multiplayer 2019-03-11 19:48:07 +09:00
David Zhao aeae6143c1 Remove unnecessary variable 2019-03-11 17:47:03 +09:00
David Zhao 0b64af5e02 Put multiplayer background inside a parallax container 2019-03-11 16:51:43 +09:00
David Zhao 0d95511222
Merge branch 'master' into multi-background-stack 2019-03-11 11:19:08 +09:00
David Zhao 2df57c3a29 Give Multiplayer its own background stack 2019-03-11 11:08:04 +09:00
Joehu 0fc6fa7245 Fix file naming on ParticipantCountDisplay 2019-03-09 20:29:56 -08:00
jorolf af1c54d995 add ScreenTitle class 2019-03-08 23:44:01 +01:00
Jamie Taylor c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
Jamie Taylor 50c1b3a576
Move room resetting logic from MatchSubScreen to LoungeSubScreen 2019-03-07 16:49:48 +09:00
Jamie Taylor ee076bbbe3
Fix chat channel ids not being updated on room creation 2019-03-07 15:35:57 +09:00
Jamie Taylor 6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation 2019-03-06 20:03:37 +09:00