1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 04:42:57 +08:00
Commit Graph

27558 Commits

Author SHA1 Message Date
Andrei Zavatski
c68c347503 Remove unwanted property interpolation 2020-02-14 00:40:52 +03:00
Lucas A
049b0d93d1 Add back default content fade transitions 2020-02-13 21:40:25 +01:00
Andrei Zavatski
ab84f4085a Fix possible error on SpotlightsLayout disposal 2020-02-13 23:20:45 +03:00
Andrei Zavatski
11ec3ddf1e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings 2020-02-13 23:20:05 +03:00
Bartłomiej Dach
0f25864fae Textbox -> TextBox rename pass 2020-02-13 21:04:53 +01:00
Bartłomiej Dach
5646083ed9 Adjust code style in test 2020-02-13 21:01:25 +01:00
Bartłomiej Dach
09b2e7beed Encapsulate test editors 2020-02-13 20:56:34 +01:00
Bartłomiej Dach
cc625e3b89 Move initialisation logic to [SetUp] 2020-02-13 20:44:02 +01:00
Lucas A
dac0148c94 Apply review suggestions. 2020-02-13 20:08:14 +01:00
Malox10
10e3af094c
Merge branch 'master' into hoverable-timestamps 2020-02-13 18:06:15 +01:00
Andrei Zavatski
791bf6bc01 Make username text italic 2020-02-13 19:03:07 +03:00
Andrei Zavatski
e67e4f708e Adjust country name design 2020-02-13 19:01:26 +03:00
Dean Herbert
5b3f0bbb0a
Merge branch 'master' into fix-editor-time-change-display 2020-02-13 23:55:52 +09:00
Dean Herbert
d7c71cd0c1
Merge branch 'master' into update-placement-more-often 2020-02-13 23:55:18 +09:00
Dean Herbert
c1924535ff
Merge pull request #7814 from smoogipoo/remove-current-item
Remove the concept of a "current" item from multiplayer rooms
2020-02-13 23:54:32 +09:00
Malox10
c08398a404
Merge branch 'master' into hoverable-timestamps 2020-02-13 15:21:09 +01:00
Dean Herbert
e181a95c85
Remove unused using 2020-02-13 22:28:37 +09:00
Maximilian Junges
b2fbeab773 simplify string formatting and fix color 2020-02-13 14:07:14 +01:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item 2020-02-13 21:41:23 +09:00
Dean Herbert
1e58670930
Merge pull request #7815 from smoogipoo/participants-bindable
Make room participants into a bindable list
2020-02-13 20:35:38 +09:00
Andrei Zavatski
382cc1a91b Fix incorrect overlays overlapping 2020-02-13 14:26:35 +03:00
Andrei Zavatski
11c59a141f Add background to rankings header 2020-02-13 14:12:10 +03:00
Andrei Zavatski
f05c1de4c1 Fix possible nullref 2020-02-13 14:11:53 +03:00
Andrei Zavatski
2324296bf4 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings 2020-02-13 13:39:35 +03:00
Andrei Zavatski
a677aa6cfc Add rankings overlay to the game 2020-02-13 13:39:33 +03:00
Dean Herbert
b9a296d3f9
Merge branch 'master' into remove-current-item 2020-02-13 19:34:15 +09:00
Dean Herbert
28ca1a5bcc
Merge branch 'master' into participants-bindable 2020-02-13 19:31:50 +09:00
Dean Herbert
d633396878
Merge pull request #7816 from smoogipoo/missing-nullcheck
Add missing null-allowance to leaderboard
2020-02-13 19:30:43 +09:00
Dean Herbert
80ead1c979
Merge pull request #7813 from peppy/update-framework
Update framework
2020-02-13 19:29:59 +09:00
smoogipoo
bc1c4f6b58 Add missing null-allowance 2020-02-13 19:04:23 +09:00
smoogipoo
bce9c8f3f3 Make room participants into a bindable list 2020-02-13 18:59:15 +09:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal
Fix disposal-related errors by making WorkingBeatmap non-disposable
2020-02-13 18:52:47 +09:00
Dean Herbert
49a1725749
Merge pull request #7812 from smoogipoo/playlist-bindables
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00
smoogipoo
75bef15583 Remove "current" multiplayer room item 2020-02-13 18:48:28 +09:00
Dan Balasescu
4b7a053544
Merge branch 'master' into update-placement-more-often 2020-02-13 18:43:27 +09:00
Dean Herbert
be2d1c6b43 Update framework 2020-02-13 18:35:31 +09:00
Dean Herbert
d6263adb7b
Merge pull request #7806 from peppy/timeline-zoom-button-repeat
Add mouse down repeat support to timeline zoom buttons
2020-02-13 18:35:11 +09:00
Dean Herbert
24e7c3e11b
Merge pull request #7811 from smoogipoo/mod-expansion-types
Improve extensibility of mod display expansion
2020-02-13 18:34:46 +09:00
smoogipoo
91edadfe9d Make playlist beatmap and ruleset into bindables 2020-02-13 18:12:47 +09:00
smoogipoo
d4f14e552a Improve extensibility of mod display expansion 2020-02-13 18:05:53 +09:00
Dan Balasescu
c384e3cfc2
Merge branch 'master' into timeline-zoom-button-repeat 2020-02-13 18:04:36 +09:00
Dan Balasescu
08d0a08d54
Merge pull request #7803 from peppy/fix-blueprint-outside-container
Fix blueprint showing even when mouse outside of container
2020-02-13 17:54:28 +09:00
Dan Balasescu
97a03729b2
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:54:20 +09:00
Dan Balasescu
cb46d34dd7
Merge pull request #7808 from peppy/disable-interaction-progress-bar
Disallow seeking on osu!direct download progress bars
2020-02-13 17:47:07 +09:00
Dan Balasescu
d80e9550fb
Merge branch 'master' into timeline-zoom-button-repeat 2020-02-13 17:38:45 +09:00
Dan Balasescu
5a90e6f9b5
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:32:49 +09:00
Dan Balasescu
48a6583216
Merge branch 'master' into disable-interaction-progress-bar 2020-02-13 17:20:22 +09:00
Dean Herbert
e941f6c4dd
Merge pull request #7780 from voidedWarranties/difficultyadjust-order
Fix order and naming of Difficulty Adjust sliders
2020-02-13 15:55:00 +09:00
voidedWarranties
ad0de27964 Safer dependency injection and accessibility levels 2020-02-12 22:11:26 -08:00
Dean Herbert
e2e6e67f79 Merge branch 'master' into difficultyadjust-order 2020-02-13 14:07:47 +09:00