h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 23:27:24 +08:00
Code Issues Releases Wiki Activity
17,849 Commits 3 Branches 648 Tags 270 MiB
5887008fb3
Commit Graph

17849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring 2019-04-15 11:43:53 +02:00
Dean Herbert
ed1f05333a
Merge pull request #4613 from smoogipoo/no-workingbeatmap-mods 
Remove mods from WorkingBeatmap
 2019-04-15 16:53:01 +08:00
Lucas A
361c0ec9f2 Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in 2019-04-13 13:18:44 +02:00
Lucas A
5ab278f9ea Add missing user statuses to tests 2019-04-12 23:01:11 +02:00
Lucas A
da5d6cb1d4 Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap 2019-04-12 22:54:35 +02:00
Lucas A
69dda0ffd4 OsuScreens can now set a per screen user status 
which defaults to UserStatusOnline
 2019-04-12 22:36:01 +02:00
smoogipoo
1db2d49696 Fix testcases 2019-04-10 17:54: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
7845d542e3 Cache mods as array in DrawableRuleset 2019-04-10 17:20:36 +09:00
smoogipoo
85d3ff4846 Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods 
# Conflicts:
#	osu.Game/Screens/Play/GameplayClockContainer.cs
 2019-04-10 12:06:51 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
Dan Balasescu
67a03bbc90
Merge pull request #4583 from peppy/fix-offset-seek-handling 
Fix gameplay offset handling on seeks
 2019-04-09 15:48:52 +09:00
Dan Balasescu
3073508a23
Merge branch 'master' into fix-offset-seek-handling 2019-04-09 15:40:48 +09:00
Dean Herbert
ca251d8fa3
Merge pull request #4612 from smoogipoo/fix-osuscreen-dependencies 
Fix OsuScreenDependencies using the incorrect parent
 2019-04-09 12:28:32 +08:00
smoogipoo
1c952e58cc Fix testcase failures 2019-04-09 13:15:48 +09: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
ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
smoogipoo
ca9f172a96 Use var 2019-04-09 12:58:10 +09:00
smoogipoo
93b6cc00df Fix OsuScreenDependencies using the incorrect parent 2019-04-09 12:56:23 +09:00
Dean Herbert
f2f60f6d03
Merge pull request #4603 from Game4all/invert-login-notification-depth 
Switch NotificationOverlay and LoginOverlay depth order
 2019-04-07 21:17:36 +09:00
Lucas A
e948b11756
Merge branch 'master' into invert-login-notification-depth 2019-04-07 14:03:01 +02:00
Dean Herbert
869744b1ae
Merge pull request #4596 from Ferdi265/master 
BeatmapLeaderboard: fix local scores not being sorted
 2019-04-07 20:56:03 +09:00
Ferdinand Bachmann
d431ca4efc
BeatmapLeaderboard: use OrderByDescending instead of negation 
(suggested by peppy)
 2019-04-07 13:26:35 +02:00
Lucas A
3f2e6a9376 Allow loginOverlay to be null if there's no cached instance in DI (for testing cases) 2019-04-06 18:52:30 +02:00
Lucas A
394f14965b Make appveyor happy with whitespaces 2019-04-06 18:23:56 +02:00
Lucas A
59410dbe3b Open login overlay when notification asking for signing in to play multi is clicked 2019-04-06 18:05:13 +02:00
Lucas A
d5b7865ab8 Invert notification and loginOverlay depth order 2019-04-06 17:40:48 +02:00
theFerdi265
cb3532e7d4 BeatmapLeaderboard: fix local scores not being sorted 2019-04-06 00:53:02 +02:00
Dean Herbert
1b7d8b7dcf
Merge pull request #4555 from Joehuu/fix-blocked-volume-overlay 
Fix volume overlay being blocked by other floating overlays

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-05 21:14:05 +09:00
Dean Herbert
dec16d9eb3
Merge branch 'master' into fix-blocked-volume-overlay 2019-04-05 21:01:58 +09:00
Dean Herbert
284b2d3fc6
Merge pull request #4589 from nyquillerium/button_fix 
Fix visual issue with rapidly switching between menu button states

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-05 20:59:54 +09:00
Dean Herbert
f93504c65a
Merge branch 'master' into button_fix 2019-04-05 20:47:08 +09:00
Dean Herbert
8c7973f343
Merge pull request #4211 from EVAST9919/update-beatmap-scores-design 
Update beatmap scores design

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-05 20:46:54 +09:00
Dean Herbert
88445647c8
Merge branch 'master' into update-beatmap-scores-design 2019-04-05 18:27:30 +09:00
David Zhao
0208526837 Fix button system visual issue 2019-04-05 18:21:54 +09:00
Joehu
debda7ae7d Fix volume overlay container reference 2019-04-05 00:05:42 -07:00
Joehu
53906e87ec Split floatingOverlayContent 2019-04-05 00:00:21 -07:00
Dean Herbert
a34a511f22 Update framework 2019-04-05 14:55:25 +09:00
smoogipoo
15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
smoogipoo
a6bf076dc7 Adjust green colour 2019-04-04 17:58:34 +09:00
smoogipoo
e13fffaca3 Make ScoreTable use TableContainer 2019-04-04 17:53:23 +09:00
Dean Herbert
1709e22763
Merge branch 'master' into fix-blocked-volume-overlay 2019-04-04 17:28:46 +09:00
Dean Herbert
35c4ee7452
Merge pull request #4133 from Aergwyn/toggle-cursor-trail 
Add setting to toggle gameplay cursor trail

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-04 17:28:21 +09:00
Dean Herbert
9802d8ab11
Rename setting 2019-04-04 17:18:53 +09:00
Dean Herbert
d54750aa37 Remove incorrect class 2019-04-04 17:10:29 +09:00
Dean Herbert
109f577b59 Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail 2019-04-04 17:09:38 +09:00
Dean Herbert
224c8d0f99
Merge pull request #4585 from Eclmist/bugfix/4584 
Hides "Details" button when OnlineBeatmapID is null

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-04 01:54:22 +09:00
Dean Herbert
0919980cdd
Merge branch 'master' into bugfix/4584 2019-04-04 01:08:39 +09:00