22898 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into editor-timing-screen
  Dean Herbert · 2019-10-22 18:01:53 +09:00
  25601ac17c
• Integrate osu! distance snapping grid (#6539)

  Integrate osu! distance snapping grid
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-10-21 19:54:49 +09:00
  2019.1021.0 6b50d2194a
• Update incorrect reference
  Dean Herbert · 2019-10-21 19:25:56 +09:00
  0bf35faae8
• Merge branch 'master' into beatsnap-grid-integration
  Dean Herbert · 2019-10-21 18:44:34 +09:00
  e3fa5f1da3
• Merge pull request #6557 from smoogipoo/fix-hitcircle-selection-size

  Fix hitcircle selection area being too large

  Dean Herbert · 2019-10-21 18:43:48 +09:00
  ed8b8e3ad0
• Merge pull request #6560 from peppy/dho-ho-not-null

  Ensure DrawableHitObject's HitObject is not null

  Dan Balasescu · 2019-10-21 18:42:17 +09:00
  8210759039
• Fix failing test
  Dean Herbert · 2019-10-21 18:10:00 +09:00
  1bf5f9313f
• Ensure DrawableHitObject's HitObject is not null
  Dean Herbert · 2019-10-21 17:56:39 +09:00
  9f004186d5
• Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
  Dean Herbert · 2019-10-21 17:53:25 +09:00
  fa95422755
• Merge pull request #6558 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-10-21 17:52:10 +09:00
  b5997f2231
• Update framework
  Dean Herbert · 2019-10-21 17:24:32 +09:00
  c8f4e8b52c
• Fix hit circles selection area being too large
  smoogipoo · 2019-10-21 17:14:08 +09:00
  c34d3362df
• Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
  Dean Herbert · 2019-10-21 17:09:43 +09:00
  b157aaead1
• Rename HitObject -> DrawableObject in selection blueprints
  smoogipoo · 2019-10-21 17:04:56 +09:00
  38c2c328ff
• Merge pull request #6527 from smoogipoo/dho-apply

  Implement nested drawable hitobject reconstruction

  Dean Herbert · 2019-10-21 16:28:37 +09:00
  7967c73f03
• Merge branch 'master' into dho-apply
  Dean Herbert · 2019-10-21 16:05:11 +09:00
  11e5e0decc
• Merge pull request #6554 from smoogipoo/fix-selection-stack-position

  Fix selection blueprints not respecting stacking

  Dean Herbert · 2019-10-21 16:00:25 +09:00
  17132c3b80
• Fix selection blueprints not respecting stacking
  smoogipoo · 2019-10-21 15:03:49 +09:00
  96649e0a6a
• Split on multiple lines
  smoogipoo · 2019-10-21 14:08:28 +09:00
  fc7e4680a7
• Remove unnecessary schedule
  smoogipoo · 2019-10-21 14:01:52 +09:00
  74b6e691d8
• Add common path for duplicated code
  smoogipoo · 2019-10-21 13:52:55 +09:00
  dc222b5e4d
• Merge remote-tracking branch 'origin/master' into dho-apply
  smoogipoo · 2019-10-21 13:47:44 +09:00
  6afc27b1bd
• Merge pull request #6435 from HoLLy-HaCKeR/cursor-size-trail

  Fix cursor size trail scaling

  Dan Balasescu · 2019-10-21 13:46:05 +09:00
  50b674249b
• Merge branch 'master' into cursor-size-trail
  Dan Balasescu · 2019-10-21 13:26:13 +09:00
  c1c803caf4
• Merge pull request #6510 from miterosan/fix_incorrect_current_directory_android

  Fix incorrect current directory on Android

  Dan Balasescu · 2019-10-21 11:09:54 +09:00
  44d854cdc8
• Fix spelling error
  miterosan · 2019-10-20 22:29:29 +02:00
  6e32557be3
• Merge remote-tracking branch 'origin/master' into fix_incorrect_current_directory_android
  miterosan · 2019-10-20 21:12:05 +02:00
  fafbbeef82
• Revert "Load the rulesets lasily"

  This reverts commit 42d1379848.

  miterosan · 2019-10-20 21:11:16 +02:00
  aa910fb519
• Add control sections and hook up bindable control groups
  Dean Herbert · 2019-10-21 00:06:38 +09:00
  80bf68c108
• Split out more classes
  Dean Herbert · 2019-10-20 23:42:13 +09:00
  0fbba9a5e5
• Add missing required types
  Dean Herbert · 2019-10-20 23:32:49 +09:00
  7dc65ec964
• Use local bindable instead of using BindValueChanged of external one
  HoLLy · 2019-10-19 12:15:31 +02:00
  68837d47df
• Hide gameplay cursor when resume overlay is shown
  HoLLy · 2019-10-19 11:52:07 +02:00
  ca957f0994
• Merge branch 'master' into dho-apply
  Dean Herbert · 2019-10-18 19:45:10 +09:00
  d0eaf629af
• Merge pull request #6538 from peppy/fix-editor-clock-stopping

  Fix editor's clock not being processed unless composer is loaded

  Dan Balasescu · 2019-10-18 19:15:43 +09:00
  2f4f1c6d99
• Refresh the grid after a placement
  smoogipoo · 2019-10-18 19:04:08 +09:00
  190a83da6e
• Show placement grid from hitobjects at the current time
  smoogipoo · 2019-10-18 19:03:19 +09:00
  5dd5a070e0
• Fix editor's clock not being processed unless composer is loaded
  Dean Herbert · 2019-10-18 18:21:53 +09:00
  07286c0cfc
• Split out classes
  Dean Herbert · 2019-10-18 17:59:54 +09:00
  ffec960b77
• Add basic visualisation of different control point types
  Dean Herbert · 2019-10-18 17:57:37 +09:00
  71d45d41d1
• Fix potential nullref
  smoogipoo · 2019-10-18 17:56:31 +09:00
  31313ec9e1
• Merge pull request #6537 from smoogipoo/fix-hitcircle-accent

  Fix hitobject combo colour potentially not getting adjusted

  Dean Herbert · 2019-10-18 17:55:59 +09:00
  b391b8542d
• Fix hitobject combo colour potentially not getting adjusted
  smoogipoo · 2019-10-18 17:32:11 +09:00
  89f50b26f7
• Merge pull request #6536 from peppy/remove-weird-character

  Remove a weird unicode charcter from file

  Dan Balasescu · 2019-10-18 17:27:15 +09:00
  62f2a852ec
• Merge branch 'master' into editor-timing-screen
  Dean Herbert · 2019-10-18 16:57:46 +09:00
  f22ec6f5bd
• Remove a weird unicode charcter from file
  Dean Herbert · 2019-10-18 16:55:42 +09:00
  6b0976ff1e
• Merge pull request #6528 from smoogipoo/fix-mania-selection-movement

  Fix mania hitobject selections not moving correctly

  Dean Herbert · 2019-10-18 16:28:04 +09:00
  e3740fbc77
• Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid

  Implement osu!'s beat snapping grid

  Dean Herbert · 2019-10-18 16:27:03 +09:00
  99ea45da41
• Merge pull request #6534 from smoogipoo/placement-blueprint-starttime

  Make BeginPlacement() set the hitobject start time

  Dean Herbert · 2019-10-18 16:25:38 +09:00
  50d4a9d726
• Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration
  smoogipoo · 2019-10-18 13:49:09 +09:00
  f1d7e7e7f6