1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

1579 Commits

Author SHA1 Message Date
Dean Herbert
dc1046bf0c Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 12:53:05 +09:00
smoogipoo
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
Dean Herbert
98626018fd
Encapsulate editor hitobject additions/removals (#5878)
Encapsulate editor hitobject additions/removals
2019-08-29 18:20:24 +09:00
smoogipoo
7927b684d3 Hook up + use editor beatmap 2019-08-29 16:06:40 +09:00
Dean Herbert
ecfcbe3723 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 20:21:56 +09:00
Dean Herbert
7ea55a5cdd Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 16:36:20 +09:00
iiSaLMaN
18431a42e6 Resolve merge conflicts 2019-08-27 20:06:17 +03:00
Dean Herbert
7ccc409df7 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-27 18:27:26 +09:00
smoogipoo
9e926d44c0 Obsolete legacy UpdateState() method 2019-08-27 16:09:47 +09:00
Dean Herbert
66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank 2019-08-27 14:44:16 +09:00
Dean Herbert
7885c79467 Make bindables private 2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence 2019-08-27 14:12:59 +09:00
smoogipoo
fb8b5ee106 Add test 2019-08-26 16:31:46 +09:00
Dean Herbert
6e3a63dae8 Update tests 2019-08-26 12:31:51 +09:00
Dean Herbert
524547adbf
Merge branch 'master' into implement-grouped-difficulty-icons 2019-08-24 17:34:58 +09:00
iiSaLMaN
830ddd6ed9 Use all rulesets for many difficulties test 2019-08-24 01:31:53 +03:00
iiSaLMaN
8584d3ba23 Add many difficulties beatmap direct panel to the tests 2019-08-24 00:31:36 +03:00
iiSaLMaN
67acf20805 Add test beatmap set with many difficulties 2019-08-23 18:31:53 +03:00
iiSaLMaN
d8535574d1 Pass sample info to Skin.GetSample 2019-08-23 14:32:43 +03:00
Lucas A
6ea10ada34 Fix visual tests. 2019-08-23 13:31:45 +02:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dean Herbert
3949d46383 Add test fix to other test 2019-08-16 13:46:08 +09:00
Dean Herbert
ff601eefe6 Fix failing test 2019-08-16 13:21:28 +09:00
Dean Herbert
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
Dean Herbert
8ce2c876bf
Merge branch 'master' into multi-room-update 2019-08-13 21:03:03 +09:00
smoogipoo
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
smoogipoo
2b155e5407 Merge remote-tracking branch 'origin/master' into multi-room-update 2019-08-13 17:03:44 +09:00
Dan Balasescu
77fca7b04a
Merge branch 'master' into split-out-music-controller 2019-08-13 17:03:15 +09:00
Dean Herbert
4948e7d31c
Merge branch 'master' into split-out-music-controller 2019-08-13 16:43:56 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
smoogipoo
8d3f2f7645 Drop container from name 2019-08-13 14:09:10 +09:00
smoogipoo
5681d1097c Move into components namespace 2019-08-13 14:07:40 +09:00
Dean Herbert
4ccac60337 Merge remote-tracking branch 'upstream/master' into refactor-osd 2019-08-13 11:35:54 +09:00
Lucas A
5e49d0fb28 Fix CI issues 2019-08-12 12:11:01 +02:00
Lucas A
6533f114d4 Apply review suggestions 2019-08-12 12:09:09 +02:00
Andrei Zavatski
5b68a2f34a Rename trackManager to previewTrackManager 2019-08-12 09:50:49 +03:00
Dean Herbert
a83afd00b5
Merge branch 'master' into beatmap-scope-selector 2019-08-12 15:48:53 +09:00
Andrei Zavatski
6095480a54 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-12 09:36:15 +03:00
Dean Herbert
31fe121fe9 Merge remote-tracking branch 'RedMindZ/master' into autopilot 2019-08-12 14:40:52 +09:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim 2019-08-12 05:46:15 +09:00
iiSaLMaN
fe20e19243 Rename toggling steps 2019-08-11 23:21:05 +03:00
Salman Ahmed
bc32726f3c
Apply renaming suggestions
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2019-08-11 23:08:14 +03:00
Dean Herbert
c2e2c1e67e
Merge branch 'master' into refactor-osd 2019-08-11 13:13:12 +09:00
Dean Herbert
cb0cd7ed58 Add triangles intro 2019-08-09 20:05:28 +09:00
iiSaLMaN
537973fc45 Add test for disabling user dim on storyboard 2019-08-08 15:59:29 +03:00
Andrei Zavatski
9ab132520c Testcase improvements 2019-08-08 12:25:46 +03:00
Andrei Zavatski
460cf141de Add testing 2019-08-08 12:18:26 +03:00
Andrei Zavatski
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00