1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Commit Graph

8835 Commits

Author SHA1 Message Date
Dean Herbert
70b29b8b62
Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
Dean Herbert
33572a7326
Merge pull request #1633 from peppy/fix-track-disposal
Fix DisposeTrack not working as expected
2017-12-01 23:35:28 +09:00
Dean Herbert
ee75f90ab3 Update framework 2017-12-01 23:17:54 +09:00
Dean Herbert
7532795935 Lock during validity checks 2017-12-01 22:43:49 +09:00
Dean Herbert
87b6181a19 Merge remote-tracking branch 'upstream/master' into fix-track-disposal 2017-12-01 22:36:20 +09:00
FreezyLemon
01bea3bada Re-implemented message formatting (mostly taken from osu-stable code) 2017-12-01 10:56:48 +01:00
Dean Herbert
442b234a86
Merge pull request #1631 from smoogipoo/csharp-7
Migrate to C# 7
2017-12-01 18:47:37 +09:00
smoogipoo
5be00cb0ec Add todo 2017-12-01 18:40:55 +09:00
smoogipoo
0b95e36675 Fix RelativeChildSize error temporarily 2017-12-01 18:00:20 +09:00
Dean Herbert
19051dd529 Update framework 2017-12-01 16:44:49 +09:00
smoogipoo
a73dfd692b Merge LangVer.props and osu.Game.props 2017-12-01 13:53:32 +09:00
smoogipoo
edb9b19079 Make JoinNullCheckWithAssignment a hint 2017-12-01 13:53:18 +09:00
Aergwyn
acb2cafa58 fix wedge not appearing 2017-11-29 21:09:08 +01:00
Dean Herbert
d402222f17 Fix DisposeTrack and improve AsyncLazy to support disposal 2017-11-30 05:05:07 +09:00
smoogipoo
7451bdaa0e Update DotSettings 2017-11-30 02:06:24 +09:00
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
006d679939 Migrate to C#7 2017-11-30 00:53:07 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
Dean Herbert
dddd432dc8
Merge pull request #1629 from MattiaPette/random-song-fix
Random song when entering the select screen without a beatmap selected
2017-11-29 21:08:16 +09:00
Dean Herbert
28d925dc1d
Merge branch 'master' into random-song-fix 2017-11-29 20:32:10 +09:00
Dean Herbert
b05a620468
Merge pull request #1601 from FreezyLemon/update-statistics-async
Made MetadataSection's Text setter load the text asynchronously
2017-11-29 20:31:50 +09:00
Dean Herbert
b2fc50247c Hide metadata by default to avoid initial jump when no data present 2017-11-29 20:13:00 +09:00
Dean Herbert
2b7bf285e4 Improve code quality 2017-11-29 20:07:00 +09:00
mattiapette
6dd6f08bd0 Random song selection when entering the select menu with default osu theme or invalid beatmap 2017-11-29 11:51:56 +01:00
Dean Herbert
d4c1359a49
Merge branch 'master' into update-statistics-async 2017-11-29 19:27:22 +09:00
Dean Herbert
8103849273
Merge pull request #1609 from smoogipoo/mania-auto-generation-fixes
Fix osu!mania autoplay generation
2017-11-29 19:22:52 +09:00
Dean Herbert
3e01a0dda5
Merge branch 'master' into mania-auto-generation-fixes 2017-11-29 19:11:36 +09:00
Dean Herbert
4b826f3471
Merge pull request #1517 from smoogipoo/performance-calculator
Implement PerformanceCalculator for osu! to calculate PP
2017-11-29 19:06:56 +09:00
Dean Herbert
801d81ecfc Add a notice when not logged in 2017-11-29 19:00:08 +09:00
smoogipoo
d69fa0966f Generate ManiaReplayFrame instead of ReplayFrame 2017-11-29 18:42:54 +09:00
smoogipoo
dfd035d07b Merge remote-tracking branch 'origin/master' into mania-auto-generation-fixes 2017-11-29 18:42:17 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator 2017-11-29 18:37:07 +09:00
Dean Herbert
ecd6cac775
Merge pull request #1624 from smoogipoo/mania-important-frames
Fix mania replays not defining important frames
2017-11-29 18:25:53 +09:00
Dan Balasescu
7cbca37e2d
Remove redundant cast 2017-11-29 18:18:36 +09:00
Dean Herbert
404e7d62ff
Merge branch 'master' into mania-important-frames 2017-11-29 18:12:57 +09:00
Dan Balasescu
fbddaccaf5
Merge pull request #1623 from peppy/load-player-test-async
Load Player-based TestCases asynchronously
2017-11-29 17:47:58 +09:00
Dean Herbert
bad970d1d1 Add wait steps to ensure the player is completely loaded before continuing 2017-11-29 17:25:55 +09:00
Dean Herbert
1ea089eb74 Update framework 2017-11-29 17:25:41 +09:00
Dean Herbert
f36137192e Merge remote-tracking branch 'upstream/master' into load-player-test-async 2017-11-29 15:53:30 +09:00
smoogipoo
6fd550dc91 Simplify/sanitize construction of ManiaReplayFrame 2017-11-29 15:47:10 +09:00
smoogipoo
1136db1556 Fix mania replays not defining important frames
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
Dan Balasescu
ce42aef924
Merge pull request #1619 from peppy/quieter-builds
Hide inspectcode output from appveyor console
2017-11-29 14:07:44 +09:00
Dean Herbert
85201ea30c
Merge branch 'master' into performance-calculator 2017-11-29 13:23:40 +09:00
Dean Herbert
d1afbf8055 Load Player-based TestCases asynchronously 2017-11-29 13:10:33 +09:00
Dean Herbert
8370d76946 Quieten nuget 2017-11-29 12:27:18 +09:00
Aergwyn
3bdf82d8df refactor newly added code to be less redundant 2017-11-28 21:38:11 +01:00
Aergwyn
6a4cc93360 fixes crash if all beatmaps of a set are hidden 2017-11-28 21:26:13 +01:00
Dean Herbert
6f5803b5eb Shallow clone submodules 2017-11-29 02:30:25 +09:00
Dean Herbert
1aa79a2d88 Hide inspectcode output from appveyor console 2017-11-29 01:26:21 +09:00
Dean Herbert
e1982e9863
Merge branch 'master' into mania-auto-generation-fixes 2017-11-28 22:35:21 +09:00