1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 15:17:27 +08:00
Commit Graph

3392 Commits

Author SHA1 Message Date
Dean Herbert
ecd40072c4
Merge pull request #8312 from Game4all/low-hp-red-layer
Fade playfield to red when player health is low
2020-04-14 18:33:51 +09:00
smoogipoo
59728ffebd Fix up/improve test scene 2020-04-14 15:24:34 +09:00
smoogipoo
3c5fb79823 Mark dummy api test scene as headless 2020-04-14 14:51:09 +09:00
Dan Balasescu
ac8a3efc46
Merge branch 'master' into low-hp-red-layer 2020-04-14 14:47:01 +09:00
Dan Balasescu
33f7e429a8
Merge pull request #8444 from LittleEndu/select-recommended
Make beatmap carousel select recommended difficulties
2020-04-14 14:25:17 +09:00
Dan Balasescu
948e225e12
Merge branch 'master' into select-recommended 2020-04-14 13:59:03 +09:00
Dan Balasescu
d965baa4bd
Merge branch 'master' into dummy-api-request-support 2020-04-14 13:42:42 +09:00
Dean Herbert
68c25c38a7
Merge branch 'master' into no-video-option 2020-04-14 11:36:31 +09:00
Bartłomiej Dach
06407a1081 Merge branch 'master' into fix-classic-scoring 2020-04-14 02:13:45 +02:00
Bartłomiej Dach
3e48c26bc2 Add failing tests 2020-04-14 01:09:58 +02:00
Endrik Tombak
d9c91fb943 Merge branch 'master' of https://github.com/ppy/osu into no-video-option
 Conflicts:
	osu.Game/Overlays/Direct/PanelDownloadButton.cs
2020-04-13 17:40:28 +03:00
Dean Herbert
89d8063588 Add support for Perform/PerformAsync 2020-04-13 21:35:35 +09:00
Dean Herbert
2388799acf Limit upper number of editor beatmap states saved to 50 2020-04-13 20:37:46 +09:00
Dean Herbert
ef5e88dd82
Merge pull request #8696 from smoogipoo/editor-undo-redo
Add undo/redo support to the Editor
2020-04-13 19:12:47 +09:00
Dean Herbert
dd949a3fe0 Fix test writer flush happening too late 2020-04-13 17:52:04 +09:00
Dean Herbert
6aab19413c Rename differ to patcher, add xmldoc 2020-04-13 17:20:20 +09:00
Dean Herbert
bb53f96c71 Store states as byte[] instead of Streams 2020-04-13 17:18:50 +09:00
Andrei Zavatski
29dd225205 Make button protected 2020-04-13 10:45:15 +03:00
Dean Herbert
0c60dbe796
Merge branch 'master' into editor-undo-redo 2020-04-13 16:03:53 +09:00
Andrei Zavatski
bdce79ed5b Fix incorrect test step name 2020-04-13 09:57:05 +03:00
Andrei Zavatski
0eaff00787 Fix typo in test 2020-04-13 09:45:49 +03:00
Dean Herbert
39b5c9f396
Merge branch 'master' into overlay-scroll-container 2020-04-13 15:44:20 +09:00
Dean Herbert
72fb466a0b
Merge branch 'master' into present-from-overlay 2020-04-13 15:01:24 +09:00
Andrei Zavatski
99fa145847 Add test for potential failing case 2020-04-13 08:38:34 +03:00
Andrei Zavatski
b4800dd461 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-04-13 08:09:17 +03:00
Endrik Tombak
633b969017 Apply review suggestions 2020-04-12 21:57:35 +03:00
Endrik Tombak
1cf240b5ff Test new predicate behaviour 2020-04-12 20:04:25 +03:00
TheWildTree
07dc277321 Remove unused changelog comments class 2020-04-12 14:55:42 +02:00
Dean Herbert
25f36e87a6
Merge branch 'master' into overlay-scroll-container 2020-04-12 12:34:41 +09:00
Dean Herbert
c96df97586 Add support for non-generic requests 2020-04-11 18:02:49 +09:00
Dean Herbert
415adecdf6 Add support for Result fetching 2020-04-11 18:02:43 +09:00
Dean Herbert
832822858c Add basic request / response support 2020-04-11 17:48:23 +09:00
Dean Herbert
c0c1f2c023 Add test coverage 2020-04-11 17:17:18 +09:00
smoogipoo
41caa37856 Add tests 2020-04-10 13:29:49 +09:00
smoogipoo
e208251fc6 Wait for timeline to also load 2020-04-09 23:18:43 +09:00
smoogipoo
2e33d38cd7 Merge branch 'master' into editor-undo-redo 2020-04-09 22:02:28 +09:00
smoogipoo
ed4ce54ac3 Add tests 2020-04-09 21:56:36 +09:00
Dean Herbert
cc0bcea6e5
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
2020-04-09 21:32:58 +09:00
smoogipoo
ecd7ce4b98 Fix test scene 2020-04-09 21:00:23 +09:00
smoogipoo
86243d463f Add legacy beatmap diffing 2020-04-09 20:48:59 +09:00
smoogipoo
fde5cd34b2 Merge branch 'editorbeatmap-update-cleanup' into editor-undo-redo 2020-04-09 20:36:57 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Andrei Zavatski
134feefa14 Remove bindable 2020-04-09 13:10:09 +03:00
Andrei Zavatski
2d3ea95469 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-04-09 13:06:22 +03:00
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
Dean Herbert
53b2f58eda
Merge branch 'master' into overlay-scroll-container 2020-04-09 15:05:49 +09:00
Dean Herbert
1c72afe8c4 Move fading test to top for convenience 2020-04-09 14:52:40 +09:00
Dean Herbert
6db22366e2 Add new tests and tidy up existing tests 2020-04-09 14:47:48 +09:00
Dean Herbert
947745d87e Change fail effect to be less distracting 2020-04-09 14:34:23 +09:00
Dean Herbert
0e2d5213ce
Merge branch 'master' into low-hp-red-layer 2020-04-09 13:53:57 +09:00