24822 Commits

This Branch

This Branch

All Branches

• 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
• Merge branch 'master' into CakeBuildImprovements
  Dean Herbert · 2019-02-18 01:38:55 +09:00
  d0c603e8e4
• Merge branch 'CakeBuildImprovements' of https://github.com/miterosan/osu into CakeBuildImprovements
  miterosan · 2019-02-17 13:57:47 +01:00
  107e9550bc
• Correct the path to the cakebuild.csproj.
  miterosan · 2019-02-17 13:57:14 +01:00
  9708634232
• Merge pull request #4256 from smoogipoo/diffcalc-testcases

  Add difficulty calculator tests

  Dean Herbert · 2019-02-17 21:26:25 +09:00
  8ab39efe3e
• Merge branch 'master' into diffcalc-testcases
  Dean Herbert · 2019-02-17 21:06:42 +09:00
  42dc7644f2
• Bind to correct target (hacky)
  Dean Herbert · 2019-02-17 19:49:10 +09:00
  e7668a749b
• Fix regressed test
  Dean Herbert · 2019-02-17 19:48:58 +09:00
  ef321b4103
• Fix unnecessary texture atlas generation
  Dean Herbert · 2019-02-17 19:48:54 +09:00
  6ea1ed8d04
• Update in line with screen changes
  Dean Herbert · 2019-02-17 18:20:03 +09:00
  fcab21908b
• Merge remote-tracking branch 'upstream/master' into tournament-tools

  # Conflicts:
  #	osu.Game.Tournament.Tests/TestCaseDrawings.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2019-02-17 17:25:09 +09:00
  f0743ebecf
• Merge branch 'master' into CakeBuildImprovements
  miterosan · 2019-02-16 15:15:27 +01:00
  b61f929087
• Remove the unused desktop project variable
  miterosan · 2019-02-16 14:51:20 +01:00
  c09346080f
• Fix nullref when entering multiplayer (#4268)

  Fix nullref when entering multiplayer

  Dean Herbert · 2019-02-16 11:25:26 +09:00
  2019.216.0 2018.216.0 bab29b94a6
• Fix nullref
  smoogipoo · 2019-02-16 11:18:17 +09:00
  134840f118
• Also apply the changes to build.sh
  miterosan · 2019-02-16 00:02:08 +01:00
  ed67b580fa
• Improve the buildscript
  miterosan · 2019-02-15 23:47:22 +01:00
  57fcdf9a0b
• Merge pull request #4265 from peppy/fix-screen-tests

  Fix screen tests

  Dean Herbert · 2019-02-15 22:26:22 +09:00
  2019.215.0 3372a0e5a2
• Fix TestCasePlaySongSelect
  Dean Herbert · 2019-02-15 21:50:40 +09:00
  aceb8c4cb0
• Merge remote-tracking branch 'upstream/master' into fix-screen-tests
  Dean Herbert · 2019-02-15 21:29:44 +09:00
  4777fd1334
• Update framework
  Dean Herbert · 2019-02-15 21:28:59 +09:00
  c607b8c979
• Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support

  Add support for the HitCircleOverlap property of legacy skins

  Dean Herbert · 2019-02-15 21:27:56 +09:00
  bd4e8e132b
• Merge pull request #4259 from nekodex/fix-cursor-on-startup

  Fix mouse cursor appearing prematurely during startup

  Dean Herbert · 2019-02-15 21:27:37 +09:00
  dfb4e82125
• Add newline
  Dean Herbert · 2019-02-15 21:16:54 +09:00
  90e462309f
• Merge branch 'master' into fix-cursor-on-startup
  Dean Herbert · 2019-02-15 21:15:23 +09:00
  89981c02a2
• Add a TestCase for looong combos
  Jamie Taylor · 2019-02-15 21:03:55 +09:00
  1c8212d510
• Add support for the HitCircleOverlap property in legacy skins
  Jamie Taylor · 2019-02-15 21:03:06 +09:00
  38cf5a1ea4