1551 Commits

• Merge branch 'master' into open-downloaded-beatmas
  Dean Herbert · 2018-07-28 12:44:34 +09:00
  b7de922896
• Merge branch 'master' into open-downloaded-beatmas
  Dean Herbert · 2018-07-25 12:38:49 +02:00
  95cca046fb
• ToLower -> ToLowerInvariant
  Dean Herbert · 2018-07-25 07:37:05 +02:00
  da8fc0ee5d
• Use ToUpperInvariant
  Dean Herbert · 2018-07-24 14:42:06 +02:00
  5364a6148a
• Fix usage of culture local ToUpper causing incorrect display on Turkish machines

  Closes #3098.

  Dean Herbert · 2018-07-24 11:37:43 +02:00
  ab9340f4be
• Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
  Dean Herbert · 2018-07-23 06:36:10 +02:00
  aead4be134
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 05:23:52 +09:00
  6fa70ed696
• Merge branch 'master' into per-object-css
  Dean Herbert · 2018-07-23 03:01:17 +09:00
  d561f54282
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 02:58:49 +09:00
  d868d81b59
• Update framework
  Dean Herbert · 2018-07-21 16:21:53 +09:00
  0f37758314
• Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
  Dean Herbert · 2018-07-21 00:03:17 +09:00
  a2f744b05e
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-20 17:29:15 +09:00
  3fc7f33e90
• Merge branch 'master' into pause-input-fixes
  Dean Herbert · 2018-07-20 17:20:19 +09:00
  7cc999027d
• Centralise method of disabling playfield judgements
  smoogipoo · 2018-07-20 17:04:33 +09:00
  1139f0dbf2
• Implement per-hitobject custom sample banks
  smoogipoo · 2018-07-20 15:12:44 +09:00
  c087a73f40
• Restructure + corrects converting to support all systems
  David V · 2018-07-19 17:47:55 +02:00
  9eb69a1e76
• Converts float to int.
  David V · 2018-07-19 15:55:38 +02:00
  4e72794101
• Merge branch 'master' into mania-mask-container
  Dan Balasescu · 2018-07-19 19:38:43 +09:00
  5dba048c46
• Add more ToString output
  Dean Herbert · 2018-07-19 18:43:11 +09:00
  693ba8e994
• Remove more unnecessary changes
  smoogipoo · 2018-07-19 18:25:28 +09:00
  b7721edc80
• Better pause logic
  Dean Herbert · 2018-07-18 19:59:04 +09:00
  c2cdf12986
• Add ruleset config to HitObjectComposer
  smoogipoo · 2018-07-17 16:53:32 +09:00
  9b7d01397b
• Merge remote-tracking branch 'origin/master' into mania-mask-container

  # Conflicts:
  #	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
  #	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs

  smoogipoo · 2018-07-17 16:46:48 +09:00
  6437fdd9db
• Merge branch 'master' into use-switch-over-if
  Dan Balasescu · 2018-07-17 16:44:57 +09:00
  64cde1ebad
• Apply review feedback
  Dean Herbert · 2018-07-17 16:33:08 +09:00
  9f933187e9
• Merge branch 'editor-composer-cleanup' into mania-mask-container

  # Conflicts:
  #	osu.Game/Rulesets/Edit/HitObjectComposer.cs
  #	osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs

  smoogipoo · 2018-07-17 16:00:46 +09:00
  9f730dd784
• Add a playfield method to retrieve all hitobjects
  smoogipoo · 2018-07-17 15:51:10 +09:00
  3905a9105c
• Make NestedPlayfields non-null
  smoogipoo · 2018-07-17 15:48:51 +09:00
  48190e3b5a
• Merge branch 'master' into scrolldirection-cleanup
  Dean Herbert · 2018-07-17 15:39:13 +09:00
  569d0f7993
• Invert flow order of hitobjects between composer and mask layers
  smoogipoo · 2018-07-17 15:35:32 +09:00
  0b66f63f7d
• Merge branch 'master' into fix-incorrect-mods
  Dean Herbert · 2018-07-17 15:23:21 +09:00
  e681bd3244
• Remove scroll direction from ScrolingPlayfield constructor
  smoogipoo · 2018-07-17 15:14:03 +09:00
  827c5c4939
• Use switch with type matching in place of if-else where possible
  Dean Herbert · 2018-07-17 14:35:09 +09:00
  825941aff1
• Fix lead-in time now being long enough in many cases
  Dean Herbert · 2018-07-17 14:29:22 +09:00
  b967fe714b
• Merge branch 'master' into fix-incorrect-mods
  Dan Balasescu · 2018-07-17 13:41:02 +09:00
  745d596343
• Merge remote-tracking branch 'origin/master' into mania-mask-container

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
  #	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
  #	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
  #	osu.Game.Rulesets.Mania/UI/ManiaStage.cs

  smoogipoo · 2018-07-17 13:13:57 +09:00
  577ff4cc7f
• Use Enum.HasFlag

  With .NET core 2.0+ this is as efficient as the ugly code we've been using.

  Dean Herbert · 2018-07-16 16:18:46 +09:00
  dbc538abbe
• Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
  Dean Herbert · 2018-07-13 14:20:56 +09:00
  ac078153ae
• Fix DI regression
  Dean Herbert · 2018-07-11 17:54:01 +09:00
  24054246b8
• Update framework
  Dean Herbert · 2018-07-11 17:12:01 +09:00
  fbc5250bf1
• Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse
  Dean Herbert · 2018-07-11 17:02:01 +09:00
  96ef526474
• Merge branch 'master' into hitobject-samples
  Dean Herbert · 2018-07-05 19:43:19 +09:00
  4f894969df
• Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
  Dean Herbert · 2018-07-05 14:53:31 +09:00
  d11ba2df0e
• Fix mods not correctly resetting when changing ruleset at song select
  Dean Herbert · 2018-07-05 13:22:52 +09:00
  e28a610757
• Rewrite disable mouse buttons logic
  ekrctb · 2018-07-03 20:04:15 +09:00
  d71b61c122
• Merge branch 'master' into non-null-nestedobjects
  Dean Herbert · 2018-07-03 19:43:46 +09:00
  1e1ff8339e
• Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds

  # Conflicts:
  #	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs

  smoogipoo · 2018-07-02 17:21:18 +09:00
  f0ec117bcb
• Tidy up lookups to NestedHitObjects
  smoogipoo · 2018-07-02 16:10:56 +09:00
  45a4187923
• Reorder sample bank property setters
  smoogipoo · 2018-07-02 14:29:18 +09:00
  7f832e34c0
• Implement hitobject sample files
  smoogipoo · 2018-07-02 14:20:35 +09:00
  73fac2115a