1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 04:37:51 +08:00
Commit Graph

12467 Commits

Author SHA1 Message Date
Dean Herbert
64ddee5646 Change load order to ensure runner is loaded before blocking op 2018-04-22 04:26:27 +09:00
Dean Herbert
44a9aa529a Test CI run with new changes 2018-04-22 03:51:17 +09:00
Dean Herbert
2c9b2aa0e7 Fix intro setting beatmap in background thread causing race conditions 2018-04-22 02:46:20 +09:00
TocoToucan
630980255e Convert HoldToQuit.text to local variable 2018-04-21 20:35:24 +03:00
TocoToucan
e6d7136a92 Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction 2018-04-21 20:21:09 +03:00
TocoToucan
21454d1f10 Revert "Add 'End replay' button"
This reverts commit c34ef42f00.
2018-04-21 19:27:17 +03:00
TocoToucan
3b621db460 Implement CircularProgress filling 2018-04-21 19:25:21 +03:00
TocoToucan
633c775306 Initial HoldToQuit commit 2018-04-21 18:24:31 +03:00
TocoToucan
1ce38c7fc6 Visual settings: Ignore beatmap hitsounds 2018-04-20 18:30:41 +03:00
TocoToucan
606e088713 Visual settings: Ignore beatmap skin 2018-04-20 18:17:57 +03:00
Dean Herbert
7dd07503b2 Fix wrong targets on ruleset test configuration 2018-04-20 21:08:41 +09:00
Dean Herbert
e076107a19 Merge remote-tracking branch 'upstream/master' into peppy-net471 2018-04-20 21:07:11 +09:00
Dean Herbert
ae0fb39087
Merge branch 'master' into async-screens 2018-04-20 20:37:08 +09:00
Dan Balasescu
295e1c78ee
Merge pull request #2431 from peppy/deploy-improvements
Deploy improvements
2018-04-20 19:57:44 +09:00
Dean Herbert
1cad6f7a8e Add support for updating AppVeyor version 2018-04-20 19:17:11 +09:00
Dean Herbert
19e270062f Only build on correct branch 2018-04-20 19:12:47 +09:00
Dean Herbert
e9e97f31d6 Merge remote-tracking branch 'upstream/master' into peppy-async-screens 2018-04-20 19:06:47 +09:00
Dean Herbert
54ab0010de
Merge pull request #2374 from smoogipoo/remove-approachcircle-hax
Remove now unnecessary approachcircle proxy disables
2018-04-20 19:03:11 +09:00
TocoToucan
c34ef42f00 Add 'End replay' button 2018-04-20 12:50:19 +03:00
Dean Herbert
a5b0005976
Merge branch 'master' into remove-approachcircle-hax 2018-04-20 18:36:49 +09:00
Dean Herbert
6132a5a15e
Merge pull request #2350 from naoey/show-beatmap-id
Add beatmap ID lookup to BeatmapSetOverlay
2018-04-20 18:36:21 +09:00
Dean Herbert
b16e25c3e9 Add error handling on a per-line level in LegacyDecoder
Resolves #2306.
2018-04-20 18:32:24 +09:00
Dan Balasescu
cb8067539a
Merge branch 'master' into remove-approachcircle-hax 2018-04-20 18:20:51 +09:00
smoogipoo
0dce7a5b61 Update framework + fix CI errors 2018-04-20 18:19:17 +09:00
Dean Herbert
29a28387d8
Merge branch 'master' into show-beatmap-id 2018-04-20 18:07:52 +09:00
Dean Herbert
45eaa53d01
Merge pull request #2409 from smoogipoo/fix-overlapping-speedchanges
Fix hitobject lengths not being calculated for overlapping speed changes
2018-04-20 18:07:02 +09:00
Dean Herbert
27437cfbaf
Merge branch 'master' into show-beatmap-id 2018-04-20 18:05:24 +09:00
smoogipoo
c9e4a07e12 Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
2018-04-20 18:04:43 +09:00
Dean Herbert
8bf25542cb Add PlayerLoader TestCase and fix dummy beatmap load procedure 2018-04-20 17:30:27 +09:00
Dean Herbert
de85436534 Merge remote-tracking branch 'upstream/master' into peppy-async-screens 2018-04-20 16:52:58 +09:00
Dean Herbert
0b993561d8 Fix BadgeContainer being unsable to handle null badges
This fixes a failing test (hidden becaues the test wasn't being run).

- [ ] Merge osu-framework#1530 first.
2018-04-20 16:05:34 +09:00
Dean Herbert
dce569c9be
Merge branch 'master' into fix-overlapping-speedchanges 2018-04-20 15:36:28 +09:00
Dean Herbert
de424648d2 Update to .NET 4.7.1
Resolves #2368.
2018-04-20 14:46:52 +09:00
smoogipoo
11b943c820 ComputePositions -> UpdatePositions 2018-04-20 14:22:48 +09:00
smoogipoo
52e3ffff30 Add some more commenting to lifetime calculation 2018-04-20 14:20:16 +09:00
smoogipoo
f3fddcc82c Reorder parameter for consistency 2018-04-20 14:20:04 +09:00
smoogipoo
48b421b4b4 Add comments to SequentialSpeedChangeVisualiser 2018-04-20 14:16:30 +09:00
Dean Herbert
6d3533b777
Merge pull request #2422 from tgi74/profile_web_changes
Update profile header to match osu-web changes
2018-04-20 14:00:34 +09:00
smoogipoo
1bab601cbc Comments + xmldocs 2018-04-20 13:51:36 +09:00
Dean Herbert
a64ed142f0 Use a more suiting icon for discord for now 2018-04-20 13:51:30 +09:00
Dean Herbert
8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
Dean Herbert
fe644c6909
Merge branch 'master' into profile_web_changes 2018-04-20 12:51:30 +09:00
Dean Herbert
8eefd04fcb Don't return overlay to null until it has been completely hidden 2018-04-20 12:47:23 +09:00
Dean Herbert
54fa725309 Remove unnecessary test 2018-04-20 12:46:45 +09:00
Dean Herbert
c77f339444 Merge remote-tracking branch 'upstream/master' into show-beatmap-id 2018-04-20 12:41:38 +09:00
Dan Balasescu
3824d61b99
Merge pull request #2416 from peppy/beatmap-set-overlay-nullability
Make BeatmapSetOverlay accept nulls everywhere
2018-04-19 22:19:57 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
tgi74000
64709da546 Update profile header to osu-web changes 2018-04-19 14:46:42 +02:00
Dean Herbert
7880dc8f8c Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 21:11:23 +09:00
Dean Herbert
77af8ce556 Add back online load test for BeatmapScoresContainer 2018-04-19 21:11:16 +09:00