Commit Graph

13241 Commits

Author SHA1 Message Date
c8b7cf8672 Merge branch 'master' into add-bindable-for-break-times 2019-07-30 06:23:47 +03:00
cec26a270e Fix using right mouse button to drag at song select seeking incorrectly with many beatmaps loaded
Closes #5195
2019-07-30 07:04:16 +09:00
ece5a9622e Fix scores without an online ID not always presenting correctly 2019-07-30 06:32:05 +09:00
b4bcdb1c70 Update framework 2019-07-29 19:44:58 +09:00
31c8c0f75a Fix legacy scores with no online ID being imported with a non-n… (#5508)
Fix legacy scores with no online ID being imported with a non-null ID
2019-07-29 19:21:00 +09:00
766cf9295d Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations 2019-07-29 19:03:36 +09:00
2d03c849bf Improve testability of intro sequence (#5275)
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
ef229c0f80 Merge branch 'master' into legacy-cursor-middle 2019-07-29 18:52:11 +09:00
894d573fbc Cache DrawableHitObject for skinnables to access (#5463)
Cache DrawableHitObject for skinnables to access
2019-07-29 18:49:37 +09:00
a4f30daf13 Merge pull request #5462 from peppy/skin-metric-parity
Bring playfield ratio in line with stable
2019-07-29 18:49:21 +09:00
d99408e979 Fix SkinChanged events triggering after disposal (#5461)
Fix SkinChanged events triggering after disposal

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-29 18:48:53 +09:00
79d7416474 Merge branch 'master' into remove-type-specification 2019-07-29 18:47:09 +09:00
ac01e9fbeb Fix legacy scores with no online ID being imported with a non-null ID 2019-07-29 18:36:07 +09:00
98813222af Adjust comment 2019-07-29 18:35:22 +09:00
7779302e82 Merge branch 'master' into skin-scaling-modes 2019-07-29 17:47:07 +09:00
c514cbe2b7 Add basic skinning test 2019-07-29 17:27:00 +09:00
85e6ac156f Merge branch 'fix-zero-length-hash' into skinning-test 2019-07-29 16:58:35 +09:00
cb17007fa7 Fix zero-length hash models incorrectly creating a unique hash 2019-07-29 16:57:19 +09:00
c14c3ba8ec Move database isolation logic to OsuTestScene for easier reuse 2019-07-29 16:57:02 +09:00
0dc25d7a35 Merge branch 'master' into exit-multi-from-null 2019-07-29 13:52:26 +09:00
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
316b11d08b use single line if-statement 2019-07-28 20:36:21 +02:00
262284d095 Merge branch 'master' into truncate-long-usernames-in-private-chat 2019-07-29 02:47:49 +09:00
663f34d3d8 Remove width specifications 2019-07-29 02:47:26 +09:00
088c04a20f Revert "Fix BackButton handling escape before all other elements (#5440)"
This reverts commit 17a6563f4c.
2019-07-28 23:38:55 +09:00
f7b9ddb48c combine Text and TextBold 2019-07-28 12:40:21 +02:00
df8d4d8966 add truncation to base class 2019-07-28 12:16:32 +02:00
c6d4ce0f8a revert truncation in derived class 2019-07-28 12:14:06 +02:00
5bf0277fd4 Remove unnecessary quick check
Not saving for anything
2019-07-28 09:17:13 +03:00
1dd3a66300 Remove unnecessary index resets 2019-07-28 09:16:19 +03:00
bd2fce4bb7 don't use extra container 2019-07-28 13:45:54 +09:00
a24e57dd3d Merge branch 'master' into refactor-osd 2019-07-28 13:10:01 +09:00
ddb98c705a Merge branch 'master' into update-follower-count 2019-07-28 12:53:40 +09:00
872822035a Merge branch 'master' into back-button-priority 2019-07-28 12:50:18 +09:00
edf6453e04 truncate long usernames in private chat 2019-07-27 18:56:37 +02:00
95b568eb46 Remove unnecessary condition 2019-07-27 15:52:30 +03:00
6c580ac9d5 Use while loops instead 2019-07-27 15:52:01 +03:00
3571cb96b0 Fix broken merge 2019-07-27 12:56:55 +09:00
57e6c388a1 Merge branch 'master' into carousel-sizing 2019-07-27 11:40:07 +09:00
ba4045a761 Fix transforming mods not working properly
Hidden, Grow, Deflate, etc..
2019-07-27 00:22:40 +03:00
699e366306 Update framework 2019-07-26 20:29:57 +09:00
934439e138 Merge branch 'master' into add-bindable-for-break-times 2019-07-26 12:57:52 +03:00
f6f4a08019 Reduce notification span during beatmap imports (#5471)
Reduce notification span during beatmap imports
2019-07-26 18:49:07 +09:00
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
5317a8fa0f Update framework again 2019-07-26 17:50:49 +09:00
9ef858806b Fix existing usage of Path 2019-07-26 17:48:19 +09:00
9d080ec249 Update framework 2019-07-26 17:18:56 +09:00
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
4d49aad153 Start not visible 2019-07-26 15:51:51 +09:00
7fa419a38b Fix file layout order 2019-07-26 15:49:21 +09:00