1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 21:17:33 +08:00
Commit Graph

13087 Commits

Author SHA1 Message Date
Dean Herbert
85e6ac156f Merge branch 'fix-zero-length-hash' into skinning-test 2019-07-29 16:58:35 +09:00
Dean Herbert
cb17007fa7 Fix zero-length hash models incorrectly creating a unique hash 2019-07-29 16:57:19 +09:00
Dean Herbert
c14c3ba8ec Move database isolation logic to OsuTestScene for easier reuse 2019-07-29 16:57:02 +09:00
Dan Balasescu
0dc25d7a35
Merge branch 'master' into exit-multi-from-null 2019-07-29 13:52:26 +09:00
David Zhao
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
jorolf
f4effd12c3 make legacy skins animatable 2019-07-28 21:04:55 +02: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
088c04a20f Revert "Fix BackButton handling escape before all other elements (#5440)"
This reverts commit 17a6563f4c.
2019-07-28 23:38:55 +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
David Zhao
bd2fce4bb7 don't use extra container 2019-07-28 13:45:54 +09:00
Dean Herbert
ddb98c705a
Merge branch 'master' into update-follower-count 2019-07-28 12:53:40 +09:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority 2019-07-28 12:50:18 +09:00
Max Hübner
edf6453e04 truncate long usernames in private chat 2019-07-27 18:56:37 +02: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
iiSaLMaN
ba4045a761 Fix transforming mods not working properly
Hidden, Grow, Deflate, etc..
2019-07-27 00:22:40 +03: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
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
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
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
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
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
David Zhao
c89830f3d8 move constants, combine local vars into properties 2019-07-26 13:07:28 +09:00
iiSaLMaN
44895c4b69 Use IReadOnlyList for break periods list 2019-07-26 05:41:10 +03:00
David Zhao
a9f0dda9d7 Confine positional input 2019-07-25 17:36:13 +09:00
David Zhao
97eb5293a8 Don't depend on parent sizing 2019-07-25 17:32:21 +09:00
Dean Herbert
bfaf9d5f41 Remove unnecessary special cases 2019-07-25 16:24:10 +09:00
Dean Herbert
c1b0130857 Add legacy cursormiddle support 2019-07-25 16:23:04 +09:00
Dean Herbert
38e21caa5a Add legacy hitcircle 2019-07-25 16:10:01 +09:00
Dean Herbert
900d17a4db Merge branch 'fix-skin-changed-disposal' into add-legacy-hit-animations 2019-07-25 16:09:15 +09:00
Dean Herbert
3ca41b9c0a Merge branch 'skin-metric-parity' into add-legacy-hit-animations 2019-07-25 16:07:23 +09:00
Dean Herbert
54260e4038 Merge branch 'cache-drawable-hitobject' into add-legacy-hit-animations 2019-07-25 16:05:32 +09:00
Dean Herbert
eb6bda3f08 Cache DrawableHitObject for skinnables to access 2019-07-25 16:03:07 +09:00
Dean Herbert
58feba72a3 Fix scheduled events not running on previous drawables 2019-07-25 15:59:44 +09:00
David Zhao
c4bed0e6d2 Resize BeatmapCarousel, update carouselitem logic 2019-07-25 15:31:21 +09:00
Dean Herbert
46e17646ac Align slider path size with legacy skins 2019-07-25 14:22:26 +09:00
Dean Herbert
9473f6d3e3 Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
2019-07-25 14:22:22 +09:00
Dean Herbert
a290437286 Fix skin changed events triggering after disposal 2019-07-25 13:55:01 +09:00
Dean Herbert
69844e6c24 Fix beatmap present failing directly after an import 2019-07-25 12:18:18 +09:00
David Zhao
6ef3c71e22 remove unused using 2019-07-25 11:31:46 +09:00
Dean Herbert
7275beaf1a Remove unnecessary type specification from SkinnableDrawable 2019-07-25 11:20:39 +09:00
David Zhao
e63c97b306 remove unnecessary overrides 2019-07-25 11:20:24 +09:00
David Zhao
bbcc8f0721 Add new container level and unblock footer 2019-07-25 11:11:20 +09:00
Max Hübner
78a8a6490e close chat tabs with middle mouse button 2019-07-24 17:17:29 +02:00
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes 2019-07-24 18:37:31 +09:00
David Zhao
da3dc610ba revert globalaction changes 2019-07-24 12:52:18 +09:00
David Zhao
263ccfcbcb Merge remote-tracking branch 'upstream/master' into back-button-priority 2019-07-24 12:50:16 +09:00
David Zhao
38559685a9 proxy backbutton instead 2019-07-24 12:47:41 +09:00
Dean Herbert
2610ee2abb Update framework 2019-07-23 21:39:10 +09:00
smoogipoo
4e7e2d1d52 Adjust comments 2019-07-23 21:16:09 +09:00
smoogipoo
74b09c72fa Refactor state updates to convert State into an IBindable 2019-07-23 21:16:09 +09:00
Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic 2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable (#5420)
Make AccentColour a bindable

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
Dan Balasescu
0ffac22376
Merge branch 'master' into allow-multiple-debug-instances 2019-07-23 20:30:56 +09:00
Dan Balasescu
bc64c56a26
Merge branch 'master' into remove-text-shadow 2019-07-23 20:16:33 +09:00
David Zhao
8220a51310 Make backbutton handle global input last 2019-07-23 17:59:50 +09:00
Dean Herbert
9665a94f4a
Ignore shift-delete PlatformAction in SearchTextBox (#5372)
Ignore shift-delete PlatformAction in SearchTextBox

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 17:11:09 +09:00
Dean Herbert
e81ef4bf33 Rewrite comment 2019-07-23 16:44:19 +09:00
Dean Herbert
340f9a8f8d
Merge branch 'master' into fix-flashlight-depth 2019-07-23 16:37:04 +09:00
Dean Herbert
704fe2d655 Remove text shadow in chat 2019-07-23 16:04:50 +09:00
smoogipoo
5e72ed0d12 Fix potential nullref 2019-07-23 15:35:12 +09:00
David Zhao
4d8e2a78d1 update with new framework changes and update comment 2019-07-23 15:31:09 +09:00
smoogipoo
776757545d Fix FTB causing flashlight to block vision correctly 2019-07-23 15:17:02 +09:00
Dean Herbert
292bd22f92 Allow multiple instances of osu! when running under debug 2019-07-23 13:38:05 +09:00
David Zhao
3e4ebd3c7a
Merge branch 'master' into shift-delete 2019-07-23 13:25:12 +09:00
David Zhao
e628e44d8e
update comment 2019-07-23 13:25:03 +09:00
Dean Herbert
d5ee4cbc9c Move TouchDevice mod to new "system" category 2019-07-23 13:14:28 +09:00
Dean Herbert
452b2c8027
Separate GlowingSpriteText from LeaderboardScore into it's own… (#5418)
Separate GlowingSpriteText from LeaderboardScore into it's own class

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 12:08:30 +09:00
Dean Herbert
9e34582c17
Merge branch 'master' into separate-glowing-text-from-leaderboardscore 2019-07-23 11:31:47 +09:00
Andrei Zavatski
ffcc1c62af simplify moving condition 2019-07-22 23:22:39 +03:00
iiSaLMaN
32e9547ce9 Trim whitespace 2019-07-22 23:16:54 +03:00
iiSaLMaN
081355e3d1 Use IHasText and simplify properties 2019-07-22 23:12:09 +03:00
Andrei Zavatski
ee6fed5b33 Use fixed height 2019-07-22 18:17:49 +03:00
Dean Herbert
2f111e6cf4 Fix incorrect corner radius 2019-07-22 23:57:26 +09:00
Dean Herbert
4dc9309a7e
Merge branch 'master' into underscored_link 2019-07-22 23:46:57 +09:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements 2019-07-22 23:44:14 +09:00
Dean Herbert
cdf75b4098 Public before private 2019-07-22 22:14:09 +09:00
Andrei Zavatski
075ca3d8ea CI fix 2019-07-22 14:47:35 +03:00
Andrei Zavatski
3e95cb9145 Use bindable and disable button 2019-07-22 14:35:18 +03:00
Andrei Zavatski
2a17ed5e18 Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap 2019-07-22 14:32:37 +03:00
Dean Herbert
7d3939a838
Merge branch 'master' into fix-triangles-crash 2019-07-22 19:17:51 +09:00
Dean Herbert
07a0df7c4f Fix bracket precedence 2019-07-22 18:29:04 +09:00
Dean Herbert
a05a6bbb77
Set "Title" as the default grouping/sorting modes in song select (#5396)
Set "Title" as the default grouping/sorting modes in song select
2019-07-22 18:06:23 +09:00
Dean Herbert
d4d286c988 Add full documentation 2019-07-22 16:08:38 +09:00
Dean Herbert
c3b81bef4a Flip default to the preferred method going forward 2019-07-22 15:55:38 +09:00