h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 02:37:25 +08:00
Code Issues Releases Wiki Activity
20,850 Commits 3 Branches 653 Tags 365 MiB
e3d52d8d71
Commit Graph

427 Commits

Author SHA1 Message Date
Joehu
0082695cd8 Choose default category sorting instead of being always first 2019-08-02 13:22:58 -07:00
David Zhao
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
Dean Herbert
e76b3e2b40 User property instead of method 2019-07-21 10:42:40 +09:00
iiSaLMaN
842417cf42 Check if selected scope requires API 2019-07-21 03:07:27 +03:00
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
Dean Herbert
9e1cb90dd8 Remove existing argument for ItemAdded event 
For all usages, it looks like this was unnecessary.
 2019-06-26 11:40:41 +09:00
smoogipoo
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
Andrei Zavatski
9dedd62d9a Revert a hotfix in multi screen 
since it's been fixed in a framework
 2019-06-24 22:57:18 +03:00
Andrei Zavatski
35516e7304 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 22:52:24 +03:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Andrei Zavatski
bbdb114f04 Add missing blank line 2019-06-24 02:09:00 +03:00
Andrei Zavatski
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
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
smoogipoo
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
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