12480 Commits

This Branch

This Branch

All Branches

• Rewrite difficulty mod combinations
  smoogipoo · 2018-06-06 16:20:17 +09:00
  83ff47ec80
• Add nomod mod type
  smoogipoo · 2018-06-06 14:08:02 +09:00
  e19ca0c120
• Cleanup multi mod constructions
  smoogipoo · 2018-06-06 14:07:50 +09:00
  8274623ad6
• Add difficulty calculation mod types
  smoogipoo · 2018-06-03 10:59:56 +09:00
  2ccffb9ac4
• Merge pull request #2702 from DrabWeb/participant-count-default

  Default ParticipantCount.Max to null

  Dean Herbert · 2018-06-03 03:55:23 +09:00
  68910745d8
• Merge branch 'master' into participant-count-default
  Dean Herbert · 2018-06-03 03:05:17 +09:00
  eb135b2e85
• Merge pull request #2713 from FreezyLemon/fix-songprogress-time-formatting

  Fix song progress elapsed time rounding up on some cultures

  Dean Herbert · 2018-06-03 02:42:34 +09:00
  941a1b616c
• Fix SongProgressInfo timespan formatting
  FreezyLemon · 2018-06-02 11:25:49 +02:00
  a0c643fae5
• Move max text updating into updateMax.
  DrabWeb · 2018-06-01 14:28:24 -03:00
  cc32adf51f
• Merge pull request #2695 from Joehuu/match-panel-with-web

  Add storyboard icon and fix preview button overlap on direct panels

  Dean Herbert · 2018-06-01 22:49:45 +09:00
  changelog-20180602 v2018.601.0 53b11155d1
• Update framework
  Dean Herbert · 2018-06-01 22:20:28 +09:00
  de64e4500f
• Avoid using update for fading logic
  Dean Herbert · 2018-06-01 22:19:11 +09:00
  9b7741b353
• Merge branch 'master' into match-panel-with-web
  Dean Herbert · 2018-06-01 21:31:18 +09:00
  ae6f603d16
• Merge pull request #2703 from DrabWeb/room-participants-ienumerable

  Change Room.Participants to an IEnumerable

  Dean Herbert · 2018-06-01 21:13:25 +09:00
  e537d8cd6b
• Change Room.Participants to an IEnumerable.
  DrabWeb · 2018-06-01 06:15:23 -03:00
  59762c0393
• Default Max to null in ParticipantCount.
  DrabWeb · 2018-06-01 06:08:57 -03:00
  8dd36ee1a9
• Merge pull request #2669 from DrabWeb/multiplayer-logic-encapsulation

  Multiplayer shared logic encapsulation

  Dean Herbert · 2018-06-01 15:58:15 +09:00
  6b48370092
• Formatting fixes
  Dean Herbert · 2018-06-01 15:45:09 +09:00
  b9c601074d
• Merge branch 'master' into multiplayer-logic-encapsulation
  Dean Herbert · 2018-06-01 15:31:19 +09:00
  c5a3eff182
• Merge pull request #2667 from DrabWeb/updateable-beatmap-set-cover

  Centralise beatmap set cover update logic

  Dean Herbert · 2018-06-01 15:31:08 +09:00
  03cc4e878e
• Merge branch 'master' into updateable-beatmap-set-cover
  Dean Herbert · 2018-06-01 15:20:59 +09:00
  8bde1fd327
• Merge pull request #2700 from ppy/osu/fix-authorinfo

  Match authorinfo with web

  Dean Herbert · 2018-06-01 12:23:32 +09:00
  9c906e3121
• Match authorinfo with web
  Joehu · 2018-05-31 14:34:47 -07:00
  729f2ec725
• Match panel with web
  Joehu · 2018-05-31 08:09:19 -07:00
  1095669a55
• Cleanup.
  DrabWeb · 2018-05-31 05:48:42 -03:00
  6781b81336
• Merge branch 'master' into updateable-beatmap-set-cover
  Dean Herbert · 2018-05-31 17:33:31 +09:00
  42bc6b6b2e
• Merge pull request #2678 from peppy/long-path-fix

  Fix importing long filenames from stable

  Dean Herbert · 2018-05-31 15:58:21 +09:00
  v2018.531.0 9c0eff72b5
• Merge branch 'master' into long-path-fix
  Dan Balasescu · 2018-05-31 15:32:47 +09:00
  1147ef61ed
• Merge pull request #2682 from peppy/fix-osu-logo-discrepancies

  Fix logo animation discrepancies

  Dan Balasescu · 2018-05-31 15:31:43 +09:00
  824d6ae718
• Merge branch 'master' into fix-osu-logo-discrepancies
  Dan Balasescu · 2018-05-31 15:21:44 +09:00
  29f3011f75
• Unindent
  smoogipoo · 2018-05-31 15:17:59 +09:00
  e48b17fb0d
• Merge pull request #2680 from peppy/song-selet-enumerable

  Offload database query to task

  Dean Herbert · 2018-05-31 14:57:36 +09:00
  5b997ff7a7
• Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
  smoogipoo · 2018-05-31 14:47:47 +09:00
  4ff803d11d
• Merge branch 'master' into song-selet-enumerable
  Dan Balasescu · 2018-05-31 14:42:58 +09:00
  76567ae98b
• 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 song-selet-enumerable
  Dan Balasescu · 2018-05-31 14:38:04 +09:00
  cd3ca68f03
• 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