15100 Commits

This Branch

This Branch

All Branches

• Trim whitespace
  Dan Balasescu · 2018-11-19 18:05:21 +09:00
  d9b8d2d15c
• Use the column width
  smoogipoo · 2018-11-19 18:02:01 +09:00
  d1cbaa9612
• Apply some simple fixes
  smoogipoo · 2018-11-19 17:59:52 +09:00
  52309465eb
• Merge remote-tracking branch 'upstream/master' into note-placement
  Dean Herbert · 2018-11-14 18:29:31 +09:00
  4dec2d1db0
• Merge pull request #3708 from smoogipoo/add-mania-selection-testcase

  Add mania selection blueprint testcases

  Dean Herbert · 2018-11-14 18:28:30 +09:00
  996e51db11
• Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase
  Dean Herbert · 2018-11-14 18:11:53 +09:00
  a83efe225e
• Merge pull request #3710 from smoogipoo/notepieces

  Separate note selection mask into a note piece

  Dean Herbert · 2018-11-14 18:11:07 +09:00
  9e24266934
• Merge branch 'master' into notepieces
  Dean Herbert · 2018-11-14 17:30:39 +09:00
  3fbabdfed2
• Merge pull request #3707 from smoogipoo/more-global-scrollalgo

  Move scroll algorithm to a more global location

  Dean Herbert · 2018-11-14 17:27:32 +09:00
  635c1bf833
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 17:15:24 +09:00
  a1dd1057ce
• Merge pull request #3694 from smoogipoo/fix-mania-selections

  Fix mania selection blueprint sizing

  Dean Herbert · 2018-11-14 16:59:26 +09:00
  4a28d66d2d
• Merge pull request #2371 from miterosan/Private_Messages

  Add framework for private messaging support

  Dan Balasescu · 2018-11-14 15:43:46 +09:00
  4fbad65e3d
• Implement interface
  smoogipoo · 2018-11-14 15:33:09 +09:00
  7274908059
• Merge branch 'master' into fix-mania-selections
  Dean Herbert · 2018-11-14 14:24:45 +09:00
  1b2924ea4a
• Merge remote-tracking branch 'upstream/master' into Private_Messages
  Dean Herbert · 2018-11-14 13:59:17 +09:00
  fb22fc11f6
• More refactors
  Dean Herbert · 2018-11-14 13:59:02 +09:00
  9a9d5e60af
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:54:53 +09:00
  2ae139d260
• Merge pull request #3709 from smoogipoo/scrollalgorithm-timeat

  Implement IScrollAlgorithm.TimeAt()

  Dean Herbert · 2018-11-14 13:50:48 +09:00
  5c66547c18
• Merge branch 'master' into scrollalgorithm-timeat
  Dean Herbert · 2018-11-14 13:32:16 +09:00
  34973a3e9f
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:32:14 +09:00
  8b190edde0
• Merge pull request #3706 from smoogipoo/no-drawable-speedchangevis

  Make scroll algorithms not tied to drawable hitobjects

  Dean Herbert · 2018-11-14 13:31:35 +09:00
  1b936dfc17
• Merge branch 'master' into no-drawable-speedchangevis
  Dean Herbert · 2018-11-14 13:22:01 +09:00
  8d59b7299f
• Refactors
  Dean Herbert · 2018-11-14 13:19:51 +09:00
  c4769f6802
• Merge branch 'master' into Private_Messages
  Dean Herbert · 2018-11-14 12:49:54 +09:00
  396a5b3cd0
• Merge pull request #3671 from gotopie/hide-seekbar-with-no-song

  Hide seekbar when no song is playing

  Dean Herbert · 2018-11-14 12:16:42 +09:00
  059f1d9bcb
• Fix brackets
  Dean Herbert · 2018-11-14 12:05:07 +09:00
  b9278b3488
• Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
  Dean Herbert · 2018-11-14 11:53:43 +09:00
  161d476091
• Merge conditionals
  Dean Herbert · 2018-11-14 11:53:34 +09:00
  c77412992e
• Merge branch 'master' into no-drawable-speedchangevis
  Dean Herbert · 2018-11-13 19:42:04 +09:00
  3caf0cb0d9
• Merge branch 'master' into fix-mania-selections
  Dean Herbert · 2018-11-13 18:33:53 +09:00
  da3c4bc050
• Merge pull request #3704 from smoogipoo/immutable-sliderpath

  Make SliderPath immutable

  Dean Herbert · 2018-11-13 18:27:36 +09:00
  7a918b06d9
• Merge branch 'master' into immutable-sliderpath
  Dean Herbert · 2018-11-13 18:06:14 +09:00
  e7d984415b
• Add support for creating new PM conversations
  Dean Herbert · 2018-11-13 17:24:11 +09:00
  72ae22b0c4
• Fix testcase
  Dean Herbert · 2018-11-13 15:36:36 +09:00
  82ebc74eee
• Add back support for new API and private messages
  Dean Herbert · 2018-11-13 15:20:59 +09:00
  f241fcdba1
• Snap placement blueprint to columns
  smoogipoo · 2018-11-13 14:13:29 +09:00
  25101ecd2c
• Merge branch 'master' into Private_Messages
  Dean Herbert · 2018-11-12 20:43:10 +09:00
  8b9f7f6691
• Merge remote-tracking branch 'upstream/master' into Private_Messages
  Dean Herbert · 2018-11-12 20:41:10 +09:00
  4b1282235a
• Merge pull request #3705 from peppy/update-framework

  Update framework and resources

  Dean Herbert · 2018-11-12 19:58:03 +09:00
  302196e985
• Add testcase
  smoogipoo · 2018-11-12 19:41:06 +09:00
  3d8ef97e81
• Fix placement not working correctly for downwards scroll
  smoogipoo · 2018-11-12 19:40:57 +09:00
  1403fa26cf
• Extract common methods into ManiaPlacementBlueprint
  smoogipoo · 2018-11-12 18:32:44 +09:00
  1d40a042f6
• Implement note placement
  smoogipoo · 2018-11-12 18:24:18 +09:00
  3a1fee59fb
• Merge branch 'notepieces' into note-placement
  smoogipoo · 2018-11-12 17:59:54 +09:00
  a0c75a0597
• Separate NoteSelectionBlueprint into a note piece
  smoogipoo · 2018-11-12 17:59:39 +09:00
  e302d5d005
• Merge branch 'more-global-scrollalgo' into note-placement
  smoogipoo · 2018-11-12 17:47:02 +09:00
  9e1b54f1ef
• Merge branch 'master' into update-framework
  Dan Balasescu · 2018-11-12 17:45:16 +09:00
  e885c03cfa
• Add IScrollAlgorithm.TimeAt()
  smoogipoo · 2018-11-12 17:43:22 +09:00
  b9b20607af
• Merge pull request #3684 from peppy/better-rider-ignore

  Change .idea ignore rules to not ignore run configurations

  Dean Herbert · 2018-11-12 17:41:31 +09:00
  27a794f1d5
• Add selection mask testcases

  # Conflicts:
  #	osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs

  smoogipoo · 2018-11-12 17:40:09 +09:00
  2e0e1befe9