1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 14:37:21 +08:00

18753 Commits

Author SHA1 Message Date
Dan Balasescu
527577d7c3
Merge pull request #9236 from MiraiSubject/logovisualisation-subclass
Move user and skin specific settings for LogoVisualisation to a subclass
2020-06-09 19:16:24 +09:00
smoogipoo
05b1edb9d8 Fix incorrect beatmap showing 2020-06-09 19:01:02 +09:00
smoogipoo
4fd5ff61eb Add loading spinner 2020-06-09 18:53:55 +09:00
smoogipoo
44dd7d65be Fix duplicate scores showing 2020-06-09 18:21:37 +09:00
smoogipoo
7f05c16c9f Merge branch 'master' into timeshift-results-2 2020-06-09 15:59:13 +09:00
Dan Balasescu
7f72f59307
Merge branch 'master' into fetch-private-chat-history 2020-06-09 14:42:29 +09:00
Dan Balasescu
1476412eaa
Merge branch 'master' into startup-safety 2020-06-09 13:55:33 +09:00
Dean Herbert
9d68a95f3f
Merge branch 'master' into multi-room-load-spinner 2020-06-09 10:56:56 +09:00
Dean Herbert
5fdeeec8df
Merge pull request #9175 from smoogipoo/multiplayer-beatmap-checksum
Add timeshift beatmap checksum validation
2020-06-09 10:53:33 +09:00
Shivam
a60bb5feac Rename baseclass, add xmldoc & change access to internal 2020-06-08 23:45:40 +02:00
Shivam
0b6ae08c93 Removed unneeded properties 2020-06-08 21:31:03 +02:00
Shivam
d52e3f9386 Removed logovisualisation changes
Now depends on https://github.com/ppy/osu/pull/9236 for accent color changes to apply
2020-06-08 21:26:48 +02:00
Shivam
2a5e960025 Move user and skin specific settings to a subclass 2020-06-08 21:15:51 +02:00
Shivam
e821d787b4 Implement suggested changes
Note: LogoVisualisation is likely going to be needed in a separate PR to conform to the review.
2020-06-08 20:13:02 +02:00
Shivam
229a40e6e3 Code formatting fixed
Somehow slipped through after pushing
2020-06-08 15:39:15 +02:00
Shivam
f80cdeac5c Change transforms to roughly match fallback visually 2020-06-08 15:31:30 +02:00
dependabot-preview[bot]
e0c94304c7
Bump Humanizer from 2.8.11 to 2.8.26
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.11 to 2.8.26.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.11...v2.8.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 09:45:31 +00:00
dependabot-preview[bot]
ff555c41c6
Bump Sentry from 2.1.1 to 2.1.3
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.1...2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 08:57:44 +00:00
Dean Herbert
712fd6a944 Fetch existing private message channels on re-joining 2020-06-08 17:54:26 +09:00
Dean Herbert
dd61d6ed04 Attempt to reimport intro if a bad state is detected 2020-06-08 14:48:42 +09:00
Dean Herbert
63003757c4 Remove WorkingBeatmap cache when deleting or updating a beatmap 2020-06-08 14:48:26 +09:00
smoogipoo
443977aa8d Remove PreUpdate, update hash in Save() 2020-06-08 14:40:17 +09:00
smoogipoo
dfed27bd46 Add back stream seeking for sanity 2020-06-08 14:24:21 +09:00
Dean Herbert
72ada020a2 Don't attempt to use virtual track for intro sequence clock 2020-06-08 13:42:16 +09:00
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
Power Maker
939a76b08f Simplify negative equality expression 2020-06-03 21:42:23 +02:00
Power Maker
ff220b2ebe Remove unnecessary using statement. 2020-06-03 21:13:11 +02:00
Power Maker
bc5813cfb8
Merge branch 'master' into master 2020-06-03 21:10:35 +02: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
Power Maker
747ecd5ab2 Rename method to avoid confusion 2020-06-03 20:50:37 +02:00
Power Maker
eb15fc0bf9 Remove unnecessary comment 2020-06-03 20:46:24 +02:00