1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Commit Graph

37681 Commits

Author SHA1 Message Date
Dean Herbert
8a0fcf20ed Move offset settings up for more logical ordering 2021-03-30 12:32:42 +09:00
Dan Balasescu
ff43983c0a
Merge pull request #12214 from peppy/update-framework
Update framework and dependencies
2021-03-30 09:48:26 +09:00
smoogipoo
69db0a5593 Countries should not be null (internal game resource) 2021-03-30 09:03:34 +09:00
smoogipoo
804ffe9f48 Fix inspections 2021-03-30 09:00:09 +09:00
Dean Herbert
6f01070408 Add weird android package requirements 2021-03-29 23:11:24 +09:00
Dean Herbert
d84c9251e6 Update nuget packages 2021-03-29 22:17:24 +09:00
Dean Herbert
36364a4492 Update framework 2021-03-29 22:17:17 +09:00
Dan Balasescu
e6e29259c7
Merge pull request #12194 from peppy/fix-timeline-depth-ordering
Fix timeline not visually ordering hitobjects in a stable way
2021-03-29 21:31:56 +09:00
Dan Balasescu
1bb9f018a0
Merge branch 'master' into fix-timeline-depth-ordering 2021-03-29 20:47:47 +09:00
Dan Balasescu
3cf6a3f56d
Merge pull request #12076 from peppy/add-timeline-stacking-support
Implement editor timeline stacking support
2021-03-29 20:44:52 +09:00
Dan Balasescu
633a0f4a40
Merge pull request #12208 from peppy/fix-chat-scroll-stickiness
Fix chat scroll sticking visually when scrolling beyond bottom extent
2021-03-29 20:44:44 +09:00
Dean Herbert
690debe507
Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy 2021-03-29 19:31:16 +09:00
Dean Herbert
3909eda095 Avoid using a StringBuilder 2021-03-29 18:51:28 +09:00
Dean Herbert
90ab765cf5 Reorder methods and surround with region 2021-03-29 18:46:32 +09:00
Dan Balasescu
4a5fc82388
Merge branch 'master' into add-timeline-stacking-support 2021-03-29 18:42:59 +09:00
Nathan Alo
cdb779f764 move copy logic inside ComposeScreen 2021-03-29 17:30:23 +08:00
Nathan Alo
9a02f3868c return a string instead 2021-03-29 17:29:05 +08:00
Dean Herbert
699a317b44 Fix chat scroll sticking visually when scrolling beyond bottom extent 2021-03-29 18:07:47 +09:00
Bartłomiej Dach
b9b0623c83
Merge pull request #12181 from peppy/fix-accuracy-formatting 2021-03-27 15:19:00 +01:00
Bartłomiej Dach
ccd2d5d2a9
Merge branch 'master' into fix-accuracy-formatting 2021-03-27 14:42:13 +01:00
Dean Herbert
16e184e531
Merge pull request #12183 from frenzibyte/legacy-sprite-text-fonts
Improve code quality of constructing legacy sprite texts
2021-03-27 20:39:33 +09:00
Nathan Alo
21398e25b5 null check composer and ensure the correct start time from selected hit objects 2021-03-27 10:02:21 +08:00
Bartłomiej Dach
e9289853fc
Merge branch 'master' into fix-accuracy-formatting 2021-03-26 21:24:04 +01:00
Dan Balasescu
49d6bf066a
Merge pull request #12193 from peppy/fix-multiplayer-crash-on-enter-twice
Fix crash on attempting to join lobby using key press during a pending join
2021-03-26 19:27:17 +09:00
Nathan Alo
c96321206a fix appveyor complaints 2021-03-26 16:17:24 +08:00
Salman Ahmed
1b6e08b3eb Fix incorrect default font overlap for score and combo 2021-03-26 10:35:46 +03:00
Nathan Alo
71a0616861 remove extra semi colons 2021-03-26 15:34:45 +08:00
Nathan Alo
374f8c5e22 move to compose namespace and add license header 2021-03-26 15:33:28 +08:00
Dean Herbert
cb48e5f158 Fix timeline not visually ordering hitobjects in a stable way 2021-03-26 16:33:18 +09:00
Nathan Alo
b8b7eb4c4b refactor logic to its own component and handle hit object to string conversion to its ruleset-specific composers 2021-03-26 15:25:20 +08:00
Nathan Alo
2bea69456e remove implementations 2021-03-26 15:24:33 +08:00
Dean Herbert
77969bb223 Merge branch 'master' into add-timeline-stacking-support 2021-03-26 16:17:10 +09:00
Dean Herbert
6a4157d193 Remove unused using statement 2021-03-26 16:13:43 +09:00
Dan Balasescu
2b07e7bbce
Merge pull request #12192 from peppy/fix-download-progress-display
Fix multiplayer download progress showing incorrectly after an aborted download
2021-03-26 15:25:25 +09:00
Dean Herbert
7faca766e4 Fix crash on attempting to join lobby using key press during a pending join
Closes https://github.com/ppy/osu/issues/12040.
2021-03-26 14:49:05 +09:00
Dean Herbert
0a889fafc4 Don't send progress updates when not in a downloading state
This is mostly just a sanity/debounce check.
2021-03-26 14:04:40 +09:00
Dean Herbert
17a0b19ee7 Always set progress before updating download state
Without doing so, a state change may read from an old progress value.
2021-03-26 14:04:10 +09:00
Dean Herbert
4909eaf890 Add the ability to specify format provider (to make tests culture invariant) 2021-03-26 13:10:11 +09:00
Dean Herbert
6a7f926168 Change rounding to use a more general flooring approach 2021-03-26 13:10:11 +09:00
Dan Balasescu
51ab1dace4
Merge pull request #12190 from hbnrmx/beatmap-search-filter-row-general
Add beatmap search filter row "General"
2021-03-26 11:40:43 +09:00
Max Hübner
558f8fa51e Adjust testscene 2021-03-25 23:20:26 +01:00
Max Hübner
aa2c1ee85e Add new beatmap search filter row "General" 2021-03-25 23:20:10 +01:00
Salman Ahmed
bada1e7189 Update legacy spinner bonus counter usage 2021-03-25 15:00:06 +03:00
Salman Ahmed
6aa0c9d8fd Merge branch 'master' into legacy-sprite-text-fonts 2021-03-25 14:52:01 +03:00
Dean Herbert
452e5c7cc3
Merge pull request #11976 from frenzibyte/legacy-spinner-bonus 2021-03-25 20:24:08 +09:00
Dean Herbert
b4bccc19ba Refactor LegacySpriteText initialisation 2021-03-25 18:37:13 +09:00
Dean Herbert
c715b9b89e Merge branch 'master' into legacy-spinner-bonus 2021-03-25 18:09:25 +09:00
Dean Herbert
77888ae640 Remove unnecessary using 2021-03-25 17:51:20 +09:00
Dean Herbert
630faa3b56 Add TODO marking incorrect EF core data type
As mentioned in the comment, we probably don't need to be storing this
in the database in the first place (as it should be able to be
calculated from the other statistics we have available to us). Something
to consider when we refactor the database backend.
2021-03-25 17:50:21 +09:00
Dean Herbert
701342e036 Remove accuracy rounding at a ScoreProcessor level 2021-03-25 17:43:51 +09:00