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 |
|
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 |
|
David Zhao
|
8a01995668
|
Remove need for tracking bool and backing logo
|
2019-04-08 16:14:41 +09:00 |
|
David Zhao
|
376bed3a30
|
Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container
|
2019-04-08 15:24:59 +09:00 |
|
David Zhao
|
a690302d00
|
Apply reviews
|
2019-04-08 15:24:09 +09:00 |
|
Dan Balasescu
|
d7655bc579
|
Use .Value instead of cast
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
|
2019-04-08 11:22:01 +09:00 |
|
DrabWeb
|
e76897d6a7
|
Fix ResumeContainers appearing when resuming during breaks.
|
2019-04-07 16:32:55 -03: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
|
46ecaf3d6c
|
Merge branch 'master' into facade-container
|
2019-04-05 21:14:21 +09: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 |
|
David Zhao
|
c693d1fad8
|
Further condense steps
|
2019-04-05 15:48:48 +09:00 |
|
David Zhao
|
37ffe47e4b
|
Add back exception tests with better descriptions
|
2019-04-05 15:30:09 +09:00 |
|
David Zhao
|
e06fe7950b
|
Cleanup
|
2019-04-05 15:06:37 +09:00 |
|
David Zhao
|
5fa93f4a05
|
Add test for checking exception
|
2019-04-05 15:05:11 +09: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 |
|
David Zhao
|
b1d74e57e5
|
Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size
|
2019-04-05 13:56:08 +09:00 |
|
David Zhao
|
7047f305a1
|
Apply reviews, add safety for multiple facades
|
2019-04-05 12:02:47 +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 |
|
David Zhao
|
6f5e9fe50d
|
Correct xmldoc
|
2019-04-04 13:33:13 +09:00 |
|
David Zhao
|
456459cafa
|
Give flow container test long enough to finish
|
2019-04-04 13:25:24 +09:00 |
|
David Zhao
|
b2e932dc74
|
Clean up tests, xmldoc
|
2019-04-04 13:13:03 +09:00 |
|
David Zhao
|
f2bbde83bf
|
Use precision almost equals
|
2019-04-04 13:05:34 +09:00 |
|
David Zhao
|
b2857384b8
|
Remove unnecessary logo assignment
|
2019-04-04 12:08:05 +09:00 |
|