1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 18:23:04 +08:00
Commit Graph

29527 Commits

Author SHA1 Message Date
Shivam
7e5db5e933 Apply review suggestions 2020-06-03 23:49:06 +02:00
Shivam
7b77d43353
Merge branch 'master' into custom-ipc-location 2020-06-01 23:31:30 +02:00
Shivam
fea5c8460a Fixed path is empty exception
Also converted method to property get, private set
2020-06-01 22:50:24 +02: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
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
Shivam
33d731644c Fix test crashing: NullReferenceException 2020-05-31 17:35:53 +02:00
Shivam
ce360a960f use GameHost's GetStorage instead of local storage
This will now get the IPC Path again as the default path if one is present, else it will fall back to osu! lazer's base path.
2020-05-31 16:50:13 +02:00
Shivam
0027f44bd0 Moved stableInfo read to FileBasedIPC
DI is also not needed anymore to access StableInfo, this goes through FileBasedIPC.
Note: directory selector now always navigates to the osu! lazer base path.
2020-05-31 16:27:05 +02:00
Shivam
dbb7651e60
Merge branch 'master' into custom-ipc-location 2020-05-31 15:53:08 +02: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
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
Shivam
ac3e804d73
Merge branch 'master' into custom-ipc-location 2020-05-28 15:29:38 +02:00
Shivam
3731e76b10 Move stable_config declaration, rename testscene 2020-05-28 15:28:27 +02: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
Shivam
6e8a964c45
Merge branch 'master' into custom-ipc-location 2020-05-28 15:07:43 +02:00
Shivam
7ae2383288 move stable config declaration and initial reading 2020-05-28 15:03:49 +02: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