13396 Commits

Author	SHA1	Message	Date
Dean Herbert	766cf9295d	Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations	2019-07-29 19:03:36 +09:00
Dean Herbert	2d03c849bf	Improve testability of intro sequence (#5275) ... Improve testability of intro sequence	2019-07-29 18:56:38 +09:00
Dan Balasescu	ef229c0f80	Merge branch 'master' into legacy-cursor-middle	2019-07-29 18:52:11 +09:00
jorolf	0635680db5	fix some code quality	2019-07-29 11:49:59 +02:00
Dean Herbert	894d573fbc	Cache DrawableHitObject for skinnables to access (#5463) ... Cache DrawableHitObject for skinnables to access	2019-07-29 18:49:37 +09:00
Dean Herbert	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
Dean Herbert	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
Dean Herbert	79d7416474	Merge branch 'master' into remove-type-specification	2019-07-29 18:47:09 +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
Dan Balasescu	7779302e82	Merge branch 'master' into skin-scaling-modes	2019-07-29 17:47:07 +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	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 17a6563f4c5d0c7e3a4dfac5469c65866de311aa.	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
iiSaLMaN	5bf0277fd4	Remove unnecessary quick check ... Not saving for anything	2019-07-28 09:17:13 +03:00
iiSaLMaN	1dd3a66300	Remove unnecessary index resets	2019-07-28 09:16:19 +03:00
David Zhao	bd2fce4bb7	don't use extra container	2019-07-28 13:45:54 +09:00
Dean Herbert	a24e57dd3d	Merge branch 'master' into refactor-osd	2019-07-28 13:10:01 +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
iiSaLMaN	95b568eb46	Remove unnecessary condition	2019-07-27 15:52:30 +03:00
iiSaLMaN	6c580ac9d5	Use while loops instead	2019-07-27 15:52:01 +03: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
Salman Ahmed	934439e138	Merge branch 'master' into add-bindable-for-break-times	2019-07-26 12:57:52 +03: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
iiSaLMaN	4c9e8527d8	Modify global index directly in the for loop ... Moves the global index to a near break if not in a break yet	2019-07-26 09:24:53 +03: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