1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 12:57:25 +08:00
Commit Graph

18656 Commits

Author SHA1 Message Date
Craftplacer
101604e741 Redesign classes and generally improve code 2020-06-08 00:39:33 +02:00
Craftplacer
e95ffcb528 Merge remote-tracking branch 'upstream/master' into update-button 2020-06-07 22:51:03 +02:00
Craftplacer
4e56981554 Merge remote-tracking branch 'upstream/master' into update-button
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
2020-06-07 22:43:53 +02:00
Dean Herbert
b41384dde8
Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-07 18:05:33 +09:00
Salman Ahmed
efd5e14410
Clarify why ruleset bindable must be set at the BDL of any base test scene 2020-06-06 19:20:06 +03:00
Salman Ahmed
0f78af7252
Remove unnecessary disabled check
I have a bad memory here, til.
2020-06-06 19:19:30 +03:00
Dan Balasescu
2ad5b2065f
Merge branch 'master' into better-reimport-support 2020-06-05 20:59:55 +09:00
smoogipoo
bb89114b70 Show a loading spinner on multiplayer lounge loads 2020-06-05 20:52:27 +09:00
smoogipoo
0107e9ba16 Change lookups to use SingleOrDefault() 2020-06-05 19:18:00 +09:00
smoogipoo
caf94df0d0 Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-05 19:16:05 +09:00
Dean Herbert
5d1770dec8
Merge pull request #9212 from smoogipoo/fix-scorepanel-input
Fix score panel not receiving input in some places
2020-06-05 00:26:02 +09:00
Dean Herbert
bd2e4c50dd
Merge pull request #9211 from smoogipoo/change-date-format
Change format of date on score panel
2020-06-04 23:31:28 +09:00
smoogipoo
9c1542f897 Fix crash when pressing clear button twice 2020-06-04 22:17:00 +09:00
smoogipoo
afcefe01bf Fix score panel not receiving input in some places 2020-06-04 21:48:55 +09:00
smoogipoo
5d7bb8cb4e Change format of date on score panel 2020-06-04 21:33:38 +09:00
Salman Ahmed
741fa20149
Use CreateRuleset() for editor test scenes as well 2020-06-04 00:47:10 +03:00
Salman Ahmed
c72592c52c
Remove bindable-disabling logic and don't tie immediately to CreateRuleset() 2020-06-04 00:44:28 +03:00
Salman Ahmed
bbad70c3f0
Fix mod perfect test scenes failing due to null ruleset provided
Just a workaround for now, a better fix may be to put the test data creation in an action that is guaranteed to be invoked after the test scene has fully loaded (all dependencies would've been resolved by then).
2020-06-04 00:43:11 +03:00
Salman Ahmed
136e10086a
Set the ruleset bindable value at the BDL for its subclasses usages
There are test scenes using current value of ruleset bindable on their BDL (example in TestSceneSliderSnaking's BDL)
2020-06-04 00:37:06 +03:00
Salman Ahmed
11da045d8c
Reorder declaration position of ruleset-creation methods
Should be recognized as a normal protected method in its declaring class.
2020-06-03 23:43:18 +03:00
Salman Ahmed
84b40ea2c6
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
#	osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
#	osu.Game/Tests/Visual/ModTestScene.cs
#	osu.Game/Tests/Visual/OsuTestScene.cs
2020-06-03 22:00:02 +03:00
Dean Herbert
5ed3cd205f Simplify reuse check using FileInfo IDs 2020-06-03 23:35:56 +09:00
Dean Herbert
f6d9f0597b Add implicit join logic for multiplayer rooms 2020-06-03 21:28:29 +09:00
Dean Herbert
012933545e Add test coverage 2020-06-03 18:33:41 +09:00
Dean Herbert
c155ab8339 Check filenames and timestamps before reusing an already imported model 2020-06-03 18:03:10 +09:00
smoogipoo
092f5b6521 Fix incorrect reference + simplify 2020-06-03 17:41:05 +09:00
Dean Herbert
1ba3f0ac14 Fix chat history not being loaded for multiplayer matches 2020-06-03 17:31:55 +09:00
smoogipoo
8aa8d2c880 Resolve NREs 2020-06-03 16:59:37 +09:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Dan Balasescu
73467410ab
Merge pull request #9192 from peppy/fix-redundant-override
Fix redundant override showing up in build warnings
2020-06-03 16:15:33 +09:00
smoogipoo
3c07defa1a Push to main multiplayer screen instead 2020-06-03 15:57:01 +09:00
Dean Herbert
1992a3db54 Fix redundant override showing up in build warnings 2020-06-03 15:50:00 +09:00
Dan Balasescu
8131137fea
Merge branch 'master' into fix-results-crash 2020-06-03 15:19:30 +09:00
smoogipoo
22f4e9012c Remove temporary code 2020-06-03 12:54:16 +09:00
smoogipoo
13622eff1f Fix response value 2020-06-03 12:54:07 +09:00
Dean Herbert
5740fc2bd0
Merge pull request #9168 from Game4all/fix-ruleset-no-autoplay
Fix crash after using Ctrl+Enter when current ruleset doesn't have an autoplay mod
2020-06-03 12:50:57 +09:00
Shane Woolcock
b174daa94a Remove unused using 2020-06-03 11:58:56 +09:30
Shane Woolcock
96e3c6e8e8 Move check to SoloResultsScreen 2020-06-03 11:36:47 +09:30
Shane Woolcock
90213d079d Include submission status in check 2020-06-03 10:48:27 +09:30
Shane Woolcock
f4f84ede6a Fix results screen crashing for beatmaps with no online ID 2020-06-03 10:43:16 +09:30
Lucas A
275d95082a Fix crash in testing environment. 2020-06-02 16:01:01 +02:00
Dean Herbert
a3e31adbf9
Merge pull request #9146 from peppy/taiko-editor
Implement osu!taiko editor
2020-06-02 21:49:20 +09:00
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
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
64550fe87c
Merge branch 'master' into fix-draining-in-between-break-sections 2020-06-02 16:06:08 +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
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
Lucas A
e9b09373e7 Fix crashing if selected ruleset doesn't have an autoplay mod. 2020-06-01 17:41:04 +02: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
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
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
53b58910c3 Invert interface definition 2020-06-01 14:27:39 +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
a11910e675 Merge branch 'i-has-curve-with-repeats' into taiko-editor 2020-05-31 22:43:38 +09:00
Dean Herbert
d5c31f390b Merge branch 'move-setter-to-duration' into taiko-editor 2020-05-31 22:42:53 +09:00
Dean Herbert
189ad61daa Merge branch 'master' into taiko-editor 2020-05-31 22:42:34 +09: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
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
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
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
3b6619a360 Flip direction to avoid breaking other usages 2020-05-29 16:45:47 +09:00
Dean Herbert
590931b17c Pass hitobjects as a parameter to CreateBlueprintContainer 2020-05-29 16:45:47 +09:00
Dean Herbert
597f284805 Tidy up and complete xmldoc for HitObjectComposer 2020-05-29 16:45:47 +09:00
Dean Herbert
b2fad91589 Add swell and drumroll blueprints 2020-05-29 16:45:47 +09:00
Dean Herbert
dd7dbfd548 Rename to IHasDuration 2020-05-29 16:45:47 +09:00
Dean Herbert
534dccc0c3 Move sett from EndTime to Duration 2020-05-29 16:45:47 +09:00
Dean Herbert
280b0adb1d Split out IHasPath from IHasCurve to better define hitobjects 2020-05-29 16:45:47 +09:00
Dean Herbert
a2eec5d963 Fix strong bindable changes for DrumRolls 2020-05-29 16:45:47 +09:00
Dean Herbert
3487c1fd1b Add menus to mark as rim and strong 2020-05-29 16:45:47 +09: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
smoogipoo
a606f41297 Add button to open results 2020-05-28 22:25:00 +09:00
smoogipoo
0e28ded80f Forward statistics 2020-05-28 22:09:11 +09:00
smoogipoo
d88bfa2080 Cache ruleset + fix possible nullrefs 2020-05-28 22:09:11 +09:00
smoogipoo
7ac08620b8 Add a user object for now 2020-05-28 22:09:11 +09:00
smoogipoo
f9c64d7be3 Implement creation of mods 2020-05-28 22:09:11 +09:00
smoogipoo
38502ba88c Remove some unnecessary members 2020-05-28 22:09:11 +09:00
smoogipoo
ee59182989 Implement initial structure for room scores 2020-05-28 22:09:11 +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
1a2392aa83
Merge branch 'master' into remove-unused-mania-rprop 2020-05-28 14:57:10 +09:00
Dean Herbert
e4de20f0a5 Update framework 2020-05-28 11:54:27 +09:00
Dean Herbert
6be5917eb0 Remove necessity for custom mania interface caching 2020-05-27 23:15:16 +09:00
Dan Balasescu
74ad734270
Merge pull request #9125 from peppy/fix-save-causing-delete
Fix saving in the editor causing the current beatmap to change
2020-05-27 21:40:58 +09:00
Dan Balasescu
0891c47d09
Merge pull request #9124 from peppy/editor-hide-non-alive-blueprints-default
Hide non-alive selection blueprints by default
2020-05-27 21:29:53 +09:00
Dean Herbert
9928bff664
Merge branch 'master' into results-screen-condensed-panel 2020-05-27 21:19:33 +09:00
Dean Herbert
9a060cfb3a Allow drag selections to occur from outside the playfield 2020-05-27 20:44:15 +09:00
Dean Herbert
f989f1aa00 Change event flow to avoid firing store delete events on update 2020-05-27 16:08:47 +09:00
Dean Herbert
f5c974dd89 Hide non-alive selection blueprints by default 2020-05-27 13:40:16 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
b8e0a6f127 Move sett from EndTime to Duration 2020-05-27 12:37:44 +09:00
Dean Herbert
6b5b215299 Split out IHasPath from IHasCurve to better define hitobjects 2020-05-26 17:44:47 +09:00
smoogipoo
c07a33b24f Fix ctor accessibility 2020-05-26 17:31:50 +09:00
Dean Herbert
7e1e26de2a Allow HandleMovement by default 2020-05-26 17:04:31 +09:00
smoogipoo
de0b6ec9f1 Create abstract implementation 2020-05-26 17:00:41 +09:00
smoogipoo
c86a003ef9 Adjust transition for smaller sizes 2020-05-26 16:27:41 +09:00
smoogipoo
906a317a3d Reduce casting 2020-05-26 16:26:53 +09:00
smoogipoo
1768cbd131 Format score same as expanded panel 2020-05-26 15:56:56 +09:00
smoogipoo
51e74687f8 Merge branch 'editor-scrolling-playfield-support' of https://github.com/peppy/osu; branch 'results-screen-condensed-panel' of https://github.com/smoogipoo/osu into results-screen-condensed-panel 2020-05-26 15:39:39 +09:00
Dan Balasescu
b5de30ef3d
Merge branch 'master' into editor-scrolling-playfield-support 2020-05-26 14:46:58 +09:00
Dean Herbert
d041de63ce Allow SelectionHandler to provide custom context menu items without local hover check 2020-05-26 13:53:09 +09:00
Dean Herbert
0cc6d6d97c
Merge pull request #9033 from smoogipoo/applydefaults-cancellation
Add cancellation token support to CreateNestedHitObjects()
2020-05-26 12:04:06 +09:00
Dean Herbert
417e31d77f Rename function for consistency 2020-05-26 10:17:56 +09:00
Dean Herbert
d69111c665 Fix spelling of breadth 2020-05-26 10:17:34 +09:00
Dan Balasescu
98f3d790df
Merge pull request #9107 from peppy/editor-remove-size-propagation
Remove unnecessary size propagation in HitObjectComposer
2020-05-25 23:55:26 +09:00
Dean Herbert
cf341998c3 Update framework 2020-05-25 22:55:21 +09:00
Dean Herbert
f8d9c044df Merge branch 'master' into fix-wrapped-storage-native-open 2020-05-25 22:50:36 +09:00
Dean Herbert
8fc60d12c9 Add back comments 2020-05-25 22:09:09 +09:00
Dan Balasescu
98f49a4236
Merge pull request #9084 from peppy/editor-clock-transform
Transform seeks in editor to allow for better visual context
2020-05-25 22:07:56 +09:00
Dean Herbert
e7442ec3a2 Remove need for ManiaSnapResult 2020-05-25 19:33:03 +09:00
Dean Herbert
2c16619ecd Move time to position conversion to ScrollingHitObjectContainer 2020-05-25 19:32:39 +09:00
Dean Herbert
af5fac471e Remove unnecessary size propagation in HitObjectComposer 2020-05-25 19:29:46 +09:00
smoogipoo
ebe2e97372 Merge branch 'master' into editor-clock-transform 2020-05-25 19:01:04 +09:00
dependabot-preview[bot]
c4665048db
Bump SharpCompress from 0.25.0 to 0.25.1
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.25.0 to 0.25.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25...0.25.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-25 09:34:26 +00:00
dependabot-preview[bot]
d09b579aee
Bump DiffPlex from 1.6.1 to 1.6.2
Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.1 to 1.6.2.
- [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-05-25 09:32:24 +00:00
smoogipoo
6f4cd6111c Drop obsoletion status for now 2020-05-25 16:50:49 +09:00
smoogipoo
bc35bc5efb Merge branch 'master' into applydefaults-cancellation 2020-05-25 16:45:30 +09:00
smoogipoo
cd65fc860b Remove extra default application 2020-05-25 16:15:55 +09:00
Dean Herbert
b44beb4137 Remove double resolution of EditorClock 2020-05-25 15:40:45 +09:00
Dean Herbert
ed83ef202a Merge branch 'master' into editor-clock-cache 2020-05-25 15:39:42 +09:00