16685 Commits

This Branch

This Branch

All Branches

• Add test case for background preview, fix unit tests
  David Zhao · 2019-02-21 15:24:26 +09:00
  ad5e81f0cd
• Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic
  David Zhao · 2019-02-20 17:40:13 +09:00
  f5d8700920
• Remove unused includes
  David Zhao · 2019-02-20 17:39:35 +09:00
  25e7dcb375
• Merge branch 'master' into UserDimLogic
  David Zhao · 2019-02-20 17:30:34 +09:00
  49c5a9fc30
• Fix background dim previews
  David Zhao · 2019-02-20 17:20:45 +09:00
  d703a9511a
• Remove unnecessary region
  David Zhao · 2019-02-20 16:58:12 +09:00
  3f000dfe2e
• Fix bindable name in tests
  David Zhao · 2019-02-20 16:56:57 +09:00
  5bf405f949
• Merge pull request #4296 from smoogipoo/isactive-changes

  Update in-line with framework IsActive changes

  Dean Herbert · 2019-02-20 16:55:06 +09:00
  42039a0ce9
• Move user dim logic into UserDimContainer instead
  David Zhao · 2019-02-20 16:53:57 +09:00
  1bd1b6b099
• Update framework
  Dean Herbert · 2019-02-20 16:09:29 +09:00
  b1337ed07f
• Merge remote-tracking branch 'upstream/master' into isactive-changes
  Dean Herbert · 2019-02-20 16:09:24 +09:00
  a4768a75e2
• Merge pull request #4290 from peppy/test-working-beatmap-clock

  Give TestWorkingBeatmap a reference clock

  Dean Herbert · 2019-02-20 16:04:46 +09:00
  a394e887df
• Merge branch 'master' into test-working-beatmap-clock
  Dan Balasescu · 2019-02-20 15:57:46 +09:00
  0850cb503d
• Merge pull request #4190 from HoLLy-HaCKeR/ctb-diffcalc

  Fix Catch DifficultyCalculator being off

  Dan Balasescu · 2019-02-20 15:28:40 +09:00
  c8311dfe60
• Adjust expected testcase value
  smoogipoo · 2019-02-20 15:18:51 +09:00
  c01b18f02f
• Merge remote-tracking branch 'origin/master' into ctb-diffcalc
  smoogipoo · 2019-02-20 15:15:12 +09:00
  cab7a030f0
• Merge branch 'master' into test-working-beatmap-clock
  Dean Herbert · 2019-02-20 15:15:08 +09:00
  34afb2d897
• Merge pull request #4298 from smoogipoo/fix-catch-diffcalc-position

  Fix position not being set for the first hitobject

  Dean Herbert · 2019-02-20 15:14:36 +09:00
  850a84b506
• Fix position not being set for the first hitobject
  smoogipoo · 2019-02-20 14:14:45 +09:00
  d25d10d8fc
• Use correct local variable

  Co-Authored-By: peppy <pe@ppy.sh>

  Dan Balasescu · 2019-02-20 12:27:25 +09:00
  f6d70e687b
• Merge remote-tracking branch 'origin/master' into ctb-diffcalc

  # Conflicts:
  #	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs

  smoogipoo · 2019-02-20 12:22:32 +09:00
  9192f7d717
• Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
  Dean Herbert · 2019-02-20 12:08:37 +09:00
  a6e055b1f8
• Make TrackVirtualTracking more accurate on seeks/stops
  Dean Herbert · 2019-02-20 12:08:30 +09:00
  b4bb87fee3
• Merge pull request #4254 from peppy/add-button-tooltip

  Add tooltip to key configuration button

  Dan Balasescu · 2019-02-20 11:53:38 +09:00
  5ac1288f9e
• Merge branch 'master' into add-button-tooltip
  Dan Balasescu · 2019-02-20 11:37:55 +09:00
  96590156cd
• Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
  Dean Herbert · 2019-02-20 11:37:33 +09:00
  f2ad2931c7
• Merge pull request #4280 from smoogipoo/new-diffcalc-taiko

  Migrate taiko to use the new difficulty calculator structure

  Dean Herbert · 2019-02-20 11:01:25 +09:00
  19484d7c5e
• Merge branch 'master' into new-diffcalc-taiko
  Dean Herbert · 2019-02-20 10:46:38 +09:00
  58f817ae85
• Remove unnecessary folder reference
  Dean Herbert · 2019-02-20 10:46:25 +09:00
  2c76a039ca
• Merge pull request #4278 from smoogipoo/new-diffcalc-mania

  Migrate mania to use the new difficulty calculator structure

  Dean Herbert · 2019-02-20 10:45:37 +09:00
  8ccc935b6b
• Merge branch 'master' into new-diffcalc-mania
  Dean Herbert · 2019-02-20 10:30:48 +09:00
  43470da4ef
• Merge pull request #4279 from smoogipoo/new-diffcalc-catch

  Migrate catch to use the new difficulty calculator structure

  Dean Herbert · 2019-02-20 10:30:24 +09:00
  fd442372ce
• Remove excess newline
  Dean Herbert · 2019-02-20 10:29:08 +09:00
  d6a2fe6891
• Merge branch 'master' into new-diffcalc-mania
  Dean Herbert · 2019-02-20 10:20:49 +09:00
  ebb3fd8200
• Merge branch 'master' into new-diffcalc-catch
  Dean Herbert · 2019-02-20 10:20:43 +09:00
  cf3e13c984
• Merge branch 'master' into new-diffcalc-taiko
  Dean Herbert · 2019-02-20 10:20:22 +09:00
  6bf0363db5
• Merge pull request #4281 from smoogipoo/new-diffcalc-osu

  Migrate osu to use the new difficulty calculator structure

  Dean Herbert · 2019-02-20 09:45:17 +09:00
  9cbd3f43f3
• Remove redundant constructors
  David Zhao · 2019-02-19 19:57:55 +09:00
  87717dcf9e
• Add test cases for upwards traversal of screen stack
  David Zhao · 2019-02-19 19:44:26 +09:00
  2e375a9186
• Update active state immediately + fix potential nullref
  smoogipoo · 2019-02-19 19:44:09 +09:00
  49eadcb575
• Update in-line with framework IsActive changes
  smoogipoo · 2019-02-19 19:16:03 +09:00
  703df77000
• Add beatmap argument
  smoogipoo · 2019-02-19 17:58:02 +09:00
  0380293098
• Merge branch 'remove-populateattributes' into new-diffcalc-osu
  smoogipoo · 2019-02-19 17:57:47 +09:00
  19f2593ef6
• Add beatmap argument
  smoogipoo · 2019-02-19 17:57:29 +09:00
  5ff890434c
• Merge branch 'remove-populateattributes' into new-diffcalc-taiko
  smoogipoo · 2019-02-19 17:57:14 +09:00
  256fbfe492
• Add beatmap argument + fix crashes
  smoogipoo · 2019-02-19 17:56:38 +09:00
  4efc03cdf0
• Merge branch 'remove-populateattributes' into new-diffcalc-mania
  smoogipoo · 2019-02-19 17:55:56 +09:00
  b7b1f0ef0c
• Add beatmap argument
  smoogipoo · 2019-02-19 17:54:00 +09:00
  ea281e8596
• Merge branch 'remove-populateattributes' into new-diffcalc-catch
  smoogipoo · 2019-02-19 17:53:35 +09:00
  dac3c4564e
• Pass beatmap to CreateSkills()
  smoogipoo · 2019-02-19 17:52:59 +09:00
  4dcf39846d