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
|
a690302d00
|
Apply reviews
|
2019-04-08 15:24:09 +09:00 |
|
DrabWeb
|
e76897d6a7
|
Fix ResumeContainers appearing when resuming during breaks.
|
2019-04-07 16:32:55 -03:00 |
|
Lucas A
|
e948b11756
|
Merge branch 'master' into invert-login-notification-depth
|
2019-04-07 14:03:01 +02: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 |
|
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
|
f93504c65a
|
Merge branch 'master' into button_fix
|
2019-04-05 20:47:08 +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 |
|
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 |
|
David Zhao
|
b2857384b8
|
Remove unnecessary logo assignment
|
2019-04-04 12:08:05 +09:00 |
|
David Zhao
|
15b2b6af7d
|
Clean up remaining assignments of logo relativePositionAxes
|
2019-04-04 11:28:36 +09:00 |
|
jorolf
|
ccc804a9b2
|
get everything working again
|
2019-04-04 00:24:42 +02:00 |
|
Samuel Van Allen
|
bb516da5b6
|
Removed redundant empty argument list
|
2019-04-03 22:57:05 +08:00 |
|
Samuel Van Allen
|
3660924441
|
Trimmed whitespace
|
2019-04-03 22:40:20 +08:00 |
|
Samuel Van Allen
|
4d60f6fb6a
|
Use collection initializer and added missing blank line
|
2019-04-03 22:37:50 +08:00 |
|
Samuel Van Allen
|
73c7c6c316
|
Hides "Details" button when OnlineBeatmapID is null
|
2019-04-03 21:44:36 +08:00 |
|
David Zhao
|
8a40b27e8f
|
Remove need for logo relativePositionAxes none
|
2019-04-03 20:32:53 +09:00 |
|
David Zhao
|
2ed945605e
|
Fix Axes.None requirement for FacadeContainer
|
2019-04-03 19:57:22 +09:00 |
|
Dean Herbert
|
efd7bea771
|
Add further xmldoc
|
2019-04-03 17:01:11 +09:00 |
|
Dean Herbert
|
50f8ab3dfb
|
Fix gameplay offset handling on seeks
|
2019-04-03 16:58:20 +09: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 |
|
smoogipoo
|
d8af5e1c5a
|
Update in-line with drawnode changes
|
2019-04-02 11:56:22 +09:00 |
|
David Zhao
|
020be50f03
|
Merge remote-tracking branch 'upstream/master' into facade-container
|
2019-04-02 11:28:44 +09:00 |
|
Dean Herbert
|
184403c7e1
|
Merge branch 'master' into resume-cursor-2
|
2019-04-01 14:24:00 +09:00 |
|
Dean Herbert
|
2b3c70b2d2
|
Refactor with constants and better method names
|
2019-04-01 13:13:56 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
LeNitrous
|
698e38c4e0
|
make menu flashes and visualisation colourable by skin
|
2019-03-31 20:10:44 +08:00 |
|
David Zhao
|
952a12bb19
|
Return logo relativepositionaxes on content out
|
2019-03-29 16:54:34 +09:00 |
|
Dean Herbert
|
81585a8283
|
Merge branch 'master' into resume-cursor-2
|
2019-03-29 15:56:46 +09:00 |
|
Dean Herbert
|
4225d41a84
|
Merge pull request #4443 from jorolf/screen-title-class
Add ScreenTitle class
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-03-29 15:02:38 +09:00 |
|
Dean Herbert
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +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
|
202a0086cc
|
Merge branch 'master' into better-player-flags
|
2019-03-29 13:45:45 +09:00 |
|
Dean Herbert
|
d6f8dbfd5c
|
Merge branch 'master' into wedge-fix
|
2019-03-29 12:23:42 +09:00 |
|
Dean Herbert
|
fed58fba3a
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 12:14:28 +09:00 |
|
Dean Herbert
|
26a73b4a65
|
Merge branch 'master' into correct-preview-loop
|
2019-03-29 12:00:58 +09:00 |
|
Dan Balasescu
|
d410054ec8
|
Merge branch 'master' into key-counter-display
|
2019-03-29 11:22:59 +09:00 |
|
Dean Herbert
|
7715606188
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-29 11:15:34 +09:00 |
|
Dan Balasescu
|
7ab24e35f9
|
Merge branch 'master' into gameplay-paused-no-update
|
2019-03-29 10:53:32 +09:00 |
|
Dean Herbert
|
759c5b3db9
|
Restore previous resume behaviour for the time being
|
2019-03-29 10:52:26 +09:00 |
|