11873 Commits

This Branch

This Branch

All Branches

• Merge pull request #2374 from smoogipoo/remove-approachcircle-hax

  Remove now unnecessary approachcircle proxy disables

  Dean Herbert · 2018-04-20 19:03:11 +09:00
  54ab0010de
• Merge branch 'master' into remove-approachcircle-hax
  Dean Herbert · 2018-04-20 18:36:49 +09:00
  a5b0005976
• Merge pull request #2350 from naoey/show-beatmap-id

  Add beatmap ID lookup to BeatmapSetOverlay

  Dean Herbert · 2018-04-20 18:36:21 +09:00
  6132a5a15e
• Merge branch 'master' into remove-approachcircle-hax
  Dan Balasescu · 2018-04-20 18:20:51 +09:00
  cb8067539a
• Update framework + fix CI errors
  smoogipoo · 2018-04-20 18:19:17 +09:00
  0dce7a5b61
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-20 18:07:52 +09:00
  29a28387d8
• Merge pull request #2409 from smoogipoo/fix-overlapping-speedchanges

  Fix hitobject lengths not being calculated for overlapping speed changes

  Dean Herbert · 2018-04-20 18:07:02 +09:00
  45eaa53d01
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-20 18:05:24 +09:00
  27437cfbaf
• 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

  smoogipoo · 2018-04-20 18:04:43 +09:00
  c9e4a07e12
• Merge branch 'master' into fix-overlapping-speedchanges
  Dean Herbert · 2018-04-20 15:36:28 +09:00
  dce569c9be
• ComputePositions -> UpdatePositions
  smoogipoo · 2018-04-20 14:22:48 +09:00
  11b943c820
• Add some more commenting to lifetime calculation
  smoogipoo · 2018-04-20 14:20:16 +09:00
  52e3ffff30
• Reorder parameter for consistency
  smoogipoo · 2018-04-20 14:20:04 +09:00
  f3fddcc82c
• Add comments to SequentialSpeedChangeVisualiser
  smoogipoo · 2018-04-20 14:16:30 +09:00
  48b421b4b4
• Merge pull request #2422 from tgi74/profile_web_changes

  Update profile header to match osu-web changes

  Dean Herbert · 2018-04-20 14:00:34 +09:00
  6d3533b777
• Comments + xmldocs
  smoogipoo · 2018-04-20 13:51:36 +09:00
  1bab601cbc
• Use a more suiting icon for discord for now
  Dean Herbert · 2018-04-20 13:51:30 +09:00
  a64ed142f0
• Make forum posts a web link
  Dean Herbert · 2018-04-20 13:01:23 +09:00
  8649ddc68b
• Merge branch 'master' into profile_web_changes
  Dean Herbert · 2018-04-20 12:51:30 +09:00
  fe644c6909
• Don't return overlay to null until it has been completely hidden
  Dean Herbert · 2018-04-20 12:47:23 +09:00
  8eefd04fcb
• Remove unnecessary test
  Dean Herbert · 2018-04-20 12:46:45 +09:00
  54fa725309
• Merge remote-tracking branch 'upstream/master' into show-beatmap-id
  Dean Herbert · 2018-04-20 12:41:38 +09:00
  c77f339444
• Merge pull request #2416 from peppy/beatmap-set-overlay-nullability

  Make BeatmapSetOverlay accept nulls everywhere

  Dan Balasescu · 2018-04-19 22:19:57 +09:00
  v2018.419.0 3824d61b99
• Update profile header to osu-web changes
  tgi74000 · 2018-04-19 14:46:42 +02:00
  64709da546
• Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
  Dean Herbert · 2018-04-19 21:11:23 +09:00
  7880dc8f8c
• Add back online load test for BeatmapScoresContainer
  Dean Herbert · 2018-04-19 21:11:16 +09:00
  77af8ce556
• Merge pull request #2421 from peppy/appveyor-release

  Add automated appveyor deployment

  Dan Balasescu · 2018-04-19 21:05:51 +09:00
  c247fe1343
• Remove unused property
  Dean Herbert · 2018-04-19 21:00:22 +09:00
  0356e5e6bf
• Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
  Dean Herbert · 2018-04-19 20:53:06 +09:00
  f7ca6267b1
• Expose appveyor artifacts
  Dean Herbert · 2018-04-19 17:51:10 +09:00
  8a243461a6
• Add deploy config
  Dean Herbert · 2018-04-19 17:51:02 +09:00
  312068d7a2
• Add non-interactive deploy mode
  Dean Herbert · 2018-04-19 17:14:51 +09:00
  278a878b09
• Merge pull request #2398 from tgi74/rightclickscrolling

  Add right click absolute scrolling in song select

  Dean Herbert · 2018-04-18 19:57:52 +09:00
  dd7020d5a4
• Changes to naming and text
  Dean Herbert · 2018-04-18 19:47:13 +09:00
  e395a47112
• Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
  Dean Herbert · 2018-04-18 19:46:59 +09:00
  bd834dd487
• Merge pull request #2366 from tgi74/ctb_hr_mangling

  Add HardRock position mangling for CatchTheBeat

  Dean Herbert · 2018-04-18 16:57:16 +09:00
  69a91c610d
• Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling
  Dean Herbert · 2018-04-18 16:46:02 +09:00
  d307b8dc2e
• Make BeatmapSetOverlay accept nulls everywhere
  Dean Herbert · 2018-04-18 16:42:09 +09:00
  1728dd6502
• Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
  Dean Herbert · 2018-04-18 16:41:01 +09:00
  7e5d5a197b
• Make BeatmapSetOverlay accept nulls everywhere
  Dean Herbert · 2018-04-18 16:08:45 +09:00
  1be2571d33
• Merge pull request #2415 from smoogipoo/better-test-case

  Update OsuTestCase with framework testing changes

  Dean Herbert · 2018-04-18 15:56:09 +09:00
  0a292a6ab4
• Update framework
  smoogipoo · 2018-04-18 15:32:21 +09:00
  560fcfc661
• Update with framework changes
  smoogipoo · 2018-04-18 15:12:48 +09:00
  d5ce618d9b
• Merge pull request #2377 from Joehuu/fix-rank-status

  Fix qualified category on rank status

  Dan Balasescu · 2018-04-18 14:33:03 +09:00
  bc3150776e
• Merge branch 'master' into fix-rank-status
  Dan Balasescu · 2018-04-18 14:19:53 +09:00
  533b7d907d
• Update framework
  smoogipoo · 2018-04-18 14:18:56 +09:00
  68a13a5fb5
• Merge pull request #2381 from peppy/app-manifest

  Add back app.manifest

  Dan Balasescu · 2018-04-18 14:18:13 +09:00
  f8a9d9d4fe
• 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

  smoogipoo · 2018-04-18 14:16:58 +09:00
  ffbe6f2e37
• Merge branch 'master' into app-manifest
  Dean Herbert · 2018-04-18 14:10:03 +09:00
  c32ab7d08c
• Merge pull request #2400 from tgi74/replay_mods

  Add support for replay mods

  Dean Herbert · 2018-04-18 14:09:54 +09:00
  919f2acccd