4739 Commits

This Branch

This Branch

All Branches

• Merge pull request #828 into menu-flashes
  ColdVolcano · 2017-05-22 04:15:46 -05:00
  1ea60fd393
• Merge fc90cfa604 into f8c419f9ba
  Dan Balasescu · 2017-05-22 08:50:06 +00:00
  8153bdddf6
• 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
• Changes in-line with framework
  ColdVolcano · 2017-05-21 23:47:08 -05:00
  059af0850b
• Merge pull request #814 from MrTheMake/songselect-fixes

  Fixes to the song select screen

  Dean Herbert · 2017-05-22 12:52:36 +09:00
  f8c419f9ba
• Merge branch 'master' into songselect-fixes
  Dean Herbert · 2017-05-22 12:29:18 +09:00
  d3495545c5
• Merge pull request #790 from smoogipooo/mania-endtime-object-conversion

  Mania endtime object conversion

  Dean Herbert · 2017-05-22 12:22:33 +09:00
  0040fbb284
• Merge branch 'master' into mania-endtime-object-conversion
  Dean Herbert · 2017-05-22 12:14:53 +09:00
  b50f9cad44
• Merge pull request #789 from smoogipooo/mania-distance-object-conversion

  Mania distance object conversion

  Dean Herbert · 2017-05-22 12:12:54 +09:00
  ca653ac708
• Merge branch 'master' into mania-distance-object-conversion
  Dean Herbert · 2017-05-22 12:08:01 +09:00
  fe70641980
• Merge pull request #781 from huoyaoyuan/generic-interface

  More tidy ups

  Dean Herbert · 2017-05-22 11:49:24 +09:00
  0ff3280bb3
• Merge branch 'master' into mania-distance-object-conversion
  Dan Balasescu · 2017-05-22 11:36:36 +09:00
  d02aaf0a28
• Merge branch 'master' into generic-interface
  Dean Herbert · 2017-05-22 11:35:50 +09:00
  7f08d60008
• Merge pull request #820 from smoogipooo/remove-siblings

  Remove Note Siblings.

  Dean Herbert · 2017-05-22 11:28:25 +09:00
  05f5e55bc7
• Merge branch 'master' into remove-siblings
  Dean Herbert · 2017-05-22 11:18:46 +09:00
  469cc5fa52
• Merge pull request #813 from MrTheMake/replay-no-pausing

  Do not pause a running replay if the window is not focused

  Dean Herbert · 2017-05-22 11:18:14 +09:00
  71e5b0dd02
• Merge branch 'master' into replay-no-pausing
  Dean Herbert · 2017-05-22 11:09:31 +09:00
  04f0dcc255
• Merge pull request #822 from smoogipooo/mania-pattern-changes

  Mania pattern changes

  Dean Herbert · 2017-05-22 11:09:01 +09:00
  d7796fa941
• Merge branch 'master' into mania-pattern-changes
  Dean Herbert · 2017-05-22 10:25:17 +09:00
  4b17bb8e69
• Add check before possibly going into endless loop.
  smoogipooo · 2017-05-22 10:23:08 +09:00
  6714a244e8
• Update with pattern changes.
  smoogipooo · 2017-05-22 10:20:42 +09:00
  2d11a8bdf0
• Update Pattern.cs
  Dan Balasescu · 2017-05-22 10:18:42 +09:00
  4ce3a78066
• Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion
  smoogipooo · 2017-05-22 10:17:54 +09:00
  e9f7be8dce
• Update with pattern changes.
  smoogipooo · 2017-05-22 10:17:08 +09:00
  cd66e2af14
• Merge branch 'mania-pattern-changes' into mania-distance-object-conversion
  smoogipooo · 2017-05-22 10:14:32 +09:00
  9fd4ab2302
• Merge pull request #821 from peppy/remove-some-colours

  Move spinner colours to local definition for now

  Dan Balasescu · 2017-05-22 10:14:04 +09:00
  4ffc44eac7
• Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
  smoogipooo · 2017-05-22 10:12:33 +09:00
  0a0139aded
• Renamings + refactorings to Pattern.
  smoogipooo · 2017-05-22 10:04:25 +09:00
  8c260e3364
• Use bitshifted notation.
  smoogipooo · 2017-05-22 10:00:11 +09:00
  9de18d45a5
• Remove siblings.
  smoogipooo · 2017-05-22 09:57:03 +09:00
  9f2ca1acbf
• Merge branch 'master' into generic-interface
  Dean Herbert · 2017-05-22 09:52:40 +09:00
  93182e5da3
• Merge branch 'remove-siblings' into mania-endtime-object-conversion
  smoogipooo · 2017-05-22 09:51:36 +09:00
  f42cbd5f38
• Move spinner colours to local definition for now

  We don't want to start polluting the OsuColours namespace with non-UI colours.

  Dean Herbert · 2017-05-22 09:50:45 +09:00
  82cf94bbff
• Remove siblings.
  smoogipooo · 2017-05-22 09:50:36 +09:00
  3041b55aac
• Merge branch 'remove-siblings' into mania-distance-object-conversion
  smoogipooo · 2017-05-22 09:49:00 +09:00
  384295bdca
• Remove Note Siblings.
  smoogipooo · 2017-05-22 09:46:34 +09:00
  e58ffbd87d
• Merge pull request #817 from peppy/spinner-colour-rehash

  Update spinner colours

  Dan Balasescu · 2017-05-22 09:38:12 +09:00
  0ddf2cb454
• Merge branch 'master' into spinner-colour-rehash
  Dan Balasescu · 2017-05-22 09:22:49 +09:00
  256cf90305
• Random the difficulty too
  MrTheMake · 2017-05-22 01:59:10 +02:00
  e9c2b51012
• Improved LEFTand RIGHT key behaviour
  MrTheMake · 2017-05-22 01:53:36 +02:00
  5ef7451dba
• Merge pull request #818 from Jorolf/more-freedom

  Allow for solutions where the osu repository isn't at the solution level

  Dean Herbert · 2017-05-22 08:43:19 +09:00
  a2c7e3b859
• Cleanup.
  smoogipooo · 2017-05-22 08:25:48 +09:00
  ecf81fa8d2
• Merge branch 'master' into mania-endtime-object-conversion
  Dean Herbert · 2017-05-22 08:12:24 +09:00
  aef7ae637f