14159 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into unload-carousel-panels
  Dean Herbert · 2018-09-06 16:10:31 +09:00
  7d2acfac51
• Merge pull request #3357 from peppy/fix-ci-explode-failure

  Fix CI failures on CatcherArea.Explode

  Dan Balasescu · 2018-09-06 16:06:18 +09:00
  5351f802cd
• Optimise carousel memory usage by unloading off-screen panels
  Dean Herbert · 2018-09-06 13:31:37 +09:00
  e63f60231a
• Restore IsLoaded check
  Dean Herbert · 2018-09-06 13:09:57 +09:00
  65018705f4
• Attempt to fix CI failures on CatcherArea.Explode
  Dean Herbert · 2018-09-06 10:14:23 +09:00
  c03d1d9566
• Merge pull request #3321 from peppy/fix-importing

  Fix order of import set conflict checks

  Dean Herbert · 2018-09-05 18:51:15 +09:00
  9b753bb429
• Merge pull request #3356 from Joehuu/fix-direct-list-play-button

  Fix direct list play button disappearing after preview/switch

  Dean Herbert · 2018-09-05 16:08:30 +09:00
  a7de2bda39
• Fix direct list play button disappearing after preview/switch
  Joehu · 2018-09-04 19:44:49 -07:00
  77455e4463
• Merge pull request #3334 from agnimurus/master

  Refactor some variable names for improved code readability

  Dean Herbert · 2018-09-01 17:38:47 +09:00
  b0f9c0f6f0
• Merge branch 'master' into master
  Dean Herbert · 2018-09-01 17:31:04 +09:00
  e503878956
• Merge pull request #3345 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-09-01 12:42:33 +09:00
  2018.901.0 442c10db73
• Update framework
  Dean Herbert · 2018-09-01 10:59:04 +09:00
  62a8245f11
• Merge pull request #3341 from peppy/rip-async

  Remove async logic in line with framework

  Dean Herbert · 2018-08-31 23:49:12 +09:00
  2018.831.0 174c52decf
• Update framework
  Dean Herbert · 2018-08-31 19:20:10 +09:00
  4c72565936
• Revert async changes
  Dean Herbert · 2018-08-31 07:07:10 +09:00
  03084aa04b
• Merge pull request #3331 from smoogipoo/update-framework

  Update with framework async changes

  Dean Herbert · 2018-08-30 15:10:28 +09:00
  2018.830.0 247e1ee714
• Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework
  Dean Herbert · 2018-08-30 14:58:25 +09:00
  37bae8c840
• Merge pull request #3332 from smoogipoo/fix-startup-webrequests

  Fix DirectOverlay performing web requests on startup

  Dean Herbert · 2018-08-30 14:58:17 +09:00
  46099fcbef
• Update ef/sqlite version
  Dean Herbert · 2018-08-30 14:58:00 +09:00
  3276f0f54d
• Update framework
  Dean Herbert · 2018-08-30 14:58:00 +09:00
  9fb78852de
• Fix mania throwing an exception on start of map
  Dean Herbert · 2018-08-30 14:58:00 +09:00
  68a79f895a
• Merge branch 'master' into fix-startup-webrequests
  Dean Herbert · 2018-08-30 14:43:29 +09:00
  2ff48da5af
• Merge pull request #3330 from peppy/fix-single-file-loading

  Fix single file component loading not actually working correctly

  Dean Herbert · 2018-08-30 14:42:39 +09:00
  91a8039829
• Reduce async-await pairs
  Dean Herbert · 2018-08-30 14:41:16 +09:00
  b1a3dfedd1
• Fix DirectOverlay performing webrequests on startup
  smoogipoo · 2018-08-30 14:41:09 +09:00
  327bc708d7
• Avoid using symbol windows can't diplay
  Dean Herbert · 2018-08-30 14:34:45 +09:00
  20817fdf1d
• Refactored variable names in OsuGame.cs for improved code readability.
  unknown · 2018-08-29 18:04:51 -04:00
  499c5d28ff
• Fix single file component loading not actually working correctly
  Dean Herbert · 2018-08-29 15:11:02 +09:00
  4b54c65d3f
• Update SpriteIcon
  Dean Herbert · 2018-08-29 03:36:01 +09:00
  73c764d983
• Attempt to fix cross-thread database usage
  Dean Herbert · 2018-08-29 01:42:25 +09:00
  919e78a89a
• Update framework once more
  smoogipoo · 2018-08-28 21:06:32 +09:00
  da2f04c79c
• Fix order of import set conflict checks
  Dean Herbert · 2018-08-28 02:53:32 +09:00
  0d4aa37a91
• Use GetAsync for all samples
  smoogipoo · 2018-08-27 17:30:16 +09:00
  e7a5816d27
• Use GetAsync on all textures
  smoogipoo · 2018-08-27 17:26:44 +09:00
  1b279d383f
• Update with async changes
  smoogipoo · 2018-08-27 17:05:58 +09:00
  21d5322899
• Merge pull request #3310 from smoogipoo/reduce-import-noise

  Softly handle errors when no beatmap file exists in archive

  Dean Herbert · 2018-08-25 15:53:24 +09:00
  df18508bd6
• Add note about null return
  Dean Herbert · 2018-08-25 14:51:42 +09:00
  5c7ff31675
• Log to correct file
  Dean Herbert · 2018-08-25 14:50:46 +09:00
  8204d3292e
• Merge branch 'master' into reduce-import-noise
  Dean Herbert · 2018-08-25 14:44:57 +09:00
  3d52e9dea6
• Merge pull request #3312 from smoogipoo/better-mania-failsafe

  Aggressively check for valid columns before iterating endlessly in mania conversion

  Dean Herbert · 2018-08-25 14:01:47 +09:00
  a2a1277b91
• Fix xmldoc
  smoogipoo · 2018-08-25 00:07:48 +09:00
  49913f00f0
• Aggressively check for valid columns before iterating endlessly
  smoogipoo · 2018-08-24 23:57:44 +09:00
  26dfabc86c
• Remove skipping part of message
  smoogipoo · 2018-08-24 18:07:39 +09:00
  aeb4d47c06
• Softly handle errors when no beatmap file exists in archive
  smoogipoo · 2018-08-24 17:57:39 +09:00
  99574ecad8
• Merge pull request #2909 from tgi74/hit-shake

  Add shake effect when clicking osu! hitobjects too early

  Dan Balasescu · 2018-08-24 16:04:43 +09:00
  2018.824.0 27c151db8f
• Fix testcase dodginess
  smoogipoo · 2018-08-24 15:50:39 +09:00
  1a2c3715c7
• Update framework
  Dean Herbert · 2018-08-24 15:27:13 +09:00
  59d6ccbaab
• Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
  Dean Herbert · 2018-08-24 15:26:46 +09:00
  196fc03180
• Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake

  # Conflicts:
  #	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs

  Dean Herbert · 2018-08-24 15:26:36 +09:00
  ffcad6e0f1
• Merge pull request #3289 from peppy/break-overlay-double-parallax

  Add a second parallax layer to break overlay arrows

  Dan Balasescu · 2018-08-24 15:17:33 +09:00
  53dc20c560