6229 Commits

This Branch

This Branch

All Branches

• Merge pull request #831 from smoogipooo/beat-sync-container-improvements

  Beat sync container improvements

  Dean Herbert · 2017-05-24 01:05:02 +09:00
  952179332f
• Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item
  Jorolf · 2017-05-23 17:51:46 +02:00
  64cee72464
• revert framework
  Jorolf · 2017-05-23 17:50:28 +02:00
  320e7b358e
• Merge branch 'master' into beat-sync-container-improvements
  Dean Herbert · 2017-05-24 00:46:14 +09:00
  ef1712a5af
• 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
• update framework
  Jorolf · 2017-05-23 17:35:40 +02:00
  7d28290a4a
• Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item
  Jorolf · 2017-05-23 17:32:48 +02:00
  7ad10009e6
• 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
• Unregister OnBeatmapChanged() when exiting song selection
  MrTheMake · 2017-05-23 15:30:15 +02:00
  0603be5937
• overall fixes
  EVAST9919 · 2017-05-23 16:01:00 +03:00
  178f8127b8
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-23 14:45:38 +03:00
  2ca0794b37
• 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
• Cleanup.
  smoogipooo · 2017-05-23 17:59:45 +09:00
  9255297075
• Redesign hit explosions.
  smoogipooo · 2017-05-23 17:57:34 +09:00
  ae94e6ea85
• 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
• Make kiai time hit object pulse on bar line beats.
  smoogipooo · 2017-05-23 17:36:43 +09:00
  25a48d832f
• Merge branch 'master' into osu-direct
  Dean Herbert · 2017-05-23 17:33:20 +09:00
  0634a3a5c5
• Various refactoring
  Dean Herbert · 2017-05-23 17:26:28 +09:00
  0dd52e4e29
• 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 'beat-sync-container-improvements' into taiko-visual-update
  smoogipooo · 2017-05-23 16:51:45 +09:00
  4c66157a07
• 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
• Add more flashiness during kiai time
  Dean Herbert · 2017-05-23 16:42:47 +09:00
  2decb2b2ff
• Don't bounce the ripple

  Also ripple better.

  Dean Herbert · 2017-05-23 16:42:41 +09:00
  73320f9a7e
• Restructure playfield so that various elements are masked.
  smoogipooo · 2017-05-23 16:42:17 +09:00
  61348ff08d
• Read menu music from osz resource
  Dean Herbert · 2017-05-23 16:38:43 +09:00
  fe7ac20e29
• Merge remote-tracking branch 'origin/master' into taiko-visual-update
  smoogipooo · 2017-05-23 16:19:12 +09:00
  27eef9122a
• Fix line endings.
  smoogipooo · 2017-05-23 16:13:51 +09:00
  7e5bb61a44
• Refactoring of BeatSyncedContainer.
  smoogipooo · 2017-05-23 16:11:46 +09:00
  aad6f8f5d6
• Merge branch 'controlpoint-rework' into beat-sync-container-improvements
  smoogipooo · 2017-05-23 16:07:59 +09:00
  7066376855
• 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
• Add basic beat response to osu! logo
  Dean Herbert · 2017-05-23 12:29:43 +09:00
  3e0aaa1aa0
• 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
• Remove SettingsButton(old and outdated design), fix channel list scrolling under the header
  DrabWeb · 2017-05-22 22:37:25 -03:00
  62897d302e