1551 Commits

• 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
• Implement mask layering (incomplete)
  AlFasGD · 2018-05-21 23:08:04 +03:00
  d504a44dfb
• Reorder methods and remove useless comments
  Dean Herbert · 2018-05-21 15:59:33 +09:00
  5ec349de78
• Reduce spacing changes
  Dean Herbert · 2018-05-21 15:56:02 +09:00
  f53164843d
• Merge branch 'master' into osu-hd-setting
  Dean Herbert · 2018-05-21 15:21:09 +09:00
  cea935ea40
• Merge branch 'master' into drawable-room-improvements
  Dean Herbert · 2018-05-21 11:09:12 +09:00
  92668f07e0
• Merge branch 'master' into mania-performance-calculator
  Dean Herbert · 2018-05-18 12:34:49 +09:00
  6c00046835
• Merge branch 'master' into fix-conversion-hitwindows
  Dean Herbert · 2018-05-18 11:59:16 +09:00
  8e784d9104
• resolving codefactor styling issues
  Vidalee · 2018-05-17 19:44:09 +02:00
  2492e34d3f
• Merge branch 'master' into osu-hd-setting
  Vidalee · 2018-05-17 19:39:17 +02:00
  6a1abf4084
• Fix hold note hitwindow lenience
  smoogipoo · 2018-05-17 13:59:04 +09:00
  43cdbec0a3
• Move ruleset-specific hitwindows to post-converted hitobjects
  smoogipoo · 2018-05-17 13:35:15 +09:00
  f67d263596
• Don't deep-clone beatmapinfo/control points
  smoogipoo · 2018-05-17 13:17:33 +09:00
  397d93660a
• Don't create nested hitobjects unless absolutely required
  smoogipoo · 2018-05-17 12:29:33 +09:00
  c67f372560
• Remove construction of new ruleset
  smoogipoo · 2018-05-16 01:43:58 +09:00
  de63a1b578
• Cap CS to 10 also
  smoogipoo · 2018-05-15 21:57:08 +09:00
  3f67d04429
• Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements
  smoogipoo · 2018-05-15 21:31:58 +09:00
  4101b8ddde
• Fix ModHardRock not properly clamping Drain/OD
  smoogipoo · 2018-05-15 21:25:20 +09:00
  1acfc1bbab
• Merge branch 'master' into enable-distance-overflow
  Dean Herbert · 2018-05-15 18:56:51 +09:00
  6bf1092c7d
• Merge branch 'master' into namespace-cleanup
  Dean Herbert · 2018-05-15 18:10:48 +09:00
  0e0cc8bb69
• Move base classes to osu.Game.Rulesets.Difficulty namespace
  smoogipoo · 2018-05-15 17:38:08 +09:00
  995fda9b6f
• Merge branch 'master' into convert-object-hitwindows
  Dean Herbert · 2018-05-15 17:33:27 +09:00
  e39af1c906
• Merge branch 'master' into enable-distance-overflow
  Dean Herbert · 2018-05-15 16:18:17 +09:00
  6d87ff2595
• Make LegacyScoreParser abstract
  smoogipoo · 2018-05-15 15:28:46 +09:00
  1ee68c1c54
• Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval
  smoogipoo · 2018-05-15 11:42:40 +09:00
  fe2ea17e7f
• Fix possibility of test rulesets being discovered from assemblies
  smoogipoo · 2018-05-14 19:39:23 +09:00
  47cf4f27fb
• Re-enable slider distance overflow

  Fixes #2467.

  smoogipoo · 2018-05-14 15:14:29 +09:00
  f5068804d5
• Strip whitespaces
  smoogipoo · 2018-05-14 11:54:11 +09:00
  a81921118d
• Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
  smoogipoo · 2018-05-14 11:17:39 +09:00
  6e1d651087
• Fix TimeRate not being considered for performance calculation
  smoogipoo · 2018-05-14 11:15:14 +09:00
  e1b8a1589b