1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 20:47:28 +08:00
Commit Graph

28973 Commits

Author SHA1 Message Date
Dean Herbert
d9658bc34e Merge branch 'master' into custom-data-directory 2020-05-08 19:08:07 +09:00
smoogipoo
d67facf8e4 Add test scene 2020-05-08 18:50:06 +09:00
smoogipoo
22dda3fe02 Make ScrollingHitObjectContainer respond to defaults applied events 2020-05-08 18:49:58 +09:00
smoogipoo
efff2bf15d Add HitObject to DefaultsApplied event 2020-05-08 18:49:19 +09:00
smoogipoo
dcfef6b443 Add clear method to EditorBeatmap 2020-05-08 18:46:37 +09:00
Dean Herbert
a59db976d6 Fix loading a ruleset with a new version specification causing a crash 2020-05-08 18:05:06 +09:00
Lucas A
30dd158c33 Rename property to AllowGameplayOverlays and update XMLDoc accordingly. 2020-05-08 09:37:50 +02:00
Dean Herbert
48f93adb53
Merge pull request #8970 from peppy/android-version-update
Fix android usage of obsoleted VersionCode
2020-05-08 16:09:04 +09:00
Dean Herbert
116957a213
Merge pull request #8971 from peppy/commit-rider-vcs-update
Revert "Commit autogenerated rider VCS settings update"
2020-05-08 15:35:58 +09:00
Dean Herbert
c5589d278b Revert "Commit autogenerated rider VCS settings update"
This reverts commit af5e1f8298.
2020-05-08 15:35:25 +09:00
Dean Herbert
8b5de7403f Fix android usage of obsoleted VersionCode 2020-05-08 15:12:29 +09:00
Dean Herbert
586ddd8200
Merge pull request #8969 from peppy/update-framework
Update framework
2020-05-08 15:11:50 +09:00
Dan Balasescu
e893144c1f
Merge pull request #8968 from peppy/commit-rider-vcs-update
Commit autogenerated rider VCS settings update
2020-05-08 14:50:04 +09:00
Dean Herbert
9f64882f37 Update framework 2020-05-08 14:48:38 +09:00
Dean Herbert
af5e1f8298 Commit autogenerated rider VCS settings update 2020-05-08 14:22:07 +09:00
Dean Herbert
c9ca996d08
Merge pull request #8966 from peppy/update-framework
Update framework
2020-05-08 11:33:10 +09:00
Dean Herbert
d6840d880a Update StableStorage implementation in line with framework changes 2020-05-08 10:40:04 +09:00
Dean Herbert
b6f232e394 Update framework 2020-05-08 10:27:48 +09:00
Dean Herbert
abb32b3256
Merge branch 'master' into custom-data-directory 2020-05-08 10:05:11 +09:00
Dean Herbert
a019b5e6e8
Merge pull request #8958 from smoogipoo/fix-ss-nullref
Fix potential nullref in song select filtering
2020-05-08 09:08:03 +09:00
Dean Herbert
e8aebada3c
Merge pull request #8959 from smoogipoo/fix-catch-crash
Fix catch crashing when finishing maps
2020-05-07 23:46:36 +09:00
Dean Herbert
c5bd352f63
Merge branch 'master' into fix-ss-nullref 2020-05-07 22:29:18 +09:00
Dean Herbert
4ac5ed71f4 Remove redundant string interpolation 2020-05-07 21:48:57 +09:00
Dean Herbert
d21c42a222 Update framework 2020-05-07 20:59:29 +09:00
Dean Herbert
90e17853a8 Update tests in line with framework changes 2020-05-07 18:12:11 +09:00
Dean Herbert
e8a8c800e3
Merge pull request #8961 from peppy/tourney-3v3
Add support for 3v3 tournament chroma key layout
2020-05-07 18:09:41 +09:00
Lucas A
83998d5ba5 Trim whitespace. 2020-05-07 09:39:14 +02:00
Lucas A
83be5455d3 Disable the display of HUD through DisplayHud property. 2020-05-07 08:52:36 +02:00
Dean Herbert
6473cd77b2
Merge pull request #8960 from Joehuu/24-hour-format-date-tooltip
Fix date tooltip not showing in 24-hour format
2020-05-07 14:59:03 +09:00
Dean Herbert
09759565fa Add support for 3v3 tournament chroma key layout 2020-05-07 14:51:14 +09:00
Joehu
259ef68811 Fix date tooltip not showing in 24-hour format 2020-05-06 22:29:37 -07:00
smoogipoo
401c516503 Expose searchable terms from beatmap info instead 2020-05-07 13:04:08 +09:00
smoogipoo
e91e4a73af Fix catch crashing when finishing maps 2020-05-07 12:22:07 +09:00
smoogipoo
5186da8412 Fix potential song select nullref 2020-05-07 11:37:04 +09:00
Dean Herbert
7781408643 Update in line with framework storage changes 2020-05-06 18:28:24 +09:00
Dean Herbert
c8134162b5
Merge pull request #8934 from smoogipoo/sorcerer-catch-changes
Implement Sorcerer's osu!catch difficulty calculation adjustments
2020-05-06 18:10:33 +09:00
Lucas A
aff74db80d Publicly expose HUDOverlay in Player. 2020-05-05 10:40:10 +02:00
Dean Herbert
c903742d58
Merge pull request #8944 from TheBicPen/master
Fix typo and add spaces to comments
2020-05-05 13:56:57 +09:00
Dan Balasescu
0eae8d078b
Merge branch 'master' into master 2020-05-05 13:33:29 +09:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
alex
c987af988c Fix typo 2020-05-04 18:26:12 -07:00
Dan Balasescu
3bf58b7e3e
Merge pull request #8938 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.BannedApiAnalyzers-3.0.0
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 2.9.8 to 3.0.0
2020-05-04 21:42:45 +09:00
Dan Balasescu
c14842d18b
Merge pull request #8937 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.0.0
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 2.9.8 to 3.0.0
2020-05-04 21:42:29 +09:00
dependabot-preview[bot]
969412a426
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 2.9.8 to 3.0.0
Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 2.9.8 to 3.0.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v2.9.8...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-04 10:28:42 +00:00
Dan Balasescu
a7a156b4f1
Merge pull request #8939 from ppy/dependabot/nuget/Humanizer-2.8.11
Bump Humanizer from 2.8.2 to 2.8.11
2020-05-04 19:27:29 +09:00
smoogipoo
fe31bac505 Fix build error 2020-05-04 18:20:20 +09:00
Dan Balasescu
5383fad110
Merge pull request #8933 from peppy/fix-song-select-ruleset-change-crash
Fix hard crash when changing ruleset while presenting a score
2020-05-04 18:05:23 +09:00
dependabot-preview[bot]
4ee2e6cd47
Bump Humanizer from 2.8.2 to 2.8.11
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.2 to 2.8.11.
- [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.2...v2.8.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-04 08:57:09 +00:00
dependabot-preview[bot]
e2593ac3e7
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 2.9.8 to 3.0.0
Bumps [Microsoft.CodeAnalysis.FxCopAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 2.9.8 to 3.0.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v2.9.8...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-04 08:56:18 +00:00
Dean Herbert
5edabbdee2 Redirect log output to custom data directory 2020-05-04 17:35:35 +09:00