38717 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	ae2fd2f2e1	Ensure source is set on reset	2021-04-23 18:46:59 +09:00
Dean Herbert	d4ffd2ef4b	Merge branch 'master' into reversed-fruits	2021-04-23 15:08:18 +09:00
Dean Herbert	bc0e1d8c37	Remove dead newline	2021-04-23 15:06:39 +09:00
Dean Herbert	3b77d02752	Merge pull request #12537 from smoogipoo/fix-initial-playingusers ... Fix current match playing users not updated on room join	2021-04-23 12:00:33 +09:00
Dean Herbert	8ee881b57a	Merge pull request #12528 from nekodex/ruleset-switch-sounds ... Add support for playing a per-ruleset sound when switching rulesets	2021-04-23 11:35:19 +09:00
Dean Herbert	fbb9cb3f6f	Fix broken merge resolution	2021-04-23 11:01:48 +09:00
Dean Herbert	a9a24bd481	Merge branch 'master' into ruleset-switch-sounds	2021-04-23 10:50:41 +09:00
Dan Balasescu	8de885622b	Merge pull request #12536 from peppy/update-framework ... Update framework	2021-04-23 00:42:20 +09:00
smoogipoo	f593d9e42c	Fix playing users not being updated on room join	2021-04-22 23:23:43 +09:00
smoogipoo	0ee73b8e53	Add failing test	2021-04-22 23:22:44 +09:00
Dean Herbert	b4f492ca4c	Update framework	2021-04-22 23:06:46 +09:00
Dan Balasescu	93b53f54fa	Merge pull request #12531 from peppy/editor-add-nudge-shortcuts ... Add simple key based time nudging support to editor	2021-04-22 21:14:51 +09:00
Dean Herbert	a242df31e8	Merge pull request #12534 from smoogipoo/fix-hold-note-crash ... Fix hold notes with 0 length crashing the game	2021-04-22 21:14:36 +09:00
Dan Balasescu	50f37ef09c	Merge pull request #12519 from peppy/editor-hit-animation-toggle ... Add editor hit animation toggle	2021-04-22 20:49:21 +09:00
Dan Balasescu	be8fe47f2c	Merge branch 'master' into editor-add-nudge-shortcuts	2021-04-22 20:38:34 +09:00
Dean Herbert	891a6a83d2	Merge branch 'master' into ruleset-switch-sounds	2021-04-22 20:17:21 +09:00
Dean Herbert	d20a8694e4	Update resources	2021-04-22 19:55:06 +09:00
Dan Balasescu	739d83da2a	Merge pull request #12515 from frenzibyte/legacy-scores-classic-mod ... Apply "classic" mod to all legacy scores	2021-04-22 19:52:09 +09:00
smoogipoo	4148d473e3	Fix hold note crashing with 0 length	2021-04-22 19:51:33 +09:00
smoogipoo	30e6ea4291	Add failing test	2021-04-22 18:59:57 +09:00
Dan Balasescu	b774f5b72b	Merge pull request #12526 from peppy/fix-system-message-ordering ... Fix system messages always being displayed above standard messages	2021-04-22 18:51:25 +09:00
Dan Balasescu	0e24f2eb59	Merge pull request #12529 from peppy/editor-placement-right-click-delete ... Allow shift+right-click deletion when in placement mode	2021-04-22 18:50:20 +09:00
Dan Balasescu	162948425d	Merge pull request #12527 from peppy/mania-fix-zero-length-hold-notes ... Rollback hold note placement when length is zero	2021-04-22 18:48:32 +09:00
Dean Herbert	a5364b224f	Add simple key based time nudging support to editor	2021-04-22 18:47:04 +09:00
smoogipoo	d4d78f7434	Merge branch 'master' into legacy-scores-classic-mod	2021-04-22 18:44:20 +09:00
smoogipoo	8a6267580a	Fix nullref	2021-04-22 18:44:14 +09:00
Dan Balasescu	d8e6ecc110	Merge pull request #12530 from peppy/improve-catcher-fruit-distribution ... Improve catcher fruit distribution	2021-04-22 18:38:10 +09:00
Dean Herbert	1884c18a2c	Ignore movement operations which have no offset	2021-04-22 18:12:03 +09:00
Dean Herbert	bdf07ad59a	Limit catching towards the centre of the plate (to emulate actual gameplay)	2021-04-22 17:47:03 +09:00
Dean Herbert	2203552e9e	Add stacking test logic to TestSceneCatcherArea for skinned testing	2021-04-22 17:34:53 +09:00
Dean Herbert	dc2bc462b8	Expose internal catcher width calculation methods	2021-04-22 17:27:23 +09:00
Dean Herbert	d2ee5fcd85	Merge pull request #12438 from smoogipoo/fix-initial-spectator-state-callback ... Fix OnUserBeganPlaying not being invoked if already watching	2021-04-22 17:17:02 +09:00
Dean Herbert	84a7138223	Update tests to better support stack regeneration cases	2021-04-22 17:13:19 +09:00
Dean Herbert	3e1002fbf3	Improve osu!catch caught fruit placement algorithm	2021-04-22 17:06:28 +09:00
Dean Herbert	daafa41dc1	Merge branch 'master' into fix-initial-spectator-state-callback	2021-04-22 16:22:04 +09:00
Dean Herbert	68807a90ec	Merge pull request #12448 from smoogipoo/gcc-abstraction ... Make GameplayClockContainer abstract and add MasterGameplayClockContainer	2021-04-22 16:20:52 +09:00
Dean Herbert	5a6a6a4742	Merge pull request #12525 from peppy/update-framework ... Update framework	2021-04-22 15:59:17 +09:00
Dean Herbert	9a7bf8109f	Allow certain mouse input to pass through PlacementBlueprints to the selection logic	2021-04-22 15:44:12 +09:00
Dean Herbert	cf1e3ea988	Add failing test covering quick shift-rightclick deletion in placement mode	2021-04-22 15:44:12 +09:00
Dean Herbert	b37c5a8749	Rollback hold note placement when length is zero	2021-04-22 14:59:57 +09:00
Dean Herbert	3befb49ea9	Fix system messages always being displayed above standard messages ... Closes https://github.com/ppy/osu/issues/12509.	2021-04-22 14:52:01 +09:00
Dean Herbert	ea3bb07924	Add test that fails on incorrect system/info message ordering	2021-04-22 14:51:14 +09:00
Jamie Taylor	21f34be19f	Add support for per-ruleset sample playback when switching rulesets (via toolbar)	2021-04-22 14:43:36 +09:00
Dean Herbert	60b702549d	Update framework	2021-04-22 14:20:49 +09:00
Dean Herbert	0f70469d1c	Only apply custom editor overrides if hit animations is disabled	2021-04-21 19:44:17 +09:00
Dean Herbert	f2824a222a	Adjust existing fades to close match stable editor	2021-04-21 19:41:15 +09:00
Dean Herbert	47a4a07024	Split out animation triggering of MainCirclePiece to be interface driven	2021-04-21 19:15:10 +09:00
Dan Balasescu	ebfe9cbe23	Merge pull request #12516 from peppy/update-framework ... Update framework	2021-04-21 18:06:00 +09:00
Dean Herbert	9d8f0c854d	Setup configuration item for editor hit animations	2021-04-21 18:05:40 +09:00
Dean Herbert	c6c91cd9a5	Refactor WaveformOpacityMenuItem to not receive whole config	2021-04-21 18:05:26 +09:00