1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 22:27:25 +08:00
Commit Graph

25128 Commits

Author SHA1 Message Date
Willy Tu
9d4542b1c8
Merge branch 'master' into #7146 2020-01-02 23:35:06 -08:00
smoogipoo
9c49da8942 Remove unnecessary extra "wait" frame 2020-01-03 16:24:39 +09:00
smoogipoo
97b4c65554 Fix taiko replay frames being mis-ordered 2020-01-03 16:24:29 +09:00
Dean Herbert
04d4059103
Update overlay headers controls in line with the web design (#7380)
Update overlay headers controls in line with the web design

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-03 16:11:21 +09:00
Dean Herbert
7d79edf335 Merge remote-tracking branch 'upstream/master' into overlay-headers-update-three 2020-01-03 15:35:33 +09:00
Dean Herbert
fe581bf27e Remove unnecessarily exposed value 2020-01-03 15:35:18 +09:00
Dean Herbert
e8567414c6 Refactor into some kind of sanity 2020-01-03 15:01:42 +09:00
Dan Balasescu
0fd87ced0e
Merge pull request #7424 from peppy/fix-changelog-overlay-nullref
Fix changelog overlay hard crashing on no internet connection
2020-01-03 14:32:30 +09:00
Dean Herbert
b80c421a29
Merge branch 'master' into overlay-headers-update-three 2020-01-03 14:24:09 +09:00
smoogipoo
b54491cc82 Make sure an exception is thrown 2020-01-03 14:16:38 +09:00
Willy Tu
942a04e82b
Merge branch 'master' into #7146 2020-01-02 12:07:45 -08:00
Dean Herbert
132b420aaa Fix changelog overlay hard crashing on no internet connection 2020-01-02 19:19:42 +09:00
Dean Herbert
9f5f78e443
Fix File Sharing on iOS 13 (#7414)
Fix File Sharing on iOS 13
2020-01-02 17:22:13 +09:00
Andrei Zavatski
a5c23e7cf7 Remove underline from breadcrumb display 2020-01-02 11:09:47 +03:00
Andrei Zavatski
35fad4c262 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-headers-update-three 2020-01-02 11:09:07 +03:00
Andrei Zavatski
0f331e81f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-headers-update-three 2020-01-02 10:59:31 +03:00
Dean Herbert
467fb0c3be
Add archive resources for testing (#7421)
Add archive resources for testing
2020-01-02 16:59:25 +09:00
smoogipoo
911816c282 Add archive test resources 2020-01-02 16:43:32 +09:00
Dean Herbert
3627b4cbba
Fix storyboard samples not loading from subfolders (#7419)
Fix storyboard samples not loading from subfolders
2020-01-02 16:39:16 +09:00
smoogipoo
cba6d9f7e6 Fix taiko samples not being loaded 2020-01-02 15:58:11 +09:00
smoogipoo
878e9f182e Add storyboard sample test scene 2020-01-02 15:23:41 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00
Dean Herbert
d1d19c2cd9 Move chevron size implementation 2020-01-02 14:26:40 +09:00
Dean Herbert
43903b2fea Make test scene usable 2020-01-02 14:24:58 +09:00
Dean Herbert
546f64f951 Method to property 2020-01-02 14:19:31 +09:00
smoogipoo
09cd66adb0 Fix storyboard samples not loading from subfolders 2020-01-02 14:07:22 +09:00
Dean Herbert
beb8e72e15
Move EditorBeatmap to Editor itself (#7399)
Move EditorBeatmap to Editor itself

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-02 02:24:31 +09:00
Dean Herbert
2d6482f586 Fix remaining tests 2020-01-02 01:43:37 +09:00
Dean Herbert
e4bbdb1956 Fix regressing test 2020-01-02 00:41:06 +09:00
Dean Herbert
f09f9eb07d Merge branch 'master' into general-editor-beatmap 2020-01-01 23:27:08 +09:00
Dean Herbert
6a992b340d Remove generic editor beatmap (#7398)
Remove generic editor beatmap

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-01 23:24:24 +09:00
Dean Herbert
4f2fa2626a Centralise calls to mutable hitobjects list 2020-01-01 21:24:00 +09:00
Dean Herbert
ca90f708f1 Merge remote-tracking branch 'upstream/master' into remove-editor-beatmap-generics 2020-01-01 21:03:31 +09:00
DTSDAO
47ca2804f6 Adjust Tab Performance 2020-01-01 06:41:17 +00:00
DTSDAO
6ade46d752 Fix File Sharing on iOS 13 2020-01-01 06:38:59 +00:00
Andrei Zavatski
19e7867aba Make OverlayHeader non-generic 2019-12-31 18:12:03 +03:00
Andrei Zavatski
3a71abe8ff Add xmldoc and better parameter naming 2019-12-31 17:52:41 +03:00
Dean Herbert
ddbdb02aa4
Merge branch 'master' into overlay-headers-update-three 2019-12-31 22:54:16 +09:00
Dean Herbert
3c30238eb2
Fix search textboxes absorbing home/end input on scroll contain… (#7403)
Fix search textboxes absorbing home/end input on scroll containers
2019-12-31 22:00:36 +09:00
Joehu
a292d235d6 Separate statement with newline 2019-12-30 09:49:34 -08:00
Joehu
25be3fd799 Move shift-delete handling to switch 2019-12-30 09:38:22 -08:00
Joehu
32e4d4a563 Fix search textboxes absorbing home/end input on scroll containers 2019-12-30 09:29:46 -08:00
Dean Herbert
d8b96a679d
Bump ppy.osu.Game.Resources from 2019.1227.0 to 2019.1230.0 (#7400)
Bump ppy.osu.Game.Resources from 2019.1227.0 to 2019.1230.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-12-30 23:20:38 +09:00
dependabot-preview[bot]
8ae4cfaa52
Bump ppy.osu.Game.Resources from 2019.1227.0 to 2019.1230.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.1227.0 to 2019.1230.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.1227.0...2019.1230.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 07:33:49 +00:00
smoogipoo
8c378dc625 Move EditorBeatmap construction/conversion to Editor 2019-12-30 14:51:14 +09:00
Andrei Zavatski
5748b60a06 Make item chevron size virtual 2019-12-30 08:26:49 +03:00
Dean Herbert
9d5d61a64d
Merge branch 'master' into overlay-headers-update-three 2019-12-30 13:42:23 +09:00
Dean Herbert
2836eb40cc
Add context menu on direct panels (#7394)
Add context menu on direct panels

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-30 12:11:34 +09:00
Dean Herbert
0eccfc79cc Remove unused field 2019-12-30 11:51:33 +09:00
Dean Herbert
a03a637728
Merge branch 'master' into add-context-menu-direct-panel 2019-12-30 11:37:02 +09:00