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

29932 Commits

Author SHA1 Message Date
Dan Balasescu
427dbf7f58
Merge branch 'master' into update-framework 2020-06-02 20:54:50 +09:00
Lucas A
f63c66396f Apply review suggestions. 2020-06-02 13:32:52 +02:00
Dean Herbert
ed5f41ec23
Merge pull request #9092 from omkelderman/arbitrary-tourney-size
Add custom resolution set option to tournament client
2020-06-02 20:19:49 +09:00
Dean Herbert
c8b53b6e45
Merge branch 'master' into arbitrary-tourney-size 2020-06-02 19:30:36 +09:00
Dean Herbert
78fddc8957 Make button match height 2020-06-02 19:29:59 +09:00
Dean Herbert
828180ad9b Add default 2020-06-02 19:29:22 +09:00
Dean Herbert
665530f1c3 Remove excess newline 2020-06-02 17:22:59 +09:00
Dean Herbert
b58c22c36e Merge branch 'master' into taiko-editor 2020-06-02 17:22:40 +09:00
smoogipoo
dfb9687fb5 Extract update into PreUpdate(), add test 2020-06-02 17:22:09 +09:00
smoogipoo
fac96f6ddd Fix match beatmap not updating after re-download 2020-06-02 17:02:01 +09:00
Dean Herbert
b100fc7fc7
Merge pull request #8632 from frenzibyte/fix-draining-in-between-break-sections
Disallow HP draining in non-play sections
2020-06-02 16:53:00 +09:00
Dean Herbert
64550fe87c
Merge branch 'master' into fix-draining-in-between-break-sections 2020-06-02 16:06:08 +09:00
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
smoogipoo
3c85561cdc Add tests 2020-06-02 14:31:43 +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
smoogipoo
17e91695e0 Add checksum validation to the panel download buttons 2020-06-02 14:04:51 +09:00
smoogipoo
b41bb5a682 Update databased MD5 hash on save 2020-06-02 14:04:00 +09:00
smoogipoo
68fbe9f4c1 Add checksum validation to the ready/start button 2020-06-02 14:03:50 +09:00
smoogipoo
1ccdfd7364 Pull playlist beatmap checksum from api 2020-06-02 14:03:13 +09: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
Lucas A
e9b09373e7 Fix crashing if selected ruleset doesn't have an autoplay mod. 2020-06-01 17:41:04 +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
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
7437f81339
Merge branch 'master' into taiko-editor 2020-06-01 16:52:51 +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
780611a954
Merge branch 'master' into taiko-editor 2020-06-01 15:39:02 +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
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
a11910e675 Merge branch 'i-has-curve-with-repeats' into taiko-editor 2020-05-31 22:43:38 +09:00