19824 Commits

This Branch

This Branch

All Branches

• Fix TestCaseMultiScreen intermittent failures
  Dean Herbert · 2019-02-19 15:52:53 +09:00
  0609fcf7d4
• Merge branch 'master' into diffcalc-merging-2
  Dean Herbert · 2019-02-19 15:42:15 +09:00
  151388dfad
• Fix post-merge errors
  smoogipoo · 2019-02-19 14:34:02 +09:00
  ade5763160
• Merge branch 'diffcalc-merging-2' into new-diffcalc-osu

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Difficulty/OsuLegacyDifficultyCalculator.cs

  smoogipoo · 2019-02-19 14:33:34 +09:00
  0001b6204b
• XMLDoc DifficultyHitObject
  smoogipoo · 2019-02-19 14:30:59 +09:00
  7ed461aa8c
• timeRate -> clockRate
  smoogipoo · 2019-02-19 14:29:23 +09:00
  93b7b51d0a
• Add tests for LimitedCapacityStack
  smoogipoo · 2019-02-19 14:18:49 +09:00
  9d8ba4073c
• History -> LimitedCapacityStack + re-xmldoc
  smoogipoo · 2019-02-19 13:51:19 +09:00
  3784b673ae
• Remove mods from constructor
  smoogipoo · 2019-02-19 13:40:39 +09:00
  af0bb4d5e8
• Fix one more test regression
  Dean Herbert · 2019-02-19 13:02:33 +09:00
  87dd7bcf6b
• Fix test regression
  Dean Herbert · 2019-02-19 12:38:45 +09:00
  0fce23a36b
• Nest class
  Dean Herbert · 2019-02-19 12:35:52 +09:00
  62fe5ad481
• Give TestWorkingBeatmap a reference clock
  Dean Herbert · 2019-02-19 12:27:30 +09:00
  f8033a3b35
• Merge pull request #4289 from peppy/fix-ruleset-loading

  Fix test dlls being loaded as actual rulesets (and failing)

  Dan Balasescu · 2019-02-19 12:25:11 +09:00
  805805020d
• Fix test dlls being loaded as actual rulesets (and failing)
  Dean Herbert · 2019-02-19 12:13:55 +09:00
  133c002d02
• Merge pull request #1 from ppy/master

  sync fork with base

  Nitrous · 2019-02-19 06:11:53 +08:00
  2483f0ebc8
• Add test cases for transitioning into pause overlay and into results
  David Zhao · 2019-02-18 19:53:55 +09:00
  af049004dd
• Use a bindable for updating dim status instead
  David Zhao · 2019-02-18 18:58:34 +09:00
  b353b69587
• Make it so visual tests only load the osu ruleset
  David Zhao · 2019-02-18 18:12:45 +09:00
  4e07aba548
• Fix fadecontainer being added to multiple containers
  David Zhao · 2019-02-18 17:11:38 +09:00
  1d80674fbd
• Merge branch 'master' into UserDimLogic
  David Zhao · 2019-02-18 16:56:16 +09:00
  af30aefe77
• Merge pull request #4187 from LeNitrous/mod-grow

  Add "Grow" mod

  Dean Herbert · 2019-02-18 16:54:53 +09:00
  a5a1d9d1cc
• Merge branch 'master' into mod-grow
  Dan Balasescu · 2019-02-18 16:47:16 +09:00
  b1bdab8c36
• Match up fade behavior with current master
  David Zhao · 2019-02-18 16:34:11 +09:00
  80800f2931
• Fix unit tests
  David Zhao · 2019-02-18 16:00:59 +09:00
  9be25c3758
• Fix test build failure
  David Zhao · 2019-02-18 15:29:39 +09:00
  79b12ef085
• Use conditional operator isntead of if
  David Zhao · 2019-02-18 15:23:03 +09:00
  f241d67e5f
• Merge branch 'master' into use-lifetime-optimization
  Dan Balasescu · 2019-02-18 15:22:34 +09:00
  c9c8cccd68
• Fix failing test
  smoogipoo · 2019-02-18 15:02:46 +09:00
  20f91106d9
• Fix failing test
  smoogipoo · 2019-02-18 15:02:09 +09:00
  ddc1ad848e
• Fix failing test
  smoogipoo · 2019-02-18 15:01:14 +09:00
  b47ced8c58
• Consider aggregate peaks
  smoogipoo · 2019-02-18 15:00:32 +09:00
  9cce9ce97c
• Implement new difficulty calculator for Rulesets.Mania
  smoogipoo · 2019-02-18 15:00:20 +09:00
  68725dc005
• Fix spinners increasing strain
  smoogipoo · 2019-02-18 14:58:33 +09:00
  659ec267b6
• Fix incorrect OsuDifficultyHitObject instantiation
  smoogipoo · 2019-02-18 14:58:13 +09:00
  c930cc5fb5
• Implement new difficulty calculator for Rulesets.Osu
  smoogipoo · 2019-02-18 14:58:03 +09:00
  fd70269021
• Adjust naming
  smoogipoo · 2019-02-18 14:55:39 +09:00
  7f4643a83d
• Fix colour changes not being reset
  smoogipoo · 2019-02-18 14:55:20 +09:00
  46b979a412
• Fix taiko nullrefing
  smoogipoo · 2019-02-18 14:54:35 +09:00
  cb17cbcdc4
• Implement new difficulty calculator for Rulesets.Taiko
  smoogipoo · 2019-02-18 14:54:21 +09:00
  25d85b6eb4
• Remove now unused member
  smoogipoo · 2019-02-18 14:51:43 +09:00
  9463475202
• Fix incorrect hitobject being used as the last hitobject
  smoogipoo · 2019-02-18 14:50:47 +09:00
  83cab2ba8a
• Rewrite catch diffcalc for readability + attempt to fix
  smoogipoo · 2019-02-18 14:50:47 +09:00
  f6b13ca79d
• Fix nullrefs
  smoogipoo · 2019-02-18 14:50:47 +09:00
  e02ae927b3
• Implement new difficulty calculator for Rulesets.Catch
  smoogipoo · 2019-02-18 14:50:47 +09:00
  8eba94e8c9
• Implement new difficulty calculator structure
  smoogipoo · 2019-02-18 14:49:43 +09:00
  a8faa942a6
• Fix background dim not being disabled on playerloader exit
  David Zhao · 2019-02-18 12:55:42 +09:00
  df148f8787
• Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs

  Co-Authored-By: nyquillerium <nyquill@ppy.sh>

  Dean Herbert · 2019-02-18 11:54:25 +09:00
  0a265c6d35
• Merge pull request #4266 from miterosan/CakeBuildImprovements

  Improve the build script (and move to a better location)

  Dean Herbert · 2019-02-18 10:12:14 +09:00
  66a5abe9bb
• Merge branch 'master' into MissingSource
  ThePyrotechnic · 2019-02-17 19:54:43 +00:00
  7bb56a198a