1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Commit Graph

12094 Commits

Author SHA1 Message Date
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
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
Dan Balasescu
c247fe1343
Merge pull request #2421 from peppy/appveyor-release
Add automated appveyor deployment
2018-04-19 21:05:51 +09:00
Dean Herbert
0356e5e6bf Remove unused property 2018-04-19 21:00:22 +09:00
Dean Herbert
f7ca6267b1 Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 20:53:06 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
smoogipoo
7a550e3f07 Revert unnecessary change for now 2018-04-19 20:20:56 +09:00
smoogipoo
e666a82e1f Fix cloning 2018-04-19 18:59:09 +09:00
smoogipoo
ac64f9d958 Remove LegacyBeatmap 2018-04-19 18:58:45 +09:00
smoogipoo
b5a55a0dce Make an interface for beatmaps 2018-04-19 18:58:40 +09:00
Dean Herbert
8a243461a6 Expose appveyor artifacts 2018-04-19 17:51:10 +09:00
Dean Herbert
312068d7a2 Add deploy config 2018-04-19 17:51:02 +09:00
Dean Herbert
278a878b09 Add non-interactive deploy mode 2018-04-19 17:14:51 +09:00
aQaTL
1dc8986c22
Switched back to switch 2018-04-18 15:06:03 +02:00
Dean Herbert
dd7020d5a4
Merge pull request #2398 from tgi74/rightclickscrolling
Add right click absolute scrolling in song select
2018-04-18 19:57:52 +09:00
Dean Herbert
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00