6385 Commits

This Branch

This Branch

All Branches

• Merge pull request #1092 from jorolf/fix-test-argument

  fix "--tests" argument for visual tests

  Dean Herbert · 2017-08-09 09:02:49 +09:00
  66ef6eb026
• Merge branch 'master' into fix-test-argument
  Dean Herbert · 2017-08-09 08:52:56 +09:00
  881bf48c6e
• fix tests argument
  Jorolf · 2017-08-09 01:49:50 +02:00
  56caa6ef10
• Merge pull request #1091 from ppy/smoogipooo-patch-1

  Remove incorrect duplicate code in mania pattern generation.

  Dean Herbert · 2017-08-09 07:52:35 +09:00
  ae4460e680
• Remove correct duplicate code.

  Already present on line 51.

  Dan Balasescu · 2017-08-09 06:24:08 +09:00
  21d44b1e99
• Merge pull request #1089 from johnneijzen/Small-Mistakes-Fix

  Update HitObjectPatternGenerator.cs

  Dan Balasescu · 2017-08-09 06:13:16 +09:00
  98c652c0f9
• Update HitObjectPatternGenerator.cs
  John Neijzen · 2017-08-08 22:56:27 +08:00
  9e17549d7f
• Merge pull request #1085 from smoogipooo/spriteicon-invalidation-fix

  Fix SpriteIcon invalidation causing game breakness.

  Dean Herbert · 2017-08-07 15:04:05 +09:00
  d5c6693990
• Merge branch 'master' into spriteicon-invalidation-fix
  Dean Herbert · 2017-08-07 14:49:09 +09:00
  2ce30474ca
• Merge pull request #1086 from smoogipooo/add-accent-sequence

  Add transform sequence support to IHasAccentColour.

  Dean Herbert · 2017-08-07 14:48:59 +09:00
  25bc281f00
• Adjust xmldocs to conform to TransformableExtensions.
  smoogipooo · 2017-08-07 14:20:56 +09:00
  d0906d8232
• Add transform sequence support to IHasAccentColour.
  smoogipooo · 2017-08-07 14:12:05 +09:00
  2221797273
• These method calls are impure.
  smoogipooo · 2017-08-07 13:37:07 +09:00
  ce7d391f06
• Fix SpriteIcon invalidation causing game breakness.
  smoogipooo · 2017-08-07 13:26:54 +09:00
  953cf5af58
• Merge pull request #1084 from ppy/correct-cs-multiplier

  Adjust CS multiplier to match stable

  Dean Herbert · 2017-08-07 10:53:39 +09:00
  b8d67f65af
• Adjust CS multiplier to match stable
  Dean Herbert · 2017-08-07 10:43:33 +09:00
  eb190d83bd
• Merge pull request #1083 from peppy/more-mods

  Implement NoFail, HardRock, Easy mods

  Dan Balasescu · 2017-08-07 10:07:06 +09:00
  c7b59646c0
• Update framework
  Dean Herbert · 2017-08-07 09:56:50 +09:00
  da84f1ce39
• Use nested containers for shadow
  Dean Herbert · 2017-08-07 09:50:04 +09:00
  8941c8658c
• Fix StoredBookmarks not being serialized
  Dean Herbert · 2017-08-07 09:45:44 +09:00
  de3b65e1fa
• Fix incomplete comment
  Dean Herbert · 2017-08-07 09:01:47 +09:00
  6f93aa6131
• Add difficulty application mods

  Also fixes circular references when using IJsonSerializable.

  Dean Herbert · 2017-08-07 08:54:54 +09:00
  e75f438c29
• Implement NoFail mod
  Dean Herbert · 2017-08-07 08:54:54 +09:00
  224de9cc1e
• Fix alignment of icons on mod buttons
  Dean Herbert · 2017-08-07 08:54:53 +09:00
  3416925233
• Fix shadow on SpriteIcon being a bit off
  Dean Herbert · 2017-08-07 08:54:53 +09:00
  d7fede96ef
• Merge pull request #1082 from huoyaoyuan/depth

  Remove depth setting in SectionsContainer and profile.

  Dean Herbert · 2017-08-07 07:28:09 +09:00
  c9b0177e09
• Remove depth setting in SectionsContainer and profile.
  Huo Yaoyuan · 2017-08-05 18:01:10 +08:00
  8843d97895
• Merge pull request #1078 from smoogipooo/taiko-fixes

  Taiko fixes

  Dean Herbert · 2017-08-04 20:01:33 +09:00
  0312103546
• Merge remote-tracking branch 'upstream/master' into taiko-fixes

  # Conflicts:
  #	osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs
  #	osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

  Dean Herbert · 2017-08-04 18:04:23 +09:00
  fa7ef8ed52
• Merge pull request #1025 from huoyaoyuan/fixes

  Implement Ctrl+Enter for Auto in song select.

  Dean Herbert · 2017-08-04 17:48:47 +09:00
  5cf8121d29
• Revert all changes on OsuGame
  Dean Herbert · 2017-08-04 17:36:31 +09:00
  083248872b
• Move line inside if
  Dean Herbert · 2017-08-04 17:20:05 +09:00
  e8021c2b92
• Merge remote-tracking branch 'upstream/master' into fixes
  Dean Herbert · 2017-08-04 17:19:32 +09:00
  0f8d46a990
• Merge pull request #1080 from peppy/visual-test-updates

  Update to support new framework VisualTests structure

  Dan Balasescu · 2017-08-04 17:44:45 +09:30
  1c37efdd28
• Update VSCode with new configurations.
  smoogipooo · 2017-08-04 17:18:44 +09:30
  17900f3353
• Use removeAutoModOnResume as a field.
  Huo Yaoyuan · 2017-08-04 15:34:11 +08:00
  74facb32b4
• Use a common build directory between both build ccnfigurations

  There's no need to build to VisualTests when they share everything

  Dean Herbert · 2017-08-04 16:07:25 +09:00
  fc97fdb8c1
• FirstOrDefault
  Dean Herbert · 2017-08-04 15:58:59 +09:00
  7e89b1021d
• Add missing licence headers
  Dean Herbert · 2017-08-04 15:48:42 +09:00
  104c25266d
• Update framework
  Dean Herbert · 2017-08-04 15:40:28 +09:00
  e6ef50c4e4
• Update to support new framework VisualTests structure
  Dean Herbert · 2017-08-04 15:37:31 +09:00
  f8448b8b19
• Merge branch 'master' into fixes
  Huo Yaoyuan · 2017-08-04 13:49:03 +08:00
  62b3540fd6
• Provide Autoplay mod in Ruleset.
  Huo Yaoyuan · 2017-08-04 00:25:24 +08:00
  eb9972581e
• Pass input state in OnSelected.
  Huo Yaoyuan · 2017-08-04 00:09:41 +08:00
  44fd0eb78b
• CI fixes.
  smoogipooo · 2017-08-03 20:44:05 +09:30
  ba31bfcdf1
• Fix brokenness due to relative sizes.
  smoogipooo · 2017-08-03 20:12:31 +09:30
  351d255355
• Merge remote-tracking branch 'origin/master' into taiko-fixes

  # Conflicts:
  #	osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs

  smoogipooo · 2017-08-03 20:02:19 +09:30
  0a4464bbe8
• Merge pull request #1077 from MrTheMake/osulegacydecoder-parser

  Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified

  Dean Herbert · 2017-08-03 16:36:01 +09:00
  c86f23baea
• Merge branch 'master' into osulegacydecoder-parser
  Dean Herbert · 2017-08-03 16:30:37 +09:00
  248486f8f9
• Merge pull request #1079 from peppy/ruleset-icons-revamp

  Allow Rulesets to create a non-FontAwesome icon

  Dan Balasescu · 2017-08-03 16:28:51 +09:30
  ecf102f568