2030 Commits

• Merge branch 'master' into ruleset-configs
  Dean Herbert · 2018-06-12 13:13:18 +09:00
  ae136e89a4
• Merge branch 'master' into exponential-scoring-toggle
  Dan Balasescu · 2018-06-11 18:34:55 +09:00
  3981f56157
• Merge branch 'master' into exponential-scoring-toggle
  Dan Balasescu · 2018-06-11 18:19:33 +09:00
  78daf1c7ad
• Merge branch 'master' into fix-object-ordering
  Dan Balasescu · 2018-06-11 17:53:33 +09:00
  9994c69d58
• Fix xmldoc
  smoogipoo · 2018-06-11 15:44:59 +09:00
  b51e714ae5
• Merge branch 'ruleset-configs' into mania-playfield-inversions
  smoogipoo · 2018-06-11 15:08:48 +09:00
  563a2667d3
• Use a global ruleset config cache
  smoogipoo · 2018-06-11 15:07:42 +09:00
  14b7530994
• Move ruleset dependency caching to CreateLocalDependencies

  In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.

  smoogipoo · 2018-06-11 15:07:29 +09:00
  be01dbae3a
• Add mania direction to settings
  smoogipoo · 2018-06-11 14:36:19 +09:00
  f49b7d6e16
• Merge branch 'ruleset-configs' into mania-playfield-inversions

  # Conflicts:
  #	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs

  smoogipoo · 2018-06-11 13:46:39 +09:00
  93696fb5e5
• Merge remote-tracking branch 'origin/master' into mania-playfield-inversions
  smoogipoo · 2018-06-11 13:45:47 +09:00
  4fb6a8627e
• Give ruleset settings a ruleset-specific config manager
  smoogipoo · 2018-06-11 13:28:50 +09:00
  f4fbf27d42
• Move ruleset config managers to Ruleset
  smoogipoo · 2018-06-11 13:17:08 +09:00
  eca016ec6c
• Make ruleset config manager variants nullable
  smoogipoo · 2018-06-11 13:13:36 +09:00
  22e8a0bb6e
• Explicitly handle null settings case + add annotations
  smoogipoo · 2018-06-11 12:57:56 +09:00
  63ec36b3be
• Move dependency creation under ctor
  smoogipoo · 2018-06-11 12:57:26 +09:00
  b219c17115
• Split AffectsCombo into IsBonus
  Crusensis · 2018-06-09 18:14:33 -07:00
  fbc0cd6f5f
• Rename "Exponential" to "Classic"
  Dean Herbert · 2018-06-10 01:45:05 +09:00
  86fb9666b2
• Add comment about matching stable scoring

  Also updated equation to be close to what is expected

  Dean Herbert · 2018-06-10 01:44:46 +09:00
  cc37a355d2
• Merge branch 'master' into diffcalc-modtypes
  Dean Herbert · 2018-06-09 23:35:17 +09:00
  aaa65c428f
• Revert "Always update children when ruleset input manager is updated"

  This reverts commit 4eb7a34944.

  Dean Herbert · 2018-06-08 21:05:28 +09:00
  9bdb3113ce
• Fix sequential speed change visualiser not working with 0 control points
  smoogipoo · 2018-06-08 15:11:43 +09:00
  2a48e0e44a
• Add setting to toggle standardised or exponential scoring display

  Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.

  Dean Herbert · 2018-06-08 03:17:12 +09:00
  0b4f5af52e
• Merge branch 'master' into mania-step-interval
  Dean Herbert · 2018-06-07 20:26:33 +09:00
  2c25e5e8da
• Add column testcase
  smoogipoo · 2018-06-07 20:24:33 +09:00
  55a5dfa9b6
• Merge remote-tracking branch 'origin/master' into mania-mask-container

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

  smoogipoo · 2018-06-07 19:19:20 +09:00
  55475d129f
• Merge remote-tracking branch 'origin/master' into mania-mask-container

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

  smoogipoo · 2018-06-07 15:32:31 +09:00
  485026da6f
• Greatly increase the playfield scroll speed adjust step

  It was so small previously that I believe many people didn't even realise it was working.

  Dean Herbert · 2018-06-07 14:35:33 +09:00
  5e9a1961cb
• Rename GameBeatmap -> BindableBeatmap
  smoogipoo · 2018-06-06 20:16:20 +09:00
  72cc53aded
• Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

  # Conflicts:
  #	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
  #	osu.Game/Screens/Menu/Intro.cs
  #	osu.Game/Screens/Menu/MenuSideFlashes.cs

  smoogipoo · 2018-06-06 18:26:51 +09:00
  4086ff7313
• Rewrite difficulty mod combinations
  smoogipoo · 2018-06-06 16:20:17 +09:00
  83ff47ec80
• Reverse order of exposed objects in HitObjectContainer

  Closes #2740.

  Dean Herbert · 2018-06-06 15:03:47 +09:00
  3567823759
• Formatting fixes
  Dean Herbert · 2018-06-06 14:20:51 +09:00
  d3cd267036
• 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
• Improve readability of code
  Dean Herbert · 2018-06-06 14:04:20 +09:00
  a5679f7bf5
• Merge branch 'master' into osu-hd-setting
  Dean Herbert · 2018-06-06 12:09:12 +09:00
  ee92986494
• Merge branch 'master' into fix-replay-updates
  Dean Herbert · 2018-06-06 09:40:46 +09:00
  26569b434c
• Merge branch 'master' into disallow-beatmap-change
  Dean Herbert · 2018-06-04 10:53:04 +09:00
  4b604bf055
• Add difficulty calculation mod types
  smoogipoo · 2018-06-03 10:59:56 +09:00
  2ccffb9ac4
• Logexceptions when loading ruleset DLLs
  Dean Herbert · 2018-06-03 00:28:29 +09:00
  88628812c6
• Always update children when ruleset input manager is updated
  smoogipoo · 2018-05-31 18:02:10 +09:00
  4eb7a34944
• Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
  Dean Herbert · 2018-05-31 12:36:37 +09:00
  2f21b9c4ea
• Add key bindings for scroll speed

  Closes #2689.
  - [ ] Depends on ppy/osu-framework#1569 being fixed.

  Dean Herbert · 2018-05-31 12:10:53 +09:00
  7f0cb0bbf6
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• resolving the lost code problem
  Vidalee · 2018-05-22 22:39:55 +02:00
  7a31986812
• code sanity
  Vidalee · 2018-05-22 21:35:17 +02:00
  08e423ac5b
• why this line was ommited
  Vidalee · 2018-05-22 21:29:41 +02:00
  50e2871c89
• Sync changes on composition tools
  AlFasGD · 2018-05-22 09:00:11 +03:00
  44cf2aa7a3
• Remove useless things
  AlFasGD · 2018-05-21 23:24:10 +03:00
  61a18b952f