4810 Commits

This Branch

This Branch

All Branches

• Merge pull request #830 from smoogipooo/controlpoint-rework

  Split out ControlPoints into more specific types

  Dean Herbert · 2017-05-24 00:41:59 +09:00
  acce59cdb3
• Merge branch 'master' into controlpoint-rework
  Dean Herbert · 2017-05-24 00:20:15 +09:00
  0842e00f13
• Merge pull request #832 from peppy/menu-music-osz

  Read menu music from osz resource

  Dean Herbert · 2017-05-24 00:09:46 +09:00
  d162a2b033
• Merge branch 'master' into menu-music-osz
  Dean Herbert · 2017-05-23 23:56:07 +09:00
  a48a03bf38
• Merge pull request #837 from EVAST9919/fixes

  Tidy ups

  Dean Herbert · 2017-05-23 23:50:44 +09:00
  7e3caa19fd
• using autosize instead of constant height
  EVAST9919 · 2017-05-23 14:32:45 +03:00
  564abc1a5b
• Make transition a bit smoother
  EVAST9919 · 2017-05-23 12:30:39 +03:00
  165d6ef1bb
• Merge branch 'master' into menu-music-osz
  Dan Balasescu · 2017-05-23 18:26:48 +09:00
  2d806c7f11
• CI fixes and removed useless property
  EVAST9919 · 2017-05-23 12:24:16 +03:00
  2e28b10c36
• Better letterbox settings transition
  EVAST9919 · 2017-05-23 12:09:32 +03:00
  c7a241246e
• Fix visual test failing.
  smoogipooo · 2017-05-23 18:06:31 +09:00
  76fe4af9a6
• Moved KeyCounter visibility logic to it's own class
  EVAST9919 · 2017-05-23 11:53:42 +03:00
  4b23cc47ea
• Simplify Hud visibility change
  EVAST9919 · 2017-05-23 11:53:12 +03:00
  eafe215169
• Merge pull request #827 from smoogipooo/mania-note-input

  Implement mania note input

  Dean Herbert · 2017-05-23 17:22:59 +09:00
  9cb614fee7
• Merge branch 'master' into mania-note-input
  Dean Herbert · 2017-05-23 16:50:01 +09:00
  836c33cfb0
• CI fixes.
  smoogipooo · 2017-05-23 16:47:47 +09:00
  a4823bca91
• Read menu music from osz resource
  Dean Herbert · 2017-05-23 16:38:43 +09:00
  fe7ac20e29
• Fix line endings.
  smoogipooo · 2017-05-23 16:13:51 +09:00
  7e5bb61a44
• Revert a bit of BeatSyncedContainer for smaller changeset.
  smoogipooo · 2017-05-23 16:06:30 +09:00
  1867cbb381
• More cleanups.
  smoogipooo · 2017-05-23 15:29:38 +09:00
  836bf930a0
• Always add TimingChange control points.
  smoogipooo · 2017-05-23 15:26:07 +09:00
  2344f37a3c
• Use SortedList + BinarySearch to find control points at time values.
  smoogipooo · 2017-05-23 15:20:32 +09:00
  002a0e99a2
• xmldocs.
  smoogipooo · 2017-05-23 14:11:37 +09:00
  6bfd7e0fb0
• Fix compile errors.
  smoogipooo · 2017-05-23 14:08:15 +09:00
  ea4a285329
• Split ControlPoint into different types.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/UI/Column.cs

  smoogipooo · 2017-05-23 14:03:40 +09:00
  3cdfd2eef5
• Merge pull request #828 from smoogipooo/ColdVolcano/beat-syncing

  Add beat syncing container

  Dean Herbert · 2017-05-23 11:25:24 +09:00
  d1eb8937b7
• Merge branch 'master' into ColdVolcano/beat-syncing
  Dean Herbert · 2017-05-23 10:51:47 +09:00
  1295b0a7e1
• Merge pull request #800 from smoogipooo/mania-hitobject-object-conversion

  Mania hitobject object conversion

  Dean Herbert · 2017-05-22 21:34:17 +09:00
  v2017.523.0 e6e443dbce
• Merge branch 'master' into mania-hitobject-object-conversion
  Dean Herbert · 2017-05-22 21:12:00 +09:00
  51728e48be
• Merge pull request #815 from huoyaoyuan/sections

  Abstract out SectionsContainer from Settings

  Dean Herbert · 2017-05-22 20:09:09 +09:00
  9d411fe07b
• Move load() to be directly below ctor.
  smoogipooo · 2017-05-22 20:06:37 +09:00
  adf8bb853e
• Early return if beatLength = 0.
  smoogipooo · 2017-05-22 20:02:02 +09:00
  de575b3867
• Delay backwards instead of using a millisecond tolerance.
  smoogipooo · 2017-05-22 20:01:28 +09:00
  95c4704a9e
• Merge branch 'master' into sections
  Dean Herbert · 2017-05-22 19:55:27 +09:00
  b494938145
• Merge pull request #826 from smoogipooo/mania-input-base

  Add basic framework required to implement mania note input

  Dean Herbert · 2017-05-22 19:54:59 +09:00
  2e730c6840
• Update BeatSyncedContainer.cs
  Dan Balasescu · 2017-05-22 17:50:05 +09:00
  fc90cfa604
• Add to csproj.
  smoogipooo · 2017-05-22 17:32:18 +09:00
  3235e280a9
• Merge branch 'master' into ColdVolcano/beat-syncing
  Dan Balasescu · 2017-05-22 17:27:22 +09:00
  a438a8b8d3
• More inversion for logic simplification.
  smoogipooo · 2017-05-22 17:19:39 +09:00
  70d7f61f7c
• Use BindTo instead of taking the game's beatmap bindable.
  smoogipooo · 2017-05-22 17:18:11 +09:00
  f81ffa636d
• Better kiai mode detection.
  smoogipooo · 2017-05-22 17:18:05 +09:00
  609aac6453
• Proper kiai mode detection.
  smoogipooo · 2017-05-22 17:18:00 +09:00
  b241140496
• Invert if statements.
  smoogipooo · 2017-05-22 17:17:54 +09:00
  abe9c464a8
• Fix depth of header background.

  Thanks to the order of adding to parent container, the depth value is actually not needed.

  Huo Yaoyuan · 2017-05-22 16:00:03 +08:00
  63259a3457
• Do not scroll headers to when scrolling position is negative.
  Huo Yaoyuan · 2017-05-22 15:54:58 +08:00
  85684e5fee
• Don't handle repeat keys.
  smoogipooo · 2017-05-22 16:42:14 +09:00
  4200e05fe7
• Fix nullref.
  smoogipooo · 2017-05-22 16:39:30 +09:00
  7314a9019c
• Implement DrawableNote hits.
  smoogipooo · 2017-05-22 16:35:15 +09:00
  f9eb448f16
• Update HitWindows.cs
  Dan Balasescu · 2017-05-22 16:34:38 +09:00
  6f00f7f0d0
• Add helper method to easily compare time offset to hit windows.
  smoogipooo · 2017-05-22 16:28:44 +09:00
  62c7e97a5f