1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 10:13:22 +08:00
Commit Graph

20662 Commits

Author SHA1 Message Date
Dean Herbert
79d7416474
Merge branch 'master' into remove-type-specification 2019-07-29 18:47:09 +09:00
Dean Herbert
86a4ebe7d7
Start exploding animation earlier (don't wait for flash) (#5453)
Start exploding animation earlier (don't wait for flash)

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-29 18:46:41 +09:00
Dan Balasescu
396892da1a
Describe how the ratio came to be 2019-07-29 18:43:05 +09:00
Dean Herbert
ac01e9fbeb Fix legacy scores with no online ID being imported with a non-null ID 2019-07-29 18:36:07 +09:00
Dan Balasescu
98813222af
Adjust comment 2019-07-29 18:35:22 +09:00
Dean Herbert
e579bce18a Don't report delta patch failures to sentry 2019-07-29 18:14:06 +09:00
Dan Balasescu
b74c11ad22
Merge branch 'master' into explode-circle-earlier 2019-07-29 18:05:47 +09:00
Dan Balasescu
f04f10e59a
Merge pull request #5421 from peppy/skin-scaling-modes
Skin scaling modes
2019-07-29 18:01:27 +09:00
Dan Balasescu
7779302e82
Merge branch 'master' into skin-scaling-modes 2019-07-29 17:47:07 +09:00
Dan Balasescu
6c3b439b3b
Merge pull request #5503 from peppy/fix-zero-length-hash
Fix zero-length hash models incorrectly creating a unique hash
2019-07-29 17:40:31 +09:00
Dean Herbert
466297df55 Fix shaking test 2019-07-29 17:27:00 +09:00
Dean Herbert
c514cbe2b7 Add basic skinning test 2019-07-29 17:27:00 +09:00
Dean Herbert
85e6ac156f Merge branch 'fix-zero-length-hash' into skinning-test 2019-07-29 16:58:35 +09:00
Dean Herbert
463075a5ad Merge branch 'isolated-test-database' into skinning-test 2019-07-29 16:58:32 +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
2318402292
Merge pull request #5498 from nyquillerium/exit-multi-from-null
Fix Multiplayer crash if attempting to exit with no screens in inner screen stack
2019-07-29 14:51:43 +09:00
Dan Balasescu
0dc25d7a35
Merge branch 'master' into exit-multi-from-null 2019-07-29 13:52:26 +09:00
Dan Balasescu
558845dc6d
Merge pull request #5488 from hbnrmx/truncate-long-usernames-in-private-chat
Truncate long usernames in private chat tab
2019-07-29 13:28:03 +09:00
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
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
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