12436 Commits

This Branch

This Branch

All Branches

• Unindent
  smoogipoo · 2018-05-31 15:17:59 +09:00
  e48b17fb0d
• Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
  smoogipoo · 2018-05-31 14:47:47 +09:00
  4ff803d11d
• Merge pull request #2679 from peppy/fix-player-life-management

  Fix player life management

  Dan Balasescu · 2018-05-31 14:42:47 +09:00
  e7c35d7541
• Merge branch 'master' into fix-player-life-management
  Dan Balasescu · 2018-05-31 14:34:31 +09:00
  35d8ec8df6
• Merge pull request #2673 from peppy/fix-beatmap-import-conflicts

  Fix conflicting Hash and Online IDs on beatmap import

  Dan Balasescu · 2018-05-31 14:32:47 +09:00
  c1d595677e
• Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts

  # Conflicts:
  #	osu.Game/Database/ArchiveModelManager.cs

  smoogipoo · 2018-05-31 14:02:52 +09:00
  9da7bfd615
• Merge pull request #2665 from peppy/import-fixes

  Fix beatmap importing entering a bad state

  Dan Balasescu · 2018-05-31 13:58:22 +09:00
  3fc2bfd313
• Merge branch 'master' into import-fixes
  Dan Balasescu · 2018-05-31 13:49:12 +09:00
  a9db479b27
• Merge pull request #2314 from Joehuu/score-multiplier-edits

  Split score multiplier and unranked label colours

  Dean Herbert · 2018-05-31 13:13:37 +09:00
  db89b92ae2
• Merge branch 'master' into score-multiplier-edits
  Dean Herbert · 2018-05-31 13:05:14 +09:00
  0c94e90043
• Merge pull request #2632 from peppy/catch-sizing-fixes

  Fix catch sizing

  Dan Balasescu · 2018-05-31 12:58:16 +09:00
  1201fe90fb
• Remove pointless FillMode specification
  Dean Herbert · 2018-05-31 12:50:01 +09:00
  b7511251d9
• Tidy up some unnecessary lines
  Dean Herbert · 2018-05-31 12:44:59 +09:00
  0f6c623ebb
• Fetch colour from OsuColour palette
  Dean Herbert · 2018-05-31 12:44:11 +09:00
  205aa1a3cd
• Fix incorrect naming of label
  Dean Herbert · 2018-05-31 12:39:56 +09:00
  319faf12f7
• Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
  Dean Herbert · 2018-05-31 12:36:37 +09:00
  2f21b9c4ea
• Merge branch 'master' into catch-sizing-fixes
  Dan Balasescu · 2018-05-31 12:31:52 +09:00
  9924ec9606
• Merge pull request #2672 from DrabWeb/multiplayer-screen-type

  Add Type property to MultiplayerScreen

  Dean Herbert · 2018-05-31 11:42:33 +09:00
  5d103a0088
• Default Type to Title, use ToLower for the screen type title.
  DrabWeb · 2018-05-30 23:16:54 -03:00
  ff93a54a64
• Merge branch 'master' into multiplayer-screen-type
  Dean Herbert · 2018-05-31 00:16:43 +09:00
  74c52e0a7c
• Remove unnecessary FinishTransforms
  Dean Herbert · 2018-05-30 20:05:31 +09:00
  0caf15166e
• Fix some discrepancies with the main menu logo transitions
  Dean Herbert · 2018-05-30 19:50:00 +09:00
  0dafcf00b7
• Fix delayed logo animations playing even if screen has already been exited
  Dean Herbert · 2018-05-30 19:25:39 +09:00
  6d6b186fb2
• Fix potential double-disposal of player if PlayerLoader is finalised
  Dean Herbert · 2018-05-30 15:48:26 +09:00
  5872b61988
• Fix player getting loaded when exiting song select
  Dean Herbert · 2018-05-30 15:48:20 +09:00
  54e53f7190
• Remove performance optimisation tracking disables to keep things simple for now
  Dean Herbert · 2018-05-30 13:43:43 +09:00
  eb89317494
• Recycle all contexts on beginning a write operation for the time being
  Dean Herbert · 2018-05-30 13:43:25 +09:00
  4a7de043e0
• Fix recycling never being performed due to incorrect ordering
  Dean Herbert · 2018-05-30 13:37:52 +09:00
  e23e2bd348
• Merge pull request #2663 from smoogipoo/fix-results-parallax

  Fix results screen parallax being cut off

  Dean Herbert · 2018-05-30 10:44:25 +09:00
  e8cc3294d7
• Merge branch 'master' into fix-results-parallax
  Dean Herbert · 2018-05-30 10:15:20 +09:00
  2dc7bb523b
• Fix event flushing sticking on early return
  Dean Herbert · 2018-05-29 19:43:52 +09:00
  31ab6f2408
• Merge pull request #2677 from Tom94/fix-vscode

  Fix Debug mode instead of Release mode for mono debug target

  Dean Herbert · 2018-05-29 19:32:20 +09:00
  165e5b8518
• Report full error to log file
  Dean Herbert · 2018-05-29 18:37:45 +09:00
  4a18951cce
• Fix Debug mode instead of Release mode for mono debug target
  Thomas Müller · 2018-05-29 10:27:21 +02:00
  6f72e5a876
• Add EF tooling references
  Dean Herbert · 2018-05-29 16:26:58 +09:00
  749a69567b
• Handle online ID mismatches and clashes on beatmap import
  Dean Herbert · 2018-05-29 16:26:50 +09:00
  0adc16f9bd
• Add logging on import processes
  Dean Herbert · 2018-05-29 16:26:42 +09:00
  47d88a48a2
• Remove unique constraints on hash columns

  We are going to allow multiple instances of the same beatmap info hash as they could be in different beatmap sets.

  Dean Herbert · 2018-05-29 16:26:32 +09:00
  de8c4e6d56
• Add back missing rethrow
  Dean Herbert · 2018-05-29 16:23:38 +09:00
  c1f416b1cc
• Add import rollback test
  Dean Herbert · 2018-05-29 16:23:38 +09:00
  203691b1c7
• Report any error during import to the write context to allow for rollback
  Dean Herbert · 2018-05-29 16:23:38 +09:00
  3d3026a80c
• Simplify test osz instantiation
  Dean Herbert · 2018-05-29 16:23:38 +09:00
  cc081cad5a
• Fix loading test method returning oldest import rather than newest
  Dean Herbert · 2018-05-29 16:23:38 +09:00
  015fd9d0e7
• Change order of event firing in Update calls

  A remove event should not be fired before the update is successful.

  Dean Herbert · 2018-05-29 16:23:38 +09:00
  72da640059
• Don't start transactions for migration

  It looks like transactions are used internally during migration.

  Dean Herbert · 2018-05-29 16:23:38 +09:00
  80806be047
• Correctly rollback failed imports
  Dean Herbert · 2018-05-29 16:23:38 +09:00
  a3287b8cf2
• Add MultiplayerScreen.Type
  DrabWeb · 2018-05-29 04:23:29 -03:00
  7b8211e6db
• Improve transaction handling flexibility
  Dean Herbert · 2018-05-29 16:23:27 +09:00
  bcb04f6168
• Bring entity framework up-to-date and re-enable transactions
  Dean Herbert · 2018-05-29 16:23:27 +09:00
  d4e7f08c20
• Add proper transaction rollback logic on exception
  Dean Herbert · 2018-05-29 16:23:27 +09:00
  2a87b851fa