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

34976 Commits

Author SHA1 Message Date
Angela Zhang
45482e8709 Whitespace fixes 2020-12-17 18:43:39 -06:00
Angela Zhang
454c7538c0 CI Style Fixes 2020-12-17 17:59:36 -06:00
Angela Zhang
cbfa292c05 Minor test style fixes 2020-12-17 16:59:19 -06:00
Angela Zhang
d8864473b2 Merge branch 'keyboard_shortcuts' into jcramos/ctrl_shift_t 2020-12-17 16:56:44 -06:00
Angela Zhang
71a082110a Making style changes + supports reopening PM chats 2020-12-17 16:56:34 -06:00
Joseph-Ramos-CMU
b37a983fbf Formatting fixes
Fixed some formatting issues to comply with InspectCode.
2020-12-16 12:56:36 -05:00
Joseph-Ramos-CMU
2f8a085adf Reworked reopening last tab to no longer use recursion
A reviewer of the pull request was concerned about recursion. I changed
the code to be iterative.
2020-12-16 12:04:07 -05:00
Joseph-Ramos-CMU
7b169c4f62 Changed internal closedChannel list to store channels names instead of channel objects
This is for efficiency purposes; it's more efficient to just store
the names than store the whole object.
2020-12-16 10:13:50 -05:00
Jess Meng
8bd787dce9 Moved private methods beneath public ones 2020-12-15 20:50:23 -08:00
Angela Zhang
456c0751fd
Merge pull request #8 from angelaz1/jcramos/ctrl_shift_t
Ctrl+Shift+t Chat Shortcut
2020-12-15 16:54:11 -06:00
Joseph-Ramos-CMU
1b702b2b1f Removed all CI tests
Just trying to get a commit that passes all CI tests
2020-12-15 11:57:51 -05:00
Joseph-Ramos-CMU
bd32dbdc2f Added back a modified test case
Added a simple test for Ctrl+Shift+T.
2020-12-15 00:10:11 -05:00
Joseph-Ramos-CMU
16a1039522 Completely removed all CI tests
THe GitHub CI is still failing for unknown reasons. I tried to
remove them all to see what the problem really is
2020-12-15 00:00:43 -05:00
Joseph-Ramos-CMU
c000d6d622 Minor formatting change
Still trying to fix the CI problems
2020-12-14 23:30:57 -05:00
Joseph-Ramos-CMU
5dc917c108 Modified test case
I believe the tests are failing because the shortcut only works
when you select a channel on the channel dropdown. So I updated the testcases to do this.
2020-12-14 22:30:16 -05:00
Joseph-Ramos-CMU
9af448d559 Testing first CI test 2020-12-14 22:02:34 -05:00
Jessica Meng
76f3bc027c
Merge pull request #5 from angelaz1/jmeng1/keyboard_shortcuts
Added tests for ctrl + w and ctrl + t
2020-12-14 18:18:40 -08:00
Joseph-Ramos-CMU
f17df1fdf5 Commented out all CI tests
Part of my efforts to narrow down GitHub CI issues
2020-12-14 19:27:04 -05:00
Joseph-Ramos-CMU
bd2e42e786 Toggling out CI tests
I'm still trying to track donwn why GitHub won't accept my CI.
I'm toggling tests to see what is the problem.
2020-12-14 19:10:26 -05:00
Jess Meng
7fe7c24ce1 Style fixes for whitespaces 2020-12-14 15:44:40 -08:00
Joseph-Ramos-CMU
37a6010887 Changed test formatting
Tests should be prefixed with [Test]. Previously my tests do not have this.
2020-12-14 18:33:51 -05:00
Jess Meng
017e00eb26 More style fixes 2020-12-14 15:27:57 -08:00
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
Angela Zhang
1af0f79ddf
Adding newline style fixes 2020-12-14 16:58:43 -06:00
Joseph-Ramos-CMU
61fe6ca84e Added back CI tests 2020-12-14 15:47:48 -05:00
Jess Meng
9cb0ed3b8f Fixed formatting for tests 2020-12-14 12:38:59 -08: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
Jess Meng
ccbf6db810 Fixed some formatting and style 2020-12-13 22:11:52 -08:00
Jess Meng
57500666d6 Merge branch 'jmeng1/keyboard_shortcuts' of https://github.com/angelaz1/osu into jmeng1/keyboard_shortcuts 2020-12-13 22:06:08 -08:00
Jess Meng
35f403dacd Added tests for ctrl + w and ctrl + t 2020-12-13 22:05:54 -08: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
aaca703483
Merge pull request #3 from angelaz1/jmeng1/keyboard_shortcuts
Added ctrl + w and ctrl + t keyboard shortcuts
2020-12-12 21:22:12 -06: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
Dean Herbert
bf2594baa9
Merge pull request #11150 from peppy/update-framework
Update framework
2020-12-12 21:35:53 +09:00
Bartłomiej Dach
51840121b9
Merge branch 'master' into update-framework 2020-12-12 13:02:34 +01:00
Dean Herbert
f20c5a2bda Update framework (again) 2020-12-12 15:29:26 +09:00
Jess Meng
92cab12eb7 Added ctrl + w and ctrl + t keyboard shortcuts 2020-12-11 21:52:36 -08:00
Bartłomiej Dach
df198d9006
Merge pull request #11137 from peppy/fix-player-load-stuck-at-empty-screen 2020-12-11 21:22:12 +01:00
Bartłomiej Dach
d457926523
Merge branch 'master' into fix-player-load-stuck-at-empty-screen 2020-12-11 20:49:27 +01:00
Bartłomiej Dach
3ffa03a2c5
Merge pull request #11139 from peppy/fix-single-threaded-seeking 2020-12-11 20:46:54 +01:00