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

34828 Commits

Author SHA1 Message Date
Joseph-Ramos-CMU
206312d4c2 Changed the CI tests
I'm trying to make changes because something is going wrong with theGitHub CI tests.
2020-12-14 18:26:57 -05:00
Joseph-Ramos-CMU
61fe6ca84e Added back CI tests 2020-12-14 15:47:48 -05:00
Joseph-Ramos-CMU
bd2765ecc4 Fixed style concerns 2020-12-14 13:23:43 -05:00
Joseph-Ramos-CMU
b26946ba8e Temporarily removed test cases
I did this to try to figure out what was failing on pull requests
2020-12-14 13:09:34 -05:00
Joseph-Ramos-CMU
5903569386 Changing the Tests 2020-12-14 13:00:02 -05:00
Joseph-Ramos-CMU
3301f532ee Additional formatting
Ran the dotnet format as well as the .\InspectCode.ps1 tools, and
fixed the style issues they found.
2020-12-13 23:27:48 -05:00
Joseph-Ramos-CMU
337309ec13 Added Tests for the Ctrl+Shift+T shortcut
Tests have not actually been run yet.
2020-12-13 22:06:59 -05:00
Joseph-Ramos-CMU
08a2cdaf8d Minor formatting changes 2020-12-13 21:02:35 -05:00
Joseph-Ramos-CMU
2863187b16 Changing behvaior for channels that have already been reopened
Ctrl+Shift+t will now skip trying to reopen any channels that are
already open, and will instead attempt to open the next still-closed channel.
2020-12-13 20:46:02 -05:00
Joseph-Ramos-CMU
5481ba43c7 Fixed a bug where Ctrl+Shift+t shortcut was using the wrong list
The JoinLastClosedChannel code was using the joinedChannels list instead
of the closedChannels list. Fixing this bug made the Ctrl+Shift+t
shortuct work as expected.
2020-12-13 14:14:57 -05:00
Joseph-Ramos-CMU
2d98da0d61 Untested Ctrl+Shift+T shortcut prototype
Added a list to the ChannelManager class that tracks
which tabs I closed. Works like a stack, where it adds to the end
every time I close a tab. Then added a function that uses
this list to open the last closed channel, and added a shortcut inside of ChatOverlay,
similar to how jmeng implemented shortcuts.

Code is currently untested.
2020-12-13 13:21:50 -05:00
Angela Zhang
084e4ce50b
Removing whitespace 2020-12-12 20:11:57 -06:00
Angela Zhang
b9f687d7f9
Adding in extra blank line 2020-12-12 18:55:17 -06:00
Angela Zhang
4c1e75f101
Small whitespace fix 2020-12-12 18:02:08 -06:00
Jess Meng
3dd6589d6e Fixed style changes and cleaned up ctrl + t implementation 2020-12-12 15:53:08 -08:00
Jess Meng
92cab12eb7 Added ctrl + w and ctrl + t keyboard shortcuts 2020-12-11 21:52:36 -08:00
Dean Herbert
9064ca9064
Merge pull request #11066 from ekrctb/fix-sample-expire
Fix DrawableHitObjects potentially expiring before their hit samples finish playback
2020-12-04 21:52:36 +09:00
Dean Herbert
91c5183b3e
Merge pull request #11092 from peppy/fix-fullscreen-mouse-confining
Always confine mouse to screen when running fullscreen
2020-12-04 21:52:20 +09:00
Dean Herbert
7c0edb796e Always confine mouse to screen when running fullscreen 2020-12-04 20:49:18 +09:00
Dean Herbert
a21311f029
Merge pull request #11089 from Joehuu/one-binding-not-sentence-cased 2020-12-04 18:02:27 +09:00
Joehu
b8c284b34f Fix one more key binding string not being sentence cased 2020-12-04 00:51:46 -08:00
Dean Herbert
ff64ba1b08
Merge pull request #11071 from ekrctb/caught-object-refactor 2020-12-04 17:17:38 +09:00
Dean Herbert
d3a17b65d5 Move public methods upwards 2020-12-04 14:36:40 +09:00
Dean Herbert
8988023407 Tidy up code formatting and remove unnecessarily publicly exposed methods 2020-12-04 14:35:56 +09:00
Dean Herbert
aa24890aff
Merge branch 'master' into caught-object-refactor 2020-12-04 14:12:33 +09:00
Dean Herbert
e37c325d94
Merge pull request #11084 from bdach/fix-hidden-increased-visibility-state-2 2020-12-04 14:08:36 +09:00
Dean Herbert
a0f92628ac Merge branch 'master' into fix-sample-expire 2020-12-04 13:49:08 +09:00
Dean Herbert
2f4b3a2d4c
Merge branch 'master' into fix-hidden-increased-visibility-state-2 2020-12-04 13:38:01 +09:00
Dean Herbert
aeb059bcce
Merge pull request #11069 from smoogipoo/fix-hidden-mod-crash 2020-12-04 13:27:43 +09:00
Dean Herbert
48c42e4247
Merge pull request #11083 from LittleEndu/recommend-if-filtered
Select recommended beatmap if last selection is filtered
2020-12-04 13:22:34 +09:00
Dean Herbert
0134ac94a7
Merge pull request #11055 from ekrctb/catch-stateless-rng 2020-12-04 13:08:30 +09:00
Dean Herbert
5db15a6b26
Merge branch 'master' into fix-hidden-mod-crash 2020-12-04 12:50:02 +09:00
Dean Herbert
d15f947778
Merge pull request #11073 from smoogipoo/dho-remove-onparentreceived 2020-12-04 11:41:34 +09:00
Dean Herbert
5ded4b9faa
Merge branch 'master' into dho-remove-onparentreceived 2020-12-04 11:04:56 +09:00
Dean Herbert
3b38e0259f
Merge pull request #11085 from bdach/sampleinfo-consistent-hashcode 2020-12-04 10:31:44 +09:00
ekrctb
23af70dd32 Invert if 2020-12-04 10:24:25 +09:00
ekrctb
e82ca66d3e Fix depth of dropped objects 2020-12-04 10:21:54 +09:00
ekrctb
3de46d0a3b Fix & clarify catcher tests 2020-12-04 10:14:00 +09:00
Bartłomiej Dach
15d9147edd Ensure equality member consistency for SampleInfo
The previous implementation of `SampleInfo`'s equality members was not
completely correct in its treatment of the `sampleNames` array. While
`Equals()` compared the values of `sampleNames` using `SequenceEqual()`,
therefore performing a structural check that inspects the contents of
both arrays, `GetHashCode()` used `HashCode.Combine()` directly on the
arrays, therefore operating on reference equality. This could cause the
pooling mechanism of samples to fail, as pointed out in #11079.

To resolve, change the `GetHashCode()` implementation such that it also
considers the contents of the array rather than just the reference to
the array itself. This is achieved by leveraging
`StructuralEqualityComparer`.

Additionally, as a bonus, an array sort was added to the constructor of
`SampleInfo`. This is intended to be a "canonicalisation" processing
step for the array of sample names. Thanks to that sort, two instances
of `SampleInfo` that have the same sample names but permutated will also
turn out to be equal and have the same hash codes, given the
implementation of both equality members. This gives `SampleInfo`
set-like semantics.
2020-12-03 23:25:53 +01:00
Bartłomiej Dach
71fa0da7f4 Add failing test cases 2020-12-03 23:13:48 +01:00
Bartłomiej Dach
4d739f11a8 Fix spinner ticks getting increased visibility state
Regressed in #10696. The old `IsFirstHideableObject()` method did not
consider nested hitobjects, while its replacement -
`IsFirstAdjustableObject()` - did. Therefore, spinner ticks could be
considered first adjustable objects, breaking the old logic.

There is no need to match over `SpinnerBonusTick`, as it inherits from
`SpinnerTick`.
2020-12-03 22:51:59 +01:00
Bartłomiej Dach
0bc591fef2 Add failing assertions
`GameplayBeatmap` has to be used instead of the normal bindable
`Beatmap`, beecause the former uses osu!-specific hitobjects, while
the latter returns convert objects (i.e. `ConvertSlider`s).

Similarly, the mod has to be fetched from the player instead of the
global bindable, as `Player` has its own cloned instance of the mod, to
which the beatmap is applied. The global bindable instance does not have
`FirstObject` set.
2020-12-03 22:51:59 +01:00
Endrik Tombak
c25e2c3dd5 Select recommended beatmap if last selection is filtered 2020-12-03 23:13:14 +02:00
Dan Balasescu
1d92800761
Merge pull request #11068 from peppy/fix-carousel-edge-masking
Fix beatmap carousel panels getting masked away when out of scroll bounds
2020-12-03 20:40:44 +09:00
smoogipoo
09af4bbd57 Merge branch 'dho-remove-onparentreceived' into fix-hidden-mod-crash 2020-12-03 20:10:16 +09:00
smoogipoo
0bdf99b97a Remove OnParentReceived() 2020-12-03 20:08:42 +09:00
smoogipoo
73e99718bc Change order of OnParentReceived() 2020-12-03 20:06:26 +09:00
ekrctb
7e66714c2f Use ApplyCustomUpdateState for dropping transformation
We cannot just apply the transforms because DHO clears transforms when state is updated
2020-12-03 18:46:58 +09:00
ekrctb
be456f9c6b Make DroppedObjectAnimation private 2020-12-03 18:46:58 +09:00
Dean Herbert
37d550f42a
Merge pull request #11035 from smoogipoo/add-playlist-length 2020-12-03 18:39:54 +09:00