12344 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into catch_spinner
  Dean Herbert · 2018-05-26 12:36:42 +09:00
  8a5cd85ecd
• Merge pull request #2637 from HoutarouOreki/CursorOverrideContainer-rename

  Rename CursorOverrideContainer to MenuCursorContainer

  Dean Herbert · 2018-05-26 12:31:58 +09:00
  18c3339cd2
• Merge branch 'master' into CursorOverrideContainer-rename
  Dean Herbert · 2018-05-26 12:19:47 +09:00
  79442ad238
• Merge pull request #2636 from smoogipoo/diffcalc-fixes

  Bring pp calculations more in-line with osu!stable

  Dean Herbert · 2018-05-26 12:18:41 +09:00
  b8b7e2cd9f
• Merge branch 'master' into diffcalc-fixes
  Dean Herbert · 2018-05-26 12:10:31 +09:00
  e016f98841
• Merge pull request #2633 from peppy/fix-failing-tests

  Fix quit button test occasionally failing

  Dan Balasescu · 2018-05-26 11:56:57 +09:00
  a87c26028f
• Actually cast to int
  smoogipoo · 2018-05-26 09:25:16 +09:00
  d850e34003
• Forgot file name
  HoutarouOreki · 2018-05-25 21:20:42 +02:00
  63fb9ddec4
• Rename CursorOverrideContainer to MenuCursorContainer
  HoutarouOreki · 2018-05-25 21:13:40 +02:00
  e2d840c2de
• Merge branch 'master' into diffcalc-fixes
  Dan Balasescu · 2018-05-25 20:09:20 +09:00
  9dd2c2a904
• Change all performance calculators to use int hitwindows

  Has a pretty large (>6) effect on pp for some maps.

  smoogipoo · 2018-05-25 20:07:14 +09:00
  215cc9fba7
• Remove 0.5 offsets

  Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.

  smoogipoo · 2018-05-25 20:05:53 +09:00
  765a50d007
• Merge branch 'master' into fix-failing-tests
  Dean Herbert · 2018-05-25 19:36:05 +09:00
  adeb23d54b
• 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
• Update framework
  Dean Herbert · 2018-05-25 19:21:49 +09:00
  8977670088
• 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
• 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
• 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 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 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
• Re-order positionData judgement for correct banana creation
  frankhjwx · 2018-05-23 13:47:33 +08:00
  fda7025ac3
• Remove the changes in convert spinner
  frankhjwx · 2018-05-23 13:46:12 +08:00
  28ad5398cc
• Fix possible MusicController nullref
  smoogipoo · 2018-05-23 14:36:09 +09:00
  f894d73501
• Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications

  Fix disclaimer allowing notifications

  Dean Herbert · 2018-05-23 11:22:49 +09:00
  194710eae4
• Merge branch 'master' into catch_spinner
  frankhjwx · 2018-05-23 10:02:11 +08:00
  6ee96c758f
• fix disclaimer allowing notifications
  Aergwyn · 2018-05-22 17:53:36 +02:00
  76fbc656a1
• add license header
  jorolf · 2018-05-22 15:41:10 +02:00
  8fbda5bc59
• Add icon next to beatmap title/username to open in browser
  jorolf · 2018-05-22 15:29:52 +02:00
  b324337fa1
• Fixed banana generation on catch specific maps
  frankhjwx · 2018-05-22 20:51:37 +08:00
  be0fc24ad4
• Merge pull request #2601 from Aergwyn/respect-showoverlay-bindable

  FIx overlays from not hiding when returning to initial main menu state

  Dean Herbert · 2018-05-22 19:19:00 +09:00
  v2018.522.0 088deee70a
• Merge branch 'master' into respect-showoverlay-bindable
  Dean Herbert · 2018-05-22 19:00:42 +09:00
  ef40ca8805
• Merge pull request #2600 from peppy/fix-main-menu-escape

  Fix escape not working to go backwards in menus before finally exiting the game

  Dean Herbert · 2018-05-22 18:58:48 +09:00
  52230d6279
• Merge branch 'master' into fix-main-menu-escape
  Dan Balasescu · 2018-05-22 18:17:51 +09:00
  99163ca8ba
• Merge pull request #2430 from UselessToucan/exit_replay_button

  Add hold-to-quit button for gameplay/replays

  Dan Balasescu · 2018-05-22 18:17:40 +09:00
  c0802b5646
• Fix progress easing to 0 if aborting after confirmation
  smoogipoo · 2018-05-22 18:06:40 +09:00
  0e122468db
• Update framework
  Dean Herbert · 2018-05-22 16:46:55 +09:00
  39de807445
• Fix overlap between quit button at key input overlay
  Dean Herbert · 2018-05-22 16:45:42 +09:00
  d43e4af8ea
• Handle scale back in a nicer way
  Dean Herbert · 2018-05-22 16:44:37 +09:00
  436067c01f
• Use OnMouseMove instead of Update logic
  Dean Herbert · 2018-05-22 16:26:59 +09:00
  7b770d03c5
• Fix white ring flash when holding button post-confirmation
  Dean Herbert · 2018-05-22 16:23:05 +09:00
  babb7d5158