1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 04:32:55 +08:00
Commit Graph

20581 Commits

Author SHA1 Message Date
David Zhao
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
Max Hübner
316b11d08b use single line if-statement 2019-07-28 20:36:21 +02:00
Dean Herbert
262284d095
Merge branch 'master' into truncate-long-usernames-in-private-chat 2019-07-29 02:47:49 +09:00
Dean Herbert
663f34d3d8 Remove width specifications 2019-07-29 02:47:26 +09:00
Dean Herbert
de8f502871 Add test 2019-07-29 02:46:33 +09:00
Dean Herbert
05eb8ecd98
Add "Spin In" Mod (#3464)
Add "Spin In" Mod

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-29 01:57:16 +09:00
Dean Herbert
3e74079d02 Add incompatibility with scale tween mods 2019-07-29 01:15:57 +09:00
Dean Herbert
f09e7d53e1
Merge branch 'master' into spin-in 2019-07-29 01:01:20 +09:00
Dean Herbert
07f905d21c Tidy up code and fix explode animations not playing correctly 2019-07-29 01:00:41 +09:00
Dean Herbert
f9b9eb5530
Merge pull request #5496 from peppy/revert-broke
Revert "Fix BackButton handling escape before all other elements (#54…
2019-07-28 23:39:29 +09:00
Dean Herbert
088c04a20f Revert "Fix BackButton handling escape before all other elements (#5440)"
This reverts commit 17a6563f4c.
2019-07-28 23:38:55 +09:00
Dean Herbert
4204ba6014
Merge branch 'master' into spin-in 2019-07-28 22:51:09 +09:00
Max Hübner
f7b9ddb48c combine Text and TextBold 2019-07-28 12:40:21 +02:00
Max Hübner
df8d4d8966 add truncation to base class 2019-07-28 12:16:32 +02:00
Max Hübner
c6d4ce0f8a revert truncation in derived class 2019-07-28 12:14:06 +02:00
Dean Herbert
17a6563f4c
Fix BackButton handling escape before all other elements (#5440)
Fix BackButton handling escape before all other elements

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-28 15:32:29 +09:00
David Zhao
bd2fce4bb7 don't use extra container 2019-07-28 13:45:54 +09:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority 2019-07-28 12:50:18 +09:00
Dean Herbert
a5da10c1d2
Merge pull request #5468 from nyquillerium/carousel-sizing
Resize BeatmapCarousel and confine its PositionalInput
2019-07-28 12:49:40 +09:00
Dean Herbert
8d98b6ebd7
Merge branch 'master' into carousel-sizing 2019-07-28 12:03:32 +09:00
Max Hübner
edf6453e04 truncate long usernames in private chat 2019-07-27 18:56:37 +02:00
Dean Herbert
cc0aefca1f
Adjust tournament map pool layout to allow for larger pools (#5487)
Adjust tournament map pool layout to allow for larger pools
2019-07-27 19:49:33 +09:00
Dean Herbert
56dbd94d16 Adjust tournament map pool layout to allow for larger pools 2019-07-27 19:46:46 +09:00
Dean Herbert
3571cb96b0 Fix broken merge 2019-07-27 12:56:55 +09:00
David Zhao
57e6c388a1
Merge branch 'master' into carousel-sizing 2019-07-27 11:40:07 +09:00
Dean Herbert
2575884aa3
Merge pull request #5484 from iiSaLMaN/fix-transforming-mods-not-working
Fix transforming mods not working properly
2019-07-27 10:28:28 +09:00
iiSaLMaN
ba4045a761 Fix transforming mods not working properly
Hidden, Grow, Deflate, etc..
2019-07-27 00:22:40 +03:00
Dean Herbert
d6adacbc34
Merge pull request #5477 from peppy/update-framework
Update framework
2019-07-26 20:37:54 +09:00
Dean Herbert
699e366306 Update framework 2019-07-26 20:29:57 +09:00
Dean Herbert
f6f4a08019
Reduce notification span during beatmap imports (#5471)
Reduce notification span during beatmap imports
2019-07-26 18:49:07 +09:00
Dean Herbert
392e1cbafb
Merge pull request #5456 from peppy/fix-import-select
Fix beatmap present failing directly after an import
2019-07-26 18:48:49 +09:00
Dean Herbert
3450bdffab
Force snaking slider paths to retain a fixed size (#5469)
Force snaking slider paths to retain a fixed size

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-26 18:24:03 +09:00
Dean Herbert
5317a8fa0f Update framework again 2019-07-26 17:50:49 +09:00
Dean Herbert
9ef858806b Fix existing usage of Path 2019-07-26 17:48:19 +09:00
Dean Herbert
9d080ec249 Update framework 2019-07-26 17:18:56 +09:00
Dean Herbert
0d44cd7928 Merge remote-tracking branch 'upstream/master' into path-size-optimisation 2019-07-26 17:18:44 +09:00
Dean Herbert
9036129aa7
Hide leaderboard mod filter when on details tab (#5473)
Hide leaderboard mod filter when on details tab

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-26 16:07:58 +09:00
Dean Herbert
4d49aad153 Start not visible 2019-07-26 15:51:51 +09:00
Dean Herbert
7fa419a38b Fix file layout order 2019-07-26 15:49:21 +09:00
Dean Herbert
620eeec412
Fix font weight of leaderboard mod filter when unchecked (#5472)
Fix font weight of leaderboard mod filter when unchecked
2019-07-26 15:25:00 +09:00
David Zhao
0f6c6c7de0 consolidate halfheight as well 2019-07-26 15:22:29 +09:00
Joehu
0b6cfec21c Hide leaderboard mod filter when on details tab 2019-07-25 23:20:56 -07:00
David Zhao
6765e9f7fa Combine into properties and update for framework changes 2019-07-26 15:13:10 +09:00
Joehu
3b0a482743 Fix font weight of leaderboard mod filter 2019-07-25 23:10:00 -07:00
Dean Herbert
6f2edaad55
Add iOS file import support (#5445)
Add iOS file import support

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-26 13:48:44 +09:00
Dean Herbert
53ecb2ae82 Reduce notification span during beatmap imports 2019-07-26 13:48:29 +09:00
Dean Herbert
5f0d633b34
Allow closing chat tabs with middle mouse button (#5447)
Allow closing chat tabs with middle mouse button

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-26 13:31:25 +09:00
Dean Herbert
8a54dab5d0 Tidy up code 2019-07-26 13:27:37 +09:00
Dean Herbert
56b27db7a4 Use "Click" instead of "Action" 2019-07-26 13:17:33 +09:00
Dean Herbert
7ec6ac7b0e Remove unnecessary override 2019-07-26 13:15:36 +09:00