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

26159 Commits

Author SHA1 Message Date
Dean Herbert
1fff9a93b9 Merge branch 'master' into skin-editor-closest-anchor 2021-06-22 16:41:51 +09:00
Dean Herbert
4b3165084d Move scoped functionality into local function 2021-06-22 16:40:56 +09:00
Dean Herbert
ffac32a848 Reword xmldoc 2021-06-22 16:40:48 +09:00
Joseph Madamba
6fda5e569a Fix beatmap discussion links wrongly leading to beatmap page 2021-06-20 21:37:00 -07:00
Dean Herbert
c624ec79b1
Merge pull request #13575 from bdach/realm-on-xamarin
Add direct references to Realm from Xamarin projects
2021-06-20 21:51:25 +09:00
smoogipoo
32bd3107e1 Remove high performance GC setting 2021-06-20 17:07:41 +09:00
Bartłomiej Dach
1f383532f2 Move FodyWeavers configuration to solution root 2021-06-20 10:05:49 +02:00
Bartłomiej Dach
46b9fd9ac8 Remove and ignore FodyWeavers schema files 2021-06-20 10:05:42 +02:00
Dean Herbert
b6e07ff59c
Merge pull request #13572 from bdach/fix-unsupported-locales
Fix game crashes due to attempting localisation load for unsupported locales
2021-06-19 17:09:39 +09:00
Dean Herbert
afcc3e14f4
m 2021-06-19 16:16:29 +09:00
Bartłomiej Dach
b47774b55a Remove Tagalog language for now
Rationale given in inline comment.
2021-06-19 08:07:37 +02:00
Bartłomiej Dach
76db87f9cb Try-catch around localisation store registration
Some platforms (android, older windows versions) will throw exceptions
at runtime when an unsupported `CultureInfo` is attempted to be
instantiated, leading to nasty crashes. Add a preventative try-catch
registration to prevent the crash, and log the errors for visibility.
2021-06-19 08:02:30 +02:00
Dean Herbert
3f336d88ec
Merge pull request #11461 from peppy/realm-key-binding-store
Add initial realm database implementation with KeyBindingStore migration
2021-06-19 02:49:41 +09:00
Dean Herbert
89c27dcb10
Merge pull request #13517 from ekrctb/initial-entry
Allow setting `Entry` of `PoolableDrawableWithLifetime` (including `DrawableHitObject`)
2021-06-19 00:03:41 +09:00
Dean Herbert
fa838ba253
Merge pull request #13528 from gagahpangeran/last-lang
Add remaining non-rtl language
2021-06-19 00:00:33 +09:00
smoogipoo
acb47b1606 Merge branch 'master' into last-lang 2021-06-18 23:30:59 +09:00
Dean Herbert
b1fd812805
Merge branch 'master' into more-ui-sfx 2021-06-18 23:24:19 +09:00
Dean Herbert
36f0769f83
Merge branch 'master' into inter-font 2021-06-18 22:38:20 +09:00
Dean Herbert
1ec03bf6fa Update resources 2021-06-18 22:25:24 +09:00
Dean Herbert
1f6b4b10ab Update resources 2021-06-18 22:16:15 +09:00
Dean Herbert
390abccb4b Add workaround for dropdowns playing close animation on first display 2021-06-18 22:08:59 +09:00
Jamie Taylor
5ce52b2669
fix ModButton duplicate click sound 2021-06-18 21:41:07 +09:00
Jamie Taylor
6e4fc26e16
replace 'songselect' hover/click sounds with 'button' ones for now 2021-06-18 21:03:46 +09:00
Jamie Taylor
953683044f
fix checkbox sounds not being used for certain checkboxes 2021-06-18 21:00:08 +09:00
Dean Herbert
5897475708
Merge pull request #13552 from peppy/fix-ruleset-dll-rename
Fix loading a ruleset with an updated internal name causing a potential startup crash
2021-06-18 20:18:54 +09:00
Dean Herbert
2dadc9d686 Remove unused using statement 2021-06-18 19:39:01 +09:00
Dan Balasescu
846647b5c5
Merge pull request #13549 from peppy/storyboard-outro-logic-refactor
Separate out storyboard outro logic as much as possible from score completion flow
2021-06-18 19:38:00 +09:00
Dean Herbert
78c5ccda60 Fix renaming a ruleset DLL causing a startup crash 2021-06-18 19:32:40 +09:00
smoogipoo
42c5a962fb Add xmldoc remark 2021-06-18 19:27:10 +09:00
smoogipoo
36d51d5117 Don't set entry immediately 2021-06-18 19:23:37 +09:00
smoogipoo
36d2199a02 Add exception on Apply() while loading 2021-06-18 19:20:57 +09:00
Jamie Taylor
d462394635
add sound to dropdowns 2021-06-18 19:16:28 +09:00
Jamie Taylor
4feb7c848f
add sound to tab controls 2021-06-18 19:16:00 +09:00
Dan Balasescu
e0f4c792b8
Merge pull request #13546 from peppy/mods-can-specify-self-in-incompatible-list
Allow mods to specify incompatibility types which they implement themselves
2021-06-18 19:07:38 +09:00
Dean Herbert
c751e087ca
Merge branch 'master' into skin-editor-closest-anchor 2021-06-18 18:54:07 +09:00
Dean Herbert
36b5414b1d Update comment to hopefully explain a weird conditional better 2021-06-18 17:46:01 +09:00
Dean Herbert
d5a1524eb0 Add missing rulesetID check for global action matching 2021-06-18 17:12:01 +09:00
Dean Herbert
d06e52505a Fix thread safety of KeyBindingStore.GetReadableKeyCombinationsFor 2021-06-18 17:11:39 +09:00
Dean Herbert
c369beeaaa Merge branch 'master' into realm-key-binding-store 2021-06-18 16:52:35 +09:00
Dean Herbert
0bc68a7018 Move xmldoc to method 2021-06-18 16:50:31 +09:00
Dean Herbert
19507e107e Reorder methods to make more sense 2021-06-18 16:46:40 +09:00
Dean Herbert
a7f40dc6d4 Merge branch 'remove-synchronous-prepare-score-method' into storyboard-outro-logic-refactor 2021-06-18 16:45:01 +09:00
Dean Herbert
45122594e5 Remove the synchronous version of PrepareScoreForResults
Replaces all existing usages with the `async` version.
2021-06-18 16:24:08 +09:00
Dean Herbert
f3426e38b4 Add note about delay parameter 2021-06-18 16:18:20 +09:00
Dean Herbert
3819a1f03b Remove exit override behaviour
I don't actually know under what scenario this could have been hit, and
actually caused expected behaviour. Consider that in the scenario I
describe in the comment (which I added yesterday), the user is
requesting a pause or exit which would be "cancelled showing the results
instead". But in such a scenario, `PerformExit` would first be run,
which cancels the `resultsDisplayDelegate` in the first place.

The only special case would be pressing the close button on the window
decoration? Which I don't think should be a special case in the first
place, so I'm just going to remove this for the time being to keep
things simple.
2021-06-18 16:12:35 +09:00
Dean Herbert
06d1bd971c Default DrawableStoryboard to a completed state to avoid state change on empty storyboards 2021-06-18 16:08:49 +09:00
Dean Herbert
7ef8eac773 Remove unnecessary (and no longer correct) exception 2021-06-18 16:08:31 +09:00
Jamie Taylor
752d0a9f0b
add sound to scroll-to-top button 2021-06-18 16:08:14 +09:00
Dean Herbert
2bf855fcca Move all storyboard outro skip logic out of updateCompletionState
This method should only be called to trigger the score completion
portion of player progression. The storyboard skip/end logic is now
handled separately in `progressToResults`.
2021-06-18 15:50:43 +09:00
smoogipoo
5cf2ac78fc Adjust font namespaces 2021-06-18 15:40:35 +09:00