|
|
1de9a63ac6
|
Merge branch 'master' into async-screens
|
2018-04-23 20:50:43 +09:00 |
|
|
|
eb7fe0b9e2
|
Merge branch 'master' into fix-badge-container
|
2018-04-23 19:13:34 +09:00 |
|
|
|
2d1cef79d6
|
Fix instability in carousel item sorting
|
2018-04-23 19:01:01 +09:00 |
|
|
|
ff3d3379f0
|
Merge remote-tracking branch 'upstream/master' into async-screens
|
2018-04-23 18:29:37 +09:00 |
|
|
|
194992936d
|
Use exceptions
|
2018-04-23 17:57:47 +09:00 |
|
|
|
0709a0926b
|
Merge branch 'master' into misc-fixes
|
2018-04-23 17:46:58 +09:00 |
|
|
|
2d82c0b5cd
|
Fix logical regression
|
2018-04-23 16:41:15 +09:00 |
|
|
|
1f73ad0da5
|
Merge branch 'master' into fix-intro-race-condition
|
2018-04-23 15:17:44 +09:00 |
|
|
|
6e16f2a3c3
|
Add assert to appease rider/r#
|
2018-04-23 15:03:41 +09:00 |
|
|
|
36a671e306
|
Fix new detections in rider 2018.1
|
2018-04-23 14:56:45 +09:00 |
|
|
|
0e57f685f8
|
Merge pull request #2429 from peppy/fix-skin-parse-errors
Add error handling on a per-line level in LegacyDecoder
|
2018-04-22 10:53:43 +09:00 |
|
|
|
64ddee5646
|
Change load order to ensure runner is loaded before blocking op
|
2018-04-22 04:26:27 +09:00 |
|
|
|
44a9aa529a
|
Test CI run with new changes
|
2018-04-22 03:51:17 +09:00 |
|
|
|
2c9b2aa0e7
|
Fix intro setting beatmap in background thread causing race conditions
|
2018-04-22 02:46:20 +09:00 |
|
|
|
e9e97f31d6
|
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
|
2018-04-20 19:06:47 +09:00 |
|
|
|
a5b0005976
|
Merge branch 'master' into remove-approachcircle-hax
|
2018-04-20 18:36:49 +09:00 |
|
|
|
b16e25c3e9
|
Add error handling on a per-line level in LegacyDecoder
Resolves #2306.
|
2018-04-20 18:32:24 +09:00 |
|
|
|
cb8067539a
|
Merge branch 'master' into remove-approachcircle-hax
|
2018-04-20 18:20:51 +09:00 |
|
|
|
0dce7a5b61
|
Update framework + fix CI errors
|
2018-04-20 18:19:17 +09:00 |
|
|
|
29a28387d8
|
Merge branch 'master' into show-beatmap-id
|
2018-04-20 18:07:52 +09:00 |
|
|
|
27437cfbaf
|
Merge branch 'master' into show-beatmap-id
|
2018-04-20 18:05:24 +09:00 |
|
|
|
8bf25542cb
|
Add PlayerLoader TestCase and fix dummy beatmap load procedure
|
2018-04-20 17:30:27 +09:00 |
|
|
|
de85436534
|
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
|
2018-04-20 16:52:58 +09:00 |
|
|
|
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 |
|
|
|
dce569c9be
|
Merge branch 'master' into fix-overlapping-speedchanges
|
2018-04-20 15:36:28 +09:00 |
|
|
|
11b943c820
|
ComputePositions -> UpdatePositions
|
2018-04-20 14:22:48 +09:00 |
|
|
|
52e3ffff30
|
Add some more commenting to lifetime calculation
|
2018-04-20 14:20:16 +09:00 |
|
|
|
f3fddcc82c
|
Reorder parameter for consistency
|
2018-04-20 14:20:04 +09:00 |
|
|
|
48b421b4b4
|
Add comments to SequentialSpeedChangeVisualiser
|
2018-04-20 14:16:30 +09:00 |
|
|
|
1bab601cbc
|
Comments + xmldocs
|
2018-04-20 13:51:36 +09:00 |
|
|
|
a64ed142f0
|
Use a more suiting icon for discord for now
|
2018-04-20 13:51:30 +09:00 |
|
|
|
8649ddc68b
|
Make forum posts a web link
|
2018-04-20 13:01:23 +09:00 |
|
|
|
fe644c6909
|
Merge branch 'master' into profile_web_changes
|
2018-04-20 12:51:30 +09:00 |
|
|
|
8eefd04fcb
|
Don't return overlay to null until it has been completely hidden
|
2018-04-20 12:47:23 +09:00 |
|
|
|
c77f339444
|
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
|
2018-04-20 12:41:38 +09:00 |
|
|
|
64709da546
|
Update profile header to osu-web changes
|
2018-04-19 14:46:42 +02:00 |
|
|
|
0356e5e6bf
|
Remove unused property
|
2018-04-19 21:00:22 +09:00 |
|
|
|
f7ca6267b1
|
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
|
2018-04-19 20:53:06 +09:00 |
|
|
|
e395a47112
|
Changes to naming and text
|
2018-04-18 19:47:13 +09:00 |
|
|
|
bd834dd487
|
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
|
2018-04-18 19:46:59 +09:00 |
|
|
|
1728dd6502
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:42:09 +09:00 |
|
|
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
|
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
|
|
d5ce618d9b
|
Update with framework changes
|
2018-04-18 15:12:48 +09:00 |
|
|
|
ffbe6f2e37
|
Merge remote-tracking branch 'origin/master' into fix-rank-status
# Conflicts:
# osu.Game/Beatmaps/RankStatus.cs
# osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
# osu.Game/Overlays/Direct/FilterControl.cs
# osu.Game/Overlays/DirectOverlay.cs
|
2018-04-18 14:16:58 +09:00 |
|
|
|
33f4f57ee3
|
Merge branch 'master' into replay_mods
|
2018-04-18 14:00:32 +09:00 |
|
|
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09:00 |
|
|
|
64f47daff4
|
Merge branch 'master' into fix-leaderboard-nullref
|
2018-04-18 12:05:13 +09:00 |
|
|
|
188c8ce1e7
|
Remove unnecessary score nulling (already happens in PlaceholderState_Set)
|
2018-04-18 11:58:55 +09:00 |
|
|
|
a27f39a555
|
Add documentation explaining intertwining logic
|
2018-04-18 11:57:06 +09:00 |
|
