22074 Commits

This Branch

This Branch

All Branches

• Remove whitespace
  smoogipoo · 2019-09-19 17:58:10 +09:00
  65276cd235
• Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect

  # Conflicts:
  #	osu.Game/Screens/Play/Player.cs

  smoogipoo · 2019-09-19 17:57:04 +09:00
  db24cfbead
• Remove virtual member from ModBlockFail
  smoogipoo · 2019-09-19 17:44:24 +09:00
  da15b900f7
• Merge pull request #3569 from MaxOhn/traceable-mod

  Traceable mod

  Dean Herbert · 2019-09-19 17:41:27 +09:00
  558068a988
• Merge branch 'master' into traceable-mod
  Dan Balasescu · 2019-09-19 17:38:15 +09:00
  0dfce5d15d
• Disallow failing for replay players (#6162)

  Disallow failing for replay players
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-09-19 16:00:37 +09:00
  83657239bd
• Add back combo colours for osu!classic (#6165)

  Add back combo colours for osu!classic
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-09-19 15:43:19 +09:00
  ecaf3328bf
• Merge branch 'master' into add-class-combo-colours
  Dan Balasescu · 2019-09-19 15:13:00 +09:00
  9f8c9af3b4
• Merge pull request #6151 from peppy/state-update-on-skin-change

  Always update drawable hitobject state on skin change

  Dan Balasescu · 2019-09-19 15:12:49 +09:00
  e686bcf8e0
• Merge branch 'master' into block-failing-on-replays
  Salman Ahmed · 2019-09-19 09:09:56 +03:00
  865425d35e
• Remove spacing
  smoogipoo · 2019-09-19 14:56:52 +09:00
  c76e27549a
• Merge branch 'master' into state-update-on-skin-change
  Dan Balasescu · 2019-09-19 14:55:21 +09:00
  1f0f4d52f3
• Simplify LINQ expression
  iiSaLMaN · 2019-09-19 08:31:11 +03:00
  da4d83063e
• Fix duplicate invocation of updateState on load complete
  smoogipoo · 2019-09-19 14:15:06 +09:00
  762adb783a
• Randomise beatmap playback order on startup (#6141)

  Randomise beatmap playback order on startup
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-09-19 14:06:41 +09:00
  1d97a82e4f
• Invert BypassFail usage
  iiSaLMaN · 2019-09-19 08:00:41 +03:00
  e793854735
• Check for blocking fail mods by default
  iiSaLMaN · 2019-09-19 07:58:54 +03:00
  9de0bcae1e
• Cleanup draggedItem usages and make them more safe
  smoogipoo · 2019-09-19 13:53:52 +09:00
  4b97327b37
• Use resolved attribute for music controller
  smoogipoo · 2019-09-19 13:51:50 +09:00
  0644443979
• Merge remote-tracking branch 'Joehuu/master' into randomise-song-playback
  smoogipoo · 2019-09-19 13:37:46 +09:00
  c34842cb80
• Add back combo colours for osu!classic
  Dean Herbert · 2019-09-19 12:39:15 +09:00
  3fa1b53b2a
• Remove redundant using directive
  iiSaLMaN · 2019-09-18 23:28:48 +03:00
  3efcf0493c
• Fix failing test
  iiSaLMaN · 2019-09-18 23:17:24 +03:00
  ea6318ed73
• Add asserts for fail bypassing
  iiSaLMaN · 2019-09-18 22:51:03 +03:00
  871adb16e0
• Bypass fail on replays
  iiSaLMaN · 2019-09-18 22:49:48 +03:00
  775b90e066
• Add bypass fail property to Player
  iiSaLMaN · 2019-09-18 22:49:28 +03:00
  ecd721e8c5
• Add reference to xmldoc

  Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>

  Dean Herbert · 2019-09-19 02:03:30 +09:00
  2296ea75d7
• Merge pull request #6041 from miterosan/removenotneededandroidnativelibraryitemgroup

  Remove unnecessary AndroidNativeLibrary specification

  Dean Herbert · 2019-09-19 01:55:36 +09:00
  3710c7bdc4
• Simplify implementation, play fail animation during restart
  Dean Herbert · 2019-09-19 01:45:59 +09:00
  2fcc8c2d72
• Bring other mods up-to-date
  Dean Herbert · 2019-09-19 01:45:42 +09:00
  1150e9fdfb
• Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect
  Dean Herbert · 2019-09-19 01:36:29 +09:00
  ff3a7c1d13
• Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0 (#6158)

  Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0
  
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>

  Dean Herbert · 2019-09-19 00:50:57 +09:00
  52fcd834ab
• Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0

  Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-09-18 15:27:39 +00:00
  5dc5181c90
• Merge pull request #6154 from ppy/dependabot/nuget/ppy.osu.Framework.Android-2019.918.0

  Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0

  Dean Herbert · 2019-09-18 23:58:15 +09:00
  66c28b4c27
• Merge pull request #6155 from ppy/dependabot/nuget/ppy.osu.Framework-2019.918.0

  Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0

  Dean Herbert · 2019-09-18 23:58:08 +09:00
  bc2c47f8c9
• Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0

  Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-09-18 14:51:01 +00:00
  1d7377df65
• Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0

  Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-09-18 14:36:31 +00:00
  646a64792a
• Always update drawable hitobject state on skin change
  Dean Herbert · 2019-09-18 20:19:57 +09:00
  5901a915e7
• Add back incompatibility marker
  Dean Herbert · 2019-09-18 20:07:44 +09:00
  aa1a625643
• Fix issues with colour and skin application
  Dean Herbert · 2019-09-18 20:04:49 +09:00
  cfdac956c2
• Merge remote-tracking branch 'upstream/master' into traceable-mod
  Dean Herbert · 2019-09-18 19:36:07 +09:00
  9c9cb8e217
• Merge pull request #6087 from peppy/key-counter-fixes

  Key counter improvements

  Dan Balasescu · 2019-09-18 18:18:09 +09:00
  096a007e68
• Remove redundant length check
  Dean Herbert · 2019-09-18 17:09:43 +09:00
  61b396f235
• Reduce length of tests
  Dean Herbert · 2019-09-18 16:14:31 +09:00
  e17cd9e964
• Generate better temporary frames to support framed handling flaws
  Dean Herbert · 2019-09-18 16:09:48 +09:00
  381daffe52
• Revert clamping logic
  Dean Herbert · 2019-09-18 16:07:02 +09:00
  2046f64b22
• Merge remote-tracking branch 'upstream/master' into key-counter-fixes
  Dean Herbert · 2019-09-18 14:08:40 +09:00
  b4a396885d
• Fix frame count dependent tests regressing
  Dean Herbert · 2019-09-18 14:08:09 +09:00
  2db1e236a7
• Localise OrderChanged handling and fix callbacks

  The dragged item's position now only updates after the drag finishes. Local handling changes were required to ignore the bindable remove/add events that are fired as a result.

  Dean Herbert · 2019-09-18 13:15:39 +09:00
  91bdece9af
• Expose as IBindableList
  Dean Herbert · 2019-09-18 13:14:33 +09:00
  7e791f7cd7