61410 Commits

This Branch

This Branch

All Branches

• Fix having negative beat when it should be 0
  Javier Flores · 2017-05-17 09:23:04 -05:00
  f4c7a02a6f
• Update framework
  Dean Herbert · 2017-05-17 23:21:23 +09:00
  d1f85c3f8e
• Merge branch 'master' into song-select-selection-fixes
  Dean Herbert · 2017-05-17 23:17:10 +09:00
  25f217505e
• Merge pull request #780 from peppy/bad-bad-ratio-container

  Fix ratio container being added to a level too high

  Dean Herbert · 2017-05-17 23:16:58 +09:00
  bab8997b43
• CI fixes
  EVAST9919 · 2017-05-17 17:14:09 +03:00
  a21343da23
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-17 17:14:00 +03:00
  eec813ad65
• Merge branch 'master' into bad-bad-ratio-container
  Dean Herbert · 2017-05-17 23:01:56 +09:00
  1278d9c53d
• Merge pull request #784 from peppy/general-fixes

  Fix CI warning

  Dean Herbert · 2017-05-17 22:57:01 +09:00
  3fd9edfcde
• fixed license header
  EVAST9919 · 2017-05-17 16:54:49 +03:00
  60ed7a2372
• Fix CI warning
  Dean Herbert · 2017-05-17 22:13:56 +09:00
  d606b5b3a7
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-17 16:12:38 +03:00
  e785f1ddf1
• Added bindable to adjust playback speed
  EVAST9919 · 2017-05-17 16:10:49 +03:00
  1e029d05a8
• Merge pull request #774 from peppy/fix-chat-after-disconnect

  Fix channels being unnecessarily recycled on disconnect

  Dan Balasescu · 2017-05-17 22:02:25 +09:00
  8bcbc2cc26
• Move all pause logic into PauseContainer
  Dean Herbert · 2017-05-17 21:57:01 +09:00
  41c252760d
• Visible only in replay
  EVAST9919 · 2017-05-17 15:54:12 +03:00
  0867ef814c
• More overlays and overall fixes
  EVAST9919 · 2017-05-17 15:39:26 +03:00
  e0625a9b30
• Moved collectionsDropdown to it's own class
  EVAST9919 · 2017-05-17 15:32:16 +03:00
  fd2150aa49
• Add (almost finished) basis of slider hit object conversion...
  smoogipooo · 2017-05-17 20:47:02 +09:00
  b52ec11260
• Add base for event parsing code.
  smoogipooo · 2017-05-17 20:46:23 +09:00
  74c23ff6d8
• Fix and simplifty pause logic

  Resolves #770

  Dean Herbert · 2017-05-17 20:11:41 +09:00
  88a70e407c
• Handle possible nulls.
  Huo Yaoyuan · 2017-05-17 18:11:38 +08:00
  6c9505fa3a
• Use generic IComparable together with IEqutable for Message.
  Huo Yaoyuan · 2017-05-17 18:02:17 +08:00
  b9b45493e6
• Fix ratio container being added to a level too high

  That's a bad ratio container! How did we not notice this until now?

  Dean Herbert · 2017-05-17 18:49:30 +09:00
  cba7796777
• Added osu!direct header and filter control
  DrabWeb · 2017-05-17 05:58:34 -03:00
  9ba356f2c6
• Merge branch 'master' into fix-chat-after-disconnect
  Dan Balasescu · 2017-05-17 17:51:35 +09:00
  b21be8f3f5
• Fix song select reverting to first difficulty of current group on entering
  Dean Herbert · 2017-05-17 17:33:20 +09:00
  7bb38e927b
• Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed
  Dean Herbert · 2017-05-17 17:33:16 +09:00
  cab12ee55a
• ingame options basic logic
  EVAST9919 · 2017-05-17 10:36:57 +03:00
  1a4025ab3c
• Moved music controller buttons to it's own class
  EVAST9919 · 2017-05-17 10:36:24 +03:00
  5fb8830e3a
• More CI fixes
  ColdVolcano · 2017-05-17 01:37:31 -05:00
  198542465b
• CI Fixes
  ColdVolcano · 2017-05-17 01:26:34 -05:00
  387d26a576
• Add missing licence header
  ColdVolcano · 2017-05-17 01:18:56 -05:00
  5f192cae7b
• Add a base container with beat syncing logic
  ColdVolcano · 2017-05-17 01:14:04 -05:00
  0801a211da
• Merge pull request #776 from peppy/fix-duplicate-messages

  Revert "Use generic IComparable for message."

  Dan Balasescu · 2017-05-17 13:51:13 +09:00
  12716d2ab4
• Revert "Use generic IComparable for message."

  This reverts commit aaaee5ed10.

  Dean Herbert · 2017-05-17 13:44:43 +09:00
  78c1d4581f
• Fix hold notes + make it compile again.
  smoogipooo · 2017-05-17 13:20:33 +09:00
  2f8556a44a
• Remove while statement (came from fastrandom...).
  smoogipooo · 2017-05-17 13:14:42 +09:00
  4d9aea6aec
• Merge branch 'fast-random' into mania-beatmap-conversion
  smoogipooo · 2017-05-17 13:13:00 +09:00
  06da689ff9
• Remove redundant parentheses.
  smoogipooo · 2017-05-17 13:11:17 +09:00
  c5d823d7d9
• Fix hold notes - remove glow for now.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
  #	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs

  smoogipooo · 2017-05-17 13:09:49 +09:00
  9565bb9572
• Add hold note conversion.
  smoogipooo · 2017-05-17 13:09:07 +09:00
  17466a662c
• Fix generation.
  smoogipooo · 2017-05-17 13:08:59 +09:00
  fdd98e23bd
• Add basic mania-specific beatmap conversion.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

  smoogipooo · 2017-05-17 13:07:56 +09:00
  1ded043778
• Remove redundant parentheses.
  smoogipooo · 2017-05-17 13:04:57 +09:00
  51f7904c13
• Merge branch 'master' into fast-random
  Dean Herbert · 2017-05-17 12:55:35 +09:00
  9b1363184b
• Add FastRandom class for use in beatmap conversion.
  smoogipooo · 2017-05-17 12:52:07 +09:00
  93e2b21084
• Fix channels being unnecessarily recycled on disconnect

  Resolves #768

  Dean Herbert · 2017-05-17 12:42:02 +09:00
  231f7939a6
• Merge pull request #769 from huoyaoyuan/tidy-up

  Tidy up

  Dean Herbert · 2017-05-17 09:29:05 +09:00
  c78f4cc7ab
• Merge branch 'master' into tidy-up
  Dean Herbert · 2017-05-17 09:24:11 +09:00
  12cb530358
• Merge pull request #771 from nyaamara/master

  Fix typo

  Dean Herbert · 2017-05-17 07:59:46 +09:00
  4f1c32a491