RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,607 Commits 3 Branches 651 Tags 358 MiB
Commit Graph

5678 Commits

Author SHA1 Message Date
Dean Herbert 5ea3292dc5 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 20:21:44 +09:00
Dean Herbert 292b44d896
Merge branch 'master' into fix-nullref-on-dispose 2017-11-23 19:22:23 +09:00
Dean Herbert 4ab919263d Merge remote-tracking branch 'upstream/master' into attribute-descriptions 2017-11-23 18:53:22 +09:00
Dean Herbert 4986ad73f7 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 18:44:17 +09:00
Dean Herbert 38f5c55f80 Remove not-accessed field 2017-11-23 18:11:35 +09:00
Dean Herbert 30db2ce18a Rename KudosuValue to count and remove pointless local storage 2017-11-23 17:37:02 +09:00
Dean Herbert cf4fc05be3 Fix nullref on disposing BeatmapSetOverlay before load 
Only affects VisualTests
 2017-11-23 17:33:46 +09:00
Dean Herbert 6d9951d9af Use FillFlow rather than manually specifying positions 2017-11-23 17:32:41 +09:00
Dean Herbert 2ff21bbc6c Move descriptions to constructor 2017-11-23 17:29:20 +09:00
Dean Herbert 9d481eba96
Merge branch 'master' into kudosu-section 2017-11-23 17:19:42 +09:00
FreezyLemon 2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +01:00
FreezyLemon d6f532171b Implementation fix (since the default delay is now 500 and not 0 this is necessary to ensure the same functionality) 2017-11-23 09:11:52 +01:00
Dean Herbert 6e51664544
Merge branch 'master' into beatmap-overlay-download 2017-11-23 17:11:28 +09:00
Dean Herbert 288c21dfec Move TestCase descriptions to attributes 
Depends on https://github.com/ppy/osu-framework/pull/1186.
 2017-11-23 16:09:32 +09:00
FreezyLemon 18b0b77f0a Added requested changes. Mainly changing lambdas to direct function references. 2017-11-22 21:41:50 +01:00
FreezyLemon 7d428875b8 Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor) 2017-11-22 15:46:04 +01:00
Aergwyn e5dfe4ff2e Make error more verbose when beatmap import fails (#1537) 
Add name of beatmap set to error message if import fails
 2017-11-22 19:35:25 +09:00
Dean Herbert 517a9ec40f
Merge branch 'master' into async-beatmap-panels 2017-11-22 19:05:42 +09:00
Dean Herbert 95275cd2ef
Merge branch 'master' into fix-playback-control 2017-11-22 18:49:25 +09:00
Dan Balasescu c7a6c90249
Merge branch 'master' into working-beatmap-async-2 2017-11-22 18:32:47 +09:00
Dan Balasescu 4cbdd97ed3
Merge branch 'master' into fix-playback-control 2017-11-22 18:21:35 +09:00
Brayzure 782a739370 Fix Results Screen After Failing Last Note 
Fixes a bug where if you failed on the last hitobject, the AllJudged event will have already been invoked.
 2017-11-21 23:00:00 -05:00
Dean Herbert 36d45f633d Reorder methods 2017-11-22 11:57:09 +09:00
Dean Herbert e3c5a599b6 Tidy some regressions 2017-11-22 11:36:29 +09:00
Dean Herbert 27fb598352 Update colours to match design 2017-11-22 11:34:54 +09:00
Dean Herbert 0f8499c580 Rename to PlaybackControl and add a TestCase 2017-11-22 11:22:46 +09:00
Dean Herbert ff5404e57f Remove need for AlwaysPresent 
Also self-contains the tab options inside the tab control.
 2017-11-22 11:21:48 +09:00
Dean Herbert 855acc9401 Fix leading space before percent sign 2017-11-22 11:17:10 +09:00
Dean Herbert c06d6d0bbb Rename weird method 2017-11-22 10:59:31 +09:00
Dean Herbert 461c8e8be0 Clean up state change logic 2017-11-22 10:55:06 +09:00
Dean Herbert 63d366ea4b Bindables should be readonly 2017-11-22 10:54:33 +09:00
FreezyLemon 1d41e7cc8a Removed newline at end 2017-11-21 20:15:42 +01:00
FreezyLemon bf0184c06d One more small style fix 2017-11-21 19:34:01 +01:00
FreezyLemon 2203a84300 Small fixes and style corrections 2017-11-21 19:16:44 +01:00
FreezyLemon fd7ac9b6fc Switched to the new LoadWrapper class for asynchronous loading (LoadComponentAsync not used here since it's not possible to call that method on a component that has not finished loading, and we're in the constructor where it would be called) 2017-11-21 16:18:32 +01:00
FreezyLemon 870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
FreezyLemon a033eb46d3 Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance. 2017-11-21 16:12:23 +01:00
Dean Herbert 33936b0939
Merge branch 'master' into async-beatmap-panels 2017-11-21 23:33:15 +09:00
Miterosan b3b1f2018e Fix osu crashing if a invalid gamerule is given in the game.ini 2017-11-21 15:13:00 +01:00
Dean Herbert 5e70b7a9f7 Add async load methods for WorkingBeatmap properties 2017-11-21 22:34:53 +09:00
Dean Herbert 2603219350 Load beatmap carousel panels asynchronously 2017-11-21 22:30:09 +09:00
Dean Herbert aff217cd03 Fix early access to beatmap in LogoVisualisation 
Missed this one..
 2017-11-21 19:47:12 +09:00
Dean Herbert 7b916806f9
Merge branch 'master' into fix-info-wedge 2017-11-21 19:12:19 +09:00
Dean Herbert c2fcb2f9c7 Fix info wedge not displaying 2017-11-21 18:45:12 +09:00
EVAST9919 10f730a004 Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-21 12:39:14 +03:00
EVAST9919 41498ffad3 Apply suggestions 2017-11-21 12:22:19 +03:00
smoogipoo 217554f587 Remove redundant interface 2017-11-21 18:06:24 +09:00
smoogipoo 0d1b5ae44f Adjust bottom bar sizing as suggested 2017-11-21 17:51:07 +09:00
smoogipoo 238756ec5d Merge remote-tracking branch 'origin/master' into editor-playback-speed 2017-11-21 17:41:16 +09:00
Dan Balasescu c39e76fdea
Merge branch 'master' into sudden-death 2017-11-21 17:37:40 +09:00