21328 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into relative-beat-lengths
  Dean Herbert · 2019-08-28 22:11:27 +09:00
  6295fb4171
• Remove redundant qualifier
  Dean Herbert · 2019-08-28 22:11:23 +09:00
  c6e757fdae
• Merge pull request #5530 from nyquillerium/humanizer-fallback

  Add a fallback for humanizer localization lookup failures

  Dean Herbert · 2019-08-28 21:45:01 +09:00
  3c03d36694
• Merge branch 'master' into relative-beat-lengths
  Dean Herbert · 2019-08-28 20:26:20 +09:00
  1597cf874e
• Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in

  Fix osu! approach circles fading in too late

  Dean Herbert · 2019-08-28 20:25:49 +09:00
  720908ba22
• Centralise default beat length specification
  Dean Herbert · 2019-08-28 20:22:16 +09:00
  f6ad95018a
• Merge remote-tracking branch 'upstream/master' into relative-beat-lengths
  Dean Herbert · 2019-08-28 20:21:56 +09:00
  ecfcbe3723
• Merge remote-tracking branch 'upstream/master' into humanizer-fallback
  Dean Herbert · 2019-08-28 20:15:32 +09:00
  dfdf3f5e96
• Cleanup
  Dean Herbert · 2019-08-28 20:15:28 +09:00
  c7e20b34ba
• Make taiko proxy containers use LifetimeManagementContainer (#5863)

  Make taiko proxy containers use LifetimeManagementContainer
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-08-28 18:35:15 +09:00
  a91dbe4a50
• Merge branch 'master' into taiko-proxy-optimisation
  Dean Herbert · 2019-08-28 18:25:46 +09:00
  74b5ad9c49
• Update in line with framework changes (#5856)

  Update in line with framework changes

  Dean Herbert · 2019-08-28 18:23:47 +09:00
  ac0628d832
• Share logic with other rulesets (and make default)
  Dean Herbert · 2019-08-28 18:12:47 +09:00
  9a98f39f06
• Fix osu! approach circles fading in too late
  Dean Herbert · 2019-08-28 18:10:58 +09:00
  9752dbf950
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-08-28 17:04:44 +09:00
  fcf770c744
• Update framework
  Dean Herbert · 2019-08-28 17:03:54 +09:00
  70da25cfca
• Merge pull request #5858 from EVAST9919/simplify-paginated-container

  Refactor PaginatedContainer to avoid code duplication

  Dan Balasescu · 2019-08-28 13:50:17 +09:00
  af7b2190c1
• item -> model
  Dean Herbert · 2019-08-28 13:31:12 +09:00
  bef44b8e58
• Simplify schedule layout
  Dean Herbert · 2019-08-28 13:28:57 +09:00
  3942c83c18
• T -> TModel
  Dean Herbert · 2019-08-28 13:28:21 +09:00
  27633c8dbd
• Remove "AllowCreate" function by instead handling nulls
  Dean Herbert · 2019-08-28 13:27:44 +09:00
  f18b5a3c02
• Make taiko proxy containers use LifetimeManagementContainer
  smoogipoo · 2019-08-28 13:20:28 +09:00
  7cc92e2fad
• Merge remote-tracking branch 'upstream/master' into simplify-paginated-container
  Dean Herbert · 2019-08-28 13:15:57 +09:00
  c4aaab20c7
• Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank

  Try retrieving samples without bank names

  Dean Herbert · 2019-08-28 13:12:51 +09:00
  1aa09ff05c
• Merge pull request #5860 from peppy/fix-skin-switch-samples

  Fix hitsounds not updating immediately after switching skins

  Dan Balasescu · 2019-08-28 11:59:02 +09:00
  759f6219ae
• Fix hitsounds not updating immediately after switching skins
  Dean Herbert · 2019-08-28 03:25:57 +09:00
  4add1727b7
• Resolve merge conflicts
  iiSaLMaN · 2019-08-27 20:06:17 +03:00
  18431a42e6
• Loop over lookup names on default-samples retrieval
  iiSaLMaN · 2019-08-27 19:42:17 +03:00
  4ef991b973
• CI fixes
  Andrei Zavatski · 2019-08-27 16:09:37 +03:00
  5fd43d42f4
• Add AllowCreate function
  Andrei Zavatski · 2019-08-27 15:58:57 +03:00
  9a383eee1a
• Refactor PaginatedContainer to avoid code duplication
  Andrei Zavatski · 2019-08-27 15:47:37 +03:00
  22ee7db805
• Update in line with framework changes
  Dean Herbert · 2019-08-27 18:43:58 +09:00
  b59973c712
• Merge pull request #5850 from smoogipoo/fix-taiko-proxy-rewind

  Fix taiko proxies being removed on rewind

  Dean Herbert · 2019-08-27 18:38:03 +09:00
  0f25ad8b87
• Obsolete legacy UpdateState() method (#5853)

  Obsolete legacy UpdateState() method

  Dean Herbert · 2019-08-27 18:34:16 +09:00
  0fba446c01
• Merge remote-tracking branch 'origin/master' into fix-taiko-proxy-rewind

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

  smoogipoo · 2019-08-27 17:42:45 +09:00
  3723c441d2
• Merge pull request #5855 from peppy/fix-skin-sample-reading

  Fix skin sample reading failing

  Dan Balasescu · 2019-08-27 17:41:35 +09:00
  a2a33c9519
• Fix skin sample reading failing
  Dean Herbert · 2019-08-27 17:18:32 +09:00
  0ea10a4922
• Obsolete legacy UpdateState() method
  smoogipoo · 2019-08-27 16:09:47 +09:00
  9e926d44c0
• Merge pull request #5848 from iiSaLMaN/use-transform-management-for-taiko-ruleset

  Use automatic state logic for taiko ruleset
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-08-27 15:49:15 +09:00
  2a3f3dacb3
• Use constant value for offset
  smoogipoo · 2019-08-27 15:33:53 +09:00
  2b22fd799d
• Add initial fade transform
  smoogipoo · 2019-08-27 15:33:53 +09:00
  bc7a81e733
• Fix DrawableSwell not proxying its content in time/correctly
  smoogipoo · 2019-08-27 15:33:28 +09:00
  dba3679817
• Fix taiko proxies being removed on rewind
  smoogipoo · 2019-08-27 15:24:49 +09:00
  b85e62a6e2
• Merge branch 'master' into allow-fallback-to-samples-without-bank
  Dean Herbert · 2019-08-27 14:44:16 +09:00
  66223b9954
• Merge pull request #5816 from Game4all/select-filters-persistence

  Save user's group and sort filter choices
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-08-27 14:42:54 +09:00
  70a3183b73
• Make bindables private
  Dean Herbert · 2019-08-27 14:31:34 +09:00
  7885c79467
• Merge branch 'master' into select-filters-persistence
  Dean Herbert · 2019-08-27 14:12:59 +09:00
  69145eb83a
• Use automatic state logic for mania ruleset (#5844)

  Use automatic state logic for mania ruleset

  Dean Herbert · 2019-08-27 13:20:39 +09:00
  8b8c747ad5
• Merge branch 'master' into use-transform-managment-for-mania-ruleset
  Salman Ahmed · 2019-08-27 07:07:58 +03:00
  ba969d2d7d
• Fix hold notes disappearing instantaneously
  smoogipoo · 2019-08-27 12:59:57 +09:00
  fff2da7289