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

29502 Commits

Author SHA1 Message Date
Dean Herbert
70c84811ed Revert incorrect change 2020-06-02 15:50:36 +09:00
Dean Herbert
1b94048956 Merge branch 'replace-use-of-current-directory' into update-framework 2020-06-02 14:55:28 +09:00
Dean Herbert
6c8c95677f Fix incorrect usage of Directory.GetFiles 2020-06-02 14:55:10 +09:00
Dean Herbert
800c46f752 Fix test function override 2020-06-02 14:39:15 +09:00
Dean Herbert
c59d750420 Merge branch 'replace-use-of-current-directory' into update-framework 2020-06-02 14:31:09 +09:00
Dean Herbert
90f9905ed0 Update resourcse 2020-06-02 14:29:17 +09:00
Dean Herbert
46a209540e Update framework 2020-06-02 14:28:48 +09:00
Dean Herbert
00024f56fa
Merge pull request #9165 from ppy/dependabot/nuget/DiffPlex-1.6.3
Bump DiffPlex from 1.6.2 to 1.6.3
2020-06-01 18:50:20 +09:00
dependabot-preview[bot]
fbd9ad411f
Bump DiffPlex from 1.6.2 to 1.6.3
Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/mmanela/diffplex/releases)
- [Commits](https://github.com/mmanela/diffplex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-01 09:05:46 +00:00
Dan Balasescu
efbc02b521
Merge pull request #9161 from peppy/results-screen-horizontal-scroll
Allow horizontal scroll on results screen when not hovering expanded panel
2020-06-01 18:00:51 +09:00
Salman Ahmed
7a9ed78527
Remove missed leftover usages 2020-06-01 11:57:32 +03:00
Dan Balasescu
e8a25fea1a
Merge branch 'master' into results-screen-horizontal-scroll 2020-06-01 17:34:20 +09:00
Dan Balasescu
a8b137bb71
Merge pull request #9123 from peppy/move-setter-to-duration
Move setter from EndTime to Duration
2020-06-01 16:52:38 +09:00
Dan Balasescu
6b14f30028
Merge pull request #9143 from peppy/editor-create-composer-fix
Pass hitobjects as a parameter to CreateBlueprintContainer
2020-06-01 16:18:47 +09:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
b9464a2aa8
Merge branch 'master' into editor-create-composer-fix 2020-06-01 15:38:15 +09:00
Dean Herbert
1a427bf709
Merge pull request #9115 from peppy/i-has-curve-with-repeats
Split out IHasPath from IHasCurve to better define hitobjects
2020-06-01 15:37:38 +09:00
smoogipoo
cac6e93575 Restore original IHasCurve implementation 2020-06-01 15:11:58 +09:00
smoogipoo
d7e0391b5f Merge branch 'master' into i-has-curve-with-repeats 2020-06-01 14:27:43 +09:00
smoogipoo
53b58910c3 Invert interface definition 2020-06-01 14:27:39 +09:00
Dan Balasescu
1c6a2ab95e
Merge pull request #9142 from peppy/editor-documentation-hitobjectcomposer
Tidy up and complete xmldoc for HitObjectComposer
2020-06-01 14:18:28 +09:00
Dan Balasescu
fa830893d9
Merge branch 'master' into editor-documentation-hitobjectcomposer 2020-06-01 13:45:09 +09:00
Salman Ahmed
2c6887e610
Remove unnecessary use of and remove StartupStorage 2020-05-31 19:49:03 +03:00
Dean Herbert
e688033967 Fix incorrect xmldoc 2020-05-31 22:39:03 +09:00
Dean Herbert
19be111da0
Move incorrect placed full stop
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-31 22:33:10 +09:00
Dean Herbert
81b8898272 Fix incorrect type cast in encoder 2020-05-31 22:30:55 +09:00
Dean Herbert
0ef971be28 Merge branch 'master' into i-has-curve-with-repeats 2020-05-31 22:30:18 +09:00
Dean Herbert
532c34750e
Merge pull request #9160 from mcendu/fix-sprite-scale
Fix osu!mania stage-left and stage-right sprites incorrectly scaling horizontallly
2020-05-31 20:32:36 +09:00
Dean Herbert
e43217f579 Add test resources 2020-05-31 20:01:13 +09:00
Dean Herbert
f2dadeeeb5 Allow horizontal scroll on results screen when not hovering expanded panel 2020-05-31 13:50:42 +09:00
Dean Herbert
465df1731c
Merge pull request #9149 from EVAST9919/beatmap-listing-sort-fix
Fix searching by genre/language not working in beatmap listing overlay
2020-05-31 13:21:42 +09:00
mcendu
b06017dbf1
supress horizontal scaling of left-and-right stages 2020-05-31 11:28:54 +08:00
Salman Ahmed
82fe99cf4a
Replace any potential usage of Environment.CurrentDirectory with a new RuntimeInfo.StartupDirectory
Using `Environment.CurrentDirectory` for storing / reading files is dangerous as the current directory is mutable and can be changed when performing a certain operation (like opening solutions in roslyn type reference builder for example).
2020-05-31 02:24:49 +03:00
Dean Herbert
e64e44ecf9
Merge pull request #9086 from smoogipoo/results-screen-condensed-panel
Implement contracted score panel and integrate into results screen
2020-05-30 23:46:02 +09:00
Dean Herbert
d4b7c81f96
Merge branch 'master' into results-screen-condensed-panel 2020-05-30 23:13:52 +09:00
Andrei Zavatski
11057cd6a8 CI fix 2020-05-29 21:43:31 +03:00
Andrei Zavatski
9aa54ed89e Fix serach control background never being updated 2020-05-29 19:53:32 +03:00
Andrei Zavatski
affad47248 Fix genre/language search doesn't work 2020-05-29 19:44:53 +03:00
Dean Herbert
f9883373bb Flip direction to avoid breaking other usages 2020-05-29 16:11:26 +09:00
Dean Herbert
e8b43e8e1f Merge branch 'master' into move-setter-to-duration 2020-05-29 16:04:23 +09:00
Dean Herbert
8fa8c561e7 Pass hitobjects as a parameter to CreateBlueprintContainer 2020-05-29 12:20:50 +09:00
Dean Herbert
46689a2fbc Tidy up and complete xmldoc for HitObjectComposer 2020-05-29 11:46:32 +09:00
Dan Balasescu
9b277d52e5
Merge pull request #9137 from peppy/fix-gamebase-typo
Fix minor typo in OsuGameBase
2020-05-28 22:28:00 +09:00
smoogipoo
013461377e Fix potential nullref 2020-05-28 21:46:02 +09:00
smoogipoo
47d5974f04 Improve results screen behaviour when changing selected score 2020-05-28 21:40:01 +09:00
smoogipoo
ad99d85468 Resolve several positioning errors 2020-05-28 21:29:16 +09:00
smoogipoo
666cbd0f40 Allow selected score to be programmatically changed 2020-05-28 21:09:03 +09:00
smoogipoo
a55ce26130 Allow null score 2020-05-28 20:46:17 +09:00
Dean Herbert
912c999f40 Fix minor typo in OsuGameBase 2020-05-28 19:05:35 +09:00
Dan Balasescu
333b03de44
Merge pull request #9129 from peppy/remove-unused-mania-rprop
Remove necessity for custom mania interface caching
2020-05-28 15:34:28 +09:00