6229 Commits

This Branch

This Branch

All Branches

• 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
• Merge pull request #3 from ppy/master

  cool

  nyaamara · 2017-05-16 16:57:45 -04:00
  a3e93afb37
• Fix typo.
  nyaamara · 2017-05-16 16:54:33 -04:00
  b22c84287a
• Remove unused namespace.
  Huo Yaoyuan · 2017-05-16 22:20:05 +08:00
  e2a7f00a52
• Use generic IEqutable to avoid typeless Equals.
  Huo Yaoyuan · 2017-05-16 21:49:38 +08:00
  f1d5a92950
• Use generic IComparable for message.
  Huo Yaoyuan · 2017-05-16 21:46:22 +08:00
  aaaee5ed10
• Why AbandonedMutexException?
  Huo Yaoyuan · 2017-05-16 21:23:14 +08:00
  e911441394
• DateDisplay -> DateTimeDisplay for more exactly.
  Huo Yaoyuan · 2017-05-16 21:16:52 +08:00
  d929de466a
• Use DateTimeOffset.
  Huo Yaoyuan · 2017-05-16 21:14:50 +08:00
  d213706d07
• Use IsAssignableFrom.
  Huo Yaoyuan · 2017-05-16 21:04:54 +08:00
  b9a40a841b
• Merge pull request #767 from peppy/general-fixes

  Update framework

  Dean Herbert · 2017-05-16 21:42:56 +09:00
  v2017.516.0 8b6d0864f0
• Update API endpoint
  Dean Herbert · 2017-05-16 21:37:55 +09:00
  5a9745b492
• Update framework
  Dean Herbert · 2017-05-16 21:19:34 +09:00
  3d74492c95
• Merge pull request #766 from peppy/general-fixes

  Remove incorrect padding

  Dean Herbert · 2017-05-16 21:18:08 +09:00
  18b46dc0d4
• Merge branch 'master' into general-fixes
  Dan Balasescu · 2017-05-16 20:52:38 +09:00
  be3953aeb2
• Merge pull request #765 from peppy/fix-guest-user

  Fix guest user being null

  Dan Balasescu · 2017-05-16 20:52:25 +09:00
  14b06f3600
• Merge branch 'master' into fix-guest-user
  Dan Balasescu · 2017-05-16 20:46:28 +09:00
  a7df99c6d2
• Merge pull request #738 from smoogipooo/mania-timing-sections

  Mania timing sections

  Dean Herbert · 2017-05-16 20:17:20 +09:00
  1112dbb113
• Merge branch 'master' into mania-timing-sections
  Dean Herbert · 2017-05-16 20:12:26 +09:00
  85daddcf6f
• Fix typo
  Dean Herbert · 2017-05-16 20:08:22 +09:00
  041d4f93c0
• Remove incorrect padding
  Dean Herbert · 2017-05-16 19:58:34 +09:00
  fdf0137fc2
• Better handling of logged in state
  Dean Herbert · 2017-05-16 19:55:45 +09:00
  23807aa3b9
• Ensure LocalUser is never null
  Dean Herbert · 2017-05-16 19:49:50 +09:00
  2384f7b0c1
• Comments?
  smoogipooo · 2017-05-16 19:33:56 +09:00
  0eba553138
• InternalChildren -> Children.
  smoogipooo · 2017-05-16 19:26:46 +09:00
  bc629d193d
• Merge pull request #762 from peppy/player-fixes

  Player fixes

  Dan Balasescu · 2017-05-16 19:20:33 +09:00
  d1c198d9bf
• Add tween to time span changing.
  smoogipooo · 2017-05-16 19:14:27 +09:00
  9b0aed7c48
• Merge branch 'master' into player-fixes
  Dean Herbert · 2017-05-16 19:11:23 +09:00
  a209a738ea
• Merge pull request #759 from peppy/on-screen-display

  On-screen display

  Dean Herbert · 2017-05-16 19:10:45 +09:00
  5786efd379
• Merge branch 'master' into player-fixes
  Dan Balasescu · 2017-05-16 18:54:55 +09:00
  ca9c52ce38
• Merge branch 'master' into on-screen-display
  Dean Herbert · 2017-05-16 18:54:54 +09:00
  0c7ceea4fd
• Merge pull request #764 from peppy/fix-duplicate-channels

  Fix duplicate channels being created on connection loss

  Dean Herbert · 2017-05-16 18:54:35 +09:00
  3a12fbd581