6229 Commits

This Branch

This Branch

All Branches

• Merge branch 'taiko_bash_base' into taiko_conversion
  smoogipooo · 2017-03-20 13:12:40 +09:00
  61172958bb
• Merge branch 'taiko_drumroll_base' into taiko_conversion
  smoogipooo · 2017-03-20 13:12:32 +09:00
  962acca096
• Merge remote-tracking branch 'origin/master' into taiko_conversion
  smoogipooo · 2017-03-20 13:12:09 +09:00
  8435840fc7
• Remove hit object types solution-wide.
  smoogipooo · 2017-03-20 13:10:24 +09:00
  090e8bbb79
• Remove Type.
  smoogipooo · 2017-03-20 13:04:09 +09:00
  b9006e4026
• Merge remote-tracking branch 'origin/master' into taiko_bash_base
  smoogipooo · 2017-03-20 13:03:25 +09:00
  c3d10f8abf
• Remove Type.
  smoogipooo · 2017-03-20 13:02:52 +09:00
  b3b8fadf03
• Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
  smoogipooo · 2017-03-20 13:01:43 +09:00
  7b7255863c
• Simplify fade out gradient code.
  Dean Herbert · 2017-03-19 21:49:29 +09:00
  09bf014ded
• Update framework.
  Dean Herbert · 2017-03-19 20:12:37 +09:00
  f785af1222
• Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
  Dean Herbert · 2017-03-19 18:51:53 +09:00
  5d0adc6454
• Inline single usage of EdgeEffect.
  Dean Herbert · 2017-03-19 18:51:40 +09:00
  256a3268ac
• Merge pull request #509 from peppy/fix-beatmap-options

  Fix beatmap options overlay inconsistencies

  Thomas Müller · 2017-03-19 09:37:59 +01:00
  139dd456fb
• Merge branch 'master' into fix-beatmap-options
  Thomas Müller · 2017-03-19 09:34:53 +01:00
  44f71b3975
• Merge pull request #508 from Tom94/hide-cursor

  Hide cursor

  Thomas Müller · 2017-03-19 09:28:55 +01:00
  36414e964a
• Merge branch 'master' into hide-cursor
  Thomas Müller · 2017-03-19 09:23:30 +01:00
  66cdc76621
• Update framework.
  Dean Herbert · 2017-03-19 17:22:47 +09:00
  034d818427
• Adjust sizing a touch.
  Dean Herbert · 2017-03-19 16:34:29 +09:00
  8cb334a118
• Merge pull request #500 from smoogipooo/explicit_expires

  Make DrawableHitObject expires explicit.

  Dean Herbert · 2017-03-19 12:47:43 +09:00
  af85bcaf1d
• Merge pull request #499 from smoogipooo/legacy_beatmap_flag

  Add legacy beatmap flag.

  Dean Herbert · 2017-03-19 12:39:41 +09:00
  6c12da54f1
• Formatting
  DrabWeb · 2017-03-19 00:14:23 -03:00
  5c645350f9
• Merge https://github.com/ppy/osu into leaderboards
  DrabWeb · 2017-03-19 00:10:08 -03:00
  4719817b45
• -IHasDrawableRepresentation, User.Region -> Country
  DrabWeb · 2017-03-19 00:09:58 -03:00
  b0e7296e25
• Merge pull request #498 from smoogipooo/taiko_hitobject_base

  Taiko hitobject base

  Dean Herbert · 2017-03-19 12:03:29 +09:00
  f237b5f1b8
• Remove unnecessary using.
  Dean Herbert · 2017-03-19 11:52:16 +09:00
  73ffbf8142
• Merge branch 'master' into taiko_hitobject_base
  Dean Herbert · 2017-03-19 11:37:39 +09:00
  7337cb5f62
• Fix test case not containing any buttons.
  Dean Herbert · 2017-03-19 02:33:28 +09:00
  af82a49127
• FIx transition not always being correct.
  Dean Herbert · 2017-03-19 02:33:25 +09:00
  3d8ec4fa05
• Fix mouse cursor in VisualTestGame.
  Dean Herbert · 2017-03-19 02:32:21 +09:00
  f56b84a1ca
• Fix cursor being displayed during disclaimer.
  Dean Herbert · 2017-03-19 01:59:13 +09:00
  3c7b4a8ffa
• fixed typo
  Jorolf · 2017-03-18 15:22:03 +01:00
  80de15d935
• Fix incorrect abs.
  Dean Herbert · 2017-03-18 22:37:50 +09:00
  8f75032b64
• Fix double-assignment.
  Dean Herbert · 2017-03-18 22:23:53 +09:00
  125936bad0
• Update framework.
  Dean Herbert · 2017-03-18 22:21:51 +09:00
  87622f9349
• Spend more when wound up.
  Dean Herbert · 2017-03-18 22:17:23 +09:00
  919ec2d3a5
• Move cursor hiding to OsuGameDesktop (fixes headless).
  Dean Herbert · 2017-03-18 21:46:58 +09:00
  6f07930110
• Nicer cursor orientation when dragging
  Thomas Müller · 2017-03-18 12:47:49 +01:00
  f636f59289
• Fix NaN when dragging music controller

  When dragging music controller we divide by the dragged distance.
  When dragging to the origin of the drag this resulted in NaN.
  Now, we check for this and use 0 in this case.

  Thomas Müller · 2017-03-18 12:46:12 +01:00
  9af0104e3e
• Update framework
  Thomas Müller · 2017-03-18 12:04:42 +01:00
  3649b432a1
• Add tests service reference
  Thomas Müller · 2017-03-18 12:00:44 +01:00
  341f36be5f
• Hide the OS cursor in OsuGameBase
  Thomas Müller · 2017-03-18 12:00:31 +01:00
  3ee2b68215
• Remove TaikoHitObject Type, we won't be using this going forward.
  smoogipooo · 2017-03-18 18:40:26 +09:00
  4b3308fd1d
• What even was this lol.
  smoogipooo · 2017-03-18 18:38:51 +09:00
  b68b017a49
• Resharper.
  smoogipooo · 2017-03-18 18:37:48 +09:00
  f4f5715906
• Fix post-merge errors.
  smoogipooo · 2017-03-18 18:34:45 +09:00
  77bdfe880a
• Merge branch 'legacy_beatmap_flag' into taiko_conversion

  Conflicts:
  	osu.Game/Beatmaps/Legacy/IIsLegacy.cs

  smoogipooo · 2017-03-18 18:34:00 +09:00
  aa565274de
• Remove IIsLegacy, expose LegacyBeatmap without a public constructor.
  smoogipooo · 2017-03-18 18:32:54 +09:00
  26b0bb02d8
• Use Colour for non-faded scores
  DrabWeb · 2017-03-18 01:56:19 -03:00
  0bc8ed9c9e
• Parenthesis
  DrabWeb · 2017-03-18 01:48:29 -03:00
  e78069af12
• Only calculate fade for fading leaderboard scores
  DrabWeb · 2017-03-18 01:44:05 -03:00
  b9d5ab5d8c