1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 04:42:55 +08:00
Commit Graph

8607 Commits

Author SHA1 Message Date
Dean Herbert
6d88396139 Update framework 2017-11-23 20:22:15 +09:00
Dean Herbert
5ea3292dc5 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 20:21:44 +09:00
Dean Herbert
ccb531e6b6
Merge pull request #1572 from peppy/fix-nullref-on-dispose
Fix nullref on disposing BeatmapSetOverlay before load
2017-11-23 20:18:19 +09:00
Dean Herbert
292b44d896
Merge branch 'master' into fix-nullref-on-dispose 2017-11-23 19:22:23 +09:00
Dan Balasescu
103bf1ddc9
Merge pull request #1568 from peppy/attribute-descriptions
Move TestCase descriptions to attributes
2017-11-23 19:21:45 +09:00
Dean Herbert
52c971cd75 Fix using incorrect Description attribute 2017-11-23 18:58:25 +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
92e169eb71
Merge pull request #1523 from EVAST9919/kudosu-section
Add Kudosu Info container in the kudosu section
2017-11-23 18:23:36 +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
Dean Herbert
b0b3c9167e
Merge pull request #1506 from naoey/beatmap-overlay-download
Make beatmap overlay download buttons work
2017-11-23 17:18:33 +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
f3a84a01da Update framework 2017-11-23 16:20:50 +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
Dan Balasescu
37c0772537
Merge pull request #1565 from peppy/readme-update
Update readme to mention using visualtests always forever
2017-11-22 19:57:32 +09:00
Dean Herbert
0af3aea716 Update framework 2017-11-22 19:38:12 +09:00
Dean Herbert
dd4bf285ab
Merge branch 'master' into readme-update 2017-11-22 19:35:45 +09: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
5efdb2f42d
Merge pull request #1554 from peppy/async-beatmap-panels
Load beatmap carousel panels asynchronously
2017-11-22 19:23:16 +09:00
Dean Herbert
517a9ec40f
Merge branch 'master' into async-beatmap-panels 2017-11-22 19:05:42 +09:00
Dean Herbert
095cc44661
Merge pull request #1563 from peppy/fix-playback-control
Improve PlaybackContainer (and rename to PlaybackControl)
2017-11-22 19:00:25 +09:00
Dean Herbert
95275cd2ef
Merge branch 'master' into fix-playback-control 2017-11-22 18:49:25 +09:00
Dan Balasescu
01a88eb959
Merge pull request #1556 from peppy/working-beatmap-async-2
Add async load methods for WorkingBeatmap properties
2017-11-22 18:45:02 +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
Dan Balasescu
00df32b6de
Merge pull request #1564 from Brayzure/final-hitobject-fail-fix
Fix results screen displaying after failing on the last hitobject
2017-11-22 18:19:30 +09:00
Dan Balasescu
7de10a5877
Fix invalid cast from noun to verb 2017-11-22 18:14:40 +09:00
Dean Herbert
5646ba4b24 Fix incorrect issues link 2017-11-22 14:04:32 +09:00
Dean Herbert
36027f8700 Update readme to mention using visualtests always forever 2017-11-22 13:54:55 +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
757bb6911e Fix license header from wrong project 2017-11-22 12:06:31 +09: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