11794 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-leaderboard-nullref
  Dean Herbert · 2018-04-18 12:05:13 +09:00
  64f47daff4
• Remove unnecessary score nulling (already happens in PlaceholderState_Set)
  Dean Herbert · 2018-04-18 11:58:55 +09:00
  188c8ce1e7
• Add documentation explaining intertwining logic
  Dean Herbert · 2018-04-18 11:57:06 +09:00
  a27f39a555
• Merge pull request #2407 from jorolf/profile-badges

  Add badges to ProfileHeader

  Dean Herbert · 2018-04-18 11:53:15 +09:00
  f678ce1bf5
• Simplify child definition
  Dean Herbert · 2018-04-18 11:42:55 +09:00
  a827fb51bc
• Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges
  jorolf · 2018-04-16 19:37:52 +02:00
  ddd59382e2
• add new test case and fix rotation not working
  jorolf · 2018-04-16 19:22:11 +02:00
  de9f15f620
• make hover lost transition instant (similar to hover transition)
  jorolf · 2018-04-16 18:52:09 +02:00
  046412f962
• add a DRAWABLE_BADGE_SIZE const and center badges
  jorolf · 2018-04-16 18:51:35 +02:00
  2a18b4c3f8
• badge_size is the actual badge size now

  also fixes rotateBadges bug when hover is lost

  jorolf · 2018-04-16 18:27:18 +02:00
  af0c49cca8
• Remove extra unneded safety
  smoogipoo · 2018-04-16 17:48:49 +09:00
  9af6ef1864
• Fix leaderboard placeholder sometimes disappearing indefinitely
  smoogipoo · 2018-04-16 17:39:55 +09:00
  b9220a1e29
• Fix various data races causing crashes or incorrect leaderboard states
  smoogipoo · 2018-04-16 17:39:03 +09:00
  1b9d54a6ad
• Merge branch 'master' into profile-badges
  jorolf · 2018-04-15 23:50:52 +02:00
  af755b4a90
• add badges to ProfileHeader
  jorolf · 2018-04-15 23:49:45 +02:00
  6ca714d93b
• Merge pull request #2402 from FreezyLemon/fix-button-kb-input

  Make buttons only accept input when expanded

  Dean Herbert · 2018-04-16 03:20:31 +09:00
  v2018.416.0 af154e66a2
• Update framework
  Dean Herbert · 2018-04-16 02:54:24 +09:00
  c3086531e0
• Merge branch 'master' into fix-button-kb-input
  Dean Herbert · 2018-04-16 02:48:51 +09:00
  9eb04a5fc8
• Merge pull request #2397 from smoogipoo/instant-hide-screenshot

  Hide menu cursor when taking screenshots by default

  Dean Herbert · 2018-04-16 01:05:49 +09:00
  0490c523a6
• Move cache to a slightly more familiar place and add comment
  Dean Herbert · 2018-04-16 00:38:32 +09:00
  2eefe722f3
• Remove unused field
  Dean Herbert · 2018-04-16 00:25:09 +09:00
  96ef564f44
• Update framework
  Dean Herbert · 2018-04-16 00:21:03 +09:00
  c095fe1919
• Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
  Dean Herbert · 2018-04-16 00:20:06 +09:00
  c9615f837a
• Merge pull request #2383 from DrabWeb/wave-container

  Wave container

  Dean Herbert · 2018-04-15 21:22:54 +09:00
  779d5a578b
• Merge remote-tracking branch 'upstream/master' into wave-container
  Dean Herbert · 2018-04-15 21:03:18 +09:00
  ae77c010e2
• Merge pull request #2360 from UselessToucan/profile_multiple_audio_previews

  Handle multiple song previews playing in different beatmap categories…

  Dean Herbert · 2018-04-15 16:22:52 +09:00
  e512e4bacb
• Simplify logic
  Dean Herbert · 2018-04-15 16:12:42 +09:00
  fd54ae3c87
• Remove unused variable
  Dean Herbert · 2018-04-15 15:29:00 +09:00
  069d48ac14
• Resolve merge conflicts
  TocoToucan · 2018-04-14 15:11:28 +03:00
  671de4f6c2
• make buttons only accept input when expanded

  both other states are "inactive"/invisible so should never accept keyboard input

  FreezyLemon · 2018-04-14 00:08:54 +02:00
  3ece54e1c3
• Merge pull request #2389 from UselessToucan/ignored_input_handler

  Fix new input handlers not being enabled by default

  Dan Balasescu · 2018-04-13 22:36:04 +09:00
  f59eef072d
• Final framework update
  smoogipoo · 2018-04-13 22:24:19 +09:00
  a6dfe0d4c9
• Merge remote-tracking branch 'origin/master' into ignored_input_handler
  smoogipoo · 2018-04-13 22:23:33 +09:00
  fe77417e03
• Merge pull request #2399 from FreezyLemon/update-nunit-3.10.1

  Update NUnit to version 3.10.1

  Dan Balasescu · 2018-04-13 22:22:37 +09:00
  aadde08396
• Merge branch 'master' into update-nunit-3.10.1
  Dan Balasescu · 2018-04-13 22:05:26 +09:00
  258e17566c
• Update frramework again
  Dean Herbert · 2018-04-13 21:47:50 +09:00
  a0f9f8d512
• Reword xmldoc
  smoogipoo · 2018-04-13 21:15:08 +09:00
  cf65833572
• Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
  smoogipoo · 2018-04-13 21:13:09 +09:00
  733f70cbd5
• A lot more protection from outsiders
  smoogipoo · 2018-04-13 21:12:33 +09:00
  34adb2527c
• BDL cache screenshot manager
  smoogipoo · 2018-04-13 20:46:01 +09:00
  cd594ce12b
• bump NUnit to version 3.10.1
  FreezyLemon · 2018-04-13 13:19:52 +02:00
  4b3a129738
• Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
  Dean Herbert · 2018-04-13 19:54:15 +09:00
  9f5a52b641
• Update framework
  Dean Herbert · 2018-04-13 19:53:29 +09:00
  e962bc312e
• Merge pull request #2378 from peppy/fix-line-endings

  Normalize line endings to LF

  Dan Balasescu · 2018-04-13 19:47:30 +09:00
  632befb210
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Add new gitattributes
  Dean Herbert · 2018-04-13 18:19:38 +09:00
  f99503b60c
• Merge pull request #2332 from LittleEndu/alt-eagerselect

  Make beatmap carousel select a random beatmap when there was no previous selection

  Dean Herbert · 2018-04-13 18:11:45 +09:00
  5f020074e0
• Merge branch 'master' into ignored_input_handler
  Dean Herbert · 2018-04-13 18:05:12 +09:00
  a1a7e63646
• Merge remote-tracking branch 'upstream/master' into alt-eagerselect
  Endrik Tombak · 2018-04-13 11:55:35 +03:00
  d9f587edff
• Make TakeScreenshotAsync await on the internal task
  smoogipoo · 2018-04-13 17:51:09 +09:00
  0235eba9de