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 |
|
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 |
|
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 |
|
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 |
|
Dean Herbert
|
69a91c610d
|
Merge pull request #2366 from tgi74/ctb_hr_mangling
Add HardRock position mangling for CatchTheBeat
|
2018-04-18 16:57:16 +09:00 |
|
Dean Herbert
|
d307b8dc2e
|
Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling
|
2018-04-18 16:46:02 +09:00 |
|
Dean Herbert
|
1728dd6502
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:42:09 +09:00 |
|
Dean Herbert
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
Dean Herbert
|
0a292a6ab4
|
Merge pull request #2415 from smoogipoo/better-test-case
Update OsuTestCase with framework testing changes
|
2018-04-18 15:56:09 +09:00 |
|
smoogipoo
|
560fcfc661
|
Update framework
|
2018-04-18 15:32:21 +09:00 |
|
smoogipoo
|
d5ce618d9b
|
Update with framework changes
|
2018-04-18 15:12:48 +09:00 |
|
Dan Balasescu
|
bc3150776e
|
Merge pull request #2377 from Joehuu/fix-rank-status
Fix qualified category on rank status
|
2018-04-18 14:33:03 +09:00 |
|
Dan Balasescu
|
533b7d907d
|
Merge branch 'master' into fix-rank-status
|
2018-04-18 14:19:53 +09:00 |
|
smoogipoo
|
68a13a5fb5
|
Update framework
|
2018-04-18 14:18:56 +09:00 |
|