19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-failing-tests
  Dean Herbert · 2018-05-25 19:36:05 +09:00
  adeb23d54b
• Merge branch 'master' into catch-droplet-fix
  ekrctb · 2018-05-25 19:34:59 +09:00
  4392c57889
• Merge pull request #2499 from AlFasGD/editor-seekbar-fix

  Prevent user from scrolling outside the timeline in the editor

  Dean Herbert · 2018-05-25 19:34:28 +09:00
  58317be41e
• Merge branch 'master' of https://github.com/ppy/osu into catch-droplet-fix
  ekrctb · 2018-05-25 19:28:36 +09:00
  22e6e016fc
• Update framework
  Dean Herbert · 2018-05-25 19:21:49 +09:00
  8977670088
• Fix InspectCode issues
  ekrctb · 2018-05-25 19:18:11 +09:00
  456dc81f2f
• catch: the fruit positions are finalized on the post process
  ekrctb · 2018-05-25 19:11:29 +09:00
  26c6313dec
• Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
  Dean Herbert · 2018-05-25 19:07:30 +09:00
  699f661b02
• Merge pull request #2612 from jorolf/open-external

  Add icon next to beatmap title/username to open in browser

  Dean Herbert · 2018-05-25 19:01:27 +09:00
  b474dca09a
• Make FastRandom public
  ekrctb · 2018-05-25 18:57:59 +09:00
  8c8e87ed7a
• add FastRandom
  ekrctb · 2018-05-25 18:57:46 +09:00
  ca2c209701
• Move PostProcessing to after control points applied and nested hit objects created.
  ekrctb · 2018-05-25 18:57:06 +09:00
  9f2e09dae4
• Merge remote-tracking branch 'upstream/master' into jorolf-open-external
  Dean Herbert · 2018-05-25 18:52:05 +09:00
  cc69f07172
• Add and use default size (smaller than before)
  Dean Herbert · 2018-05-25 18:51:57 +09:00
  1cb7d50407
• Merge pull request #2504 from UselessToucan/player_loader_input_toggles

  Add input toggles to the PlayerLoader screen

  Dean Herbert · 2018-05-25 18:50:45 +09:00
  78ca111d69
• Merge remote-tracking branch 'upstream/master' into jorolf-open-external
  Dean Herbert · 2018-05-25 18:50:30 +09:00
  1b5bb79fe9
• Merge branch 'master' into player_loader_input_toggles
  Dean Herbert · 2018-05-25 18:38:12 +09:00
  28aa6faef9
• Fix quit button test occasionally failing
  Dean Herbert · 2018-05-25 17:44:56 +09:00
  7d06a08c3a
• Make all drawable fruit absolute values easily scalable
  Dean Herbert · 2018-05-25 17:37:52 +09:00
  f5ab93a712
• Make drawable bananas testable
  Dean Herbert · 2018-05-25 17:37:52 +09:00
  bf25e81c94
• Fix catcher sizing to (roughly) match stable
  Dean Herbert · 2018-05-25 17:33:53 +09:00
  3fe25fe67d
• Add more correct catch playfield sizing
  Dean Herbert · 2018-05-25 17:33:27 +09:00
  5e4f83b80b
• Merge pull request #2587 from smoogipoo/diffcalc-double-hr

  Fix double-HR application in OsuDifficultyCalculator

  Dean Herbert · 2018-05-25 14:17:25 +09:00
  e62718f251
• Merge branch 'master' into diffcalc-double-hr
  Dean Herbert · 2018-05-25 14:03:10 +09:00
  67447ef560
• Merge branch 'master' into catch-stable-hyper
  ekrctb · 2018-05-25 13:08:02 +09:00
  7412ac6627
• Merge pull request #2618 from smoogipoo/musiccontroller-nullref

  Fix possible MusicController nullref

  Dean Herbert · 2018-05-25 11:25:05 +09:00
  1c947fd3a7
• Merge branch 'master' into musiccontroller-nullref
  Dean Herbert · 2018-05-25 11:01:09 +09:00
  385c2c5c86
• Remove unnecessary null coalesce
  Dean Herbert · 2018-05-25 11:00:56 +09:00
  568d4882c6
• Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change
  Dean Herbert · 2018-05-25 10:55:01 +09:00
  7961c56239
• Update framework
  Dean Herbert · 2018-05-25 10:54:53 +09:00
  3d1f0e50ed
• Introduce PreviewTrack class
  Roman Kapustin · 2018-05-25 00:37:53 +03:00
  498244a308
• Merge branch 'master' into multiple_previews_different_overlays
  UselessToucan · 2018-05-24 20:51:54 +03:00
  d6076eb591
• Fix InspectCode issues.
  ekrctb · 2018-05-25 02:14:56 +09:00
  be323c7147
• Fix build error
  ekrctb · 2018-05-25 01:52:15 +09:00
  99c0e19189
• modify catch hyperdash behavior
  ekrctb · 2018-05-25 01:20:05 +09:00
  38e5e35743
• beginUserDrag/endUserDrag
  smoogipoo · 2018-05-24 14:36:48 +09:00
  b649025e86
• Fix possible NaN values due to trackvirtual infinite length
  smoogipoo · 2018-05-24 14:31:31 +09:00
  d4f68e0b67
• Fix base.CreateLocalDependencies sometimes not being called
  smoogipoo · 2018-05-24 13:03:25 +09:00
  f1ac84d95b
• Move beatmap cleanup to Dispose()
  smoogipoo · 2018-05-24 12:53:32 +09:00
  5a517bad63
• Fix GetBoundCopy on IGameBeatmap not working
  smoogipoo · 2018-05-24 12:42:58 +09:00
  542eb848b0
• Merge pull request #2624 from Aergwyn/hide-toolbar-after-play

  Fix incorrect default values keeping overlays in wrong state

  Dean Herbert · 2018-05-24 09:43:52 +09:00
  6d6cea19ec
• fix incorrect default values keeping overlays in wrong state
  Aergwyn · 2018-05-23 16:25:10 +02:00
  0c0f86fe26
• Merge branch 'master' into ParallaxContainerImprovement
  Jacob · 2018-05-23 16:21:31 +02:00
  a2527495ff
• Fix audio playback getting paused if playlist changes beatmap
  smoogipoo · 2018-05-23 19:41:13 +09:00
  fb78854485
• Merge branch 'unifyDates' of https://github.com/HoutarouOreki/osu into unifyDates
  HoutarouOreki · 2018-05-23 12:08:16 +02:00
  6d222a36b2
• Document parameters more properly
  HoutarouOreki · 2018-05-23 12:07:28 +02:00
  29de8e5e2d
• Remove whitespace
  smoogipoo · 2018-05-23 19:01:27 +09:00
  a5d2d74447
• Fix testcase audio + dependency overrides not working
  smoogipoo · 2018-05-23 18:52:09 +09:00
  a25462e10f
• Trim whitespace that I couldn't remove in VS?
  Jarosław Zgierski · 2018-05-23 11:27:11 +02:00
  cf5232586e
• Apply suggested changes
  HoutarouOreki · 2018-05-23 11:17:13 +02:00
  10bc3917b5