5455 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into us
  Dean Herbert · 2017-06-13 15:46:53 +09:00
  178e2b716e
• Merge pull request #930 from EVAST9919/context_menu

  Context menu (osu-side)

  Dean Herbert · 2017-06-13 15:40:33 +09:00
  d6e042aec0
• Adjust appearance slightly
  Dean Herbert · 2017-06-13 15:27:47 +09:00
  700d6f9d38
• Move MenuItemType to correct namespace
  Dean Herbert · 2017-06-13 15:20:21 +09:00
  679786c76f
• Update framework
  Dean Herbert · 2017-06-13 14:01:56 +09:00
  cec9053f0b
• Update nuget packages

  - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820

  Dean Herbert · 2017-06-13 11:50:46 +09:00
  41d4aee4f5
• Forgot to add dropdown-like animation
  EVAST9919 · 2017-06-12 13:39:45 +03:00
  9f8c66b8c6
• CI fixes
  EVAST9919 · 2017-06-12 13:37:13 +03:00
  41eb084191
• Context Menu
  EVAST9919 · 2017-06-12 12:56:07 +03:00
  1711258038
• update framework
  EVAST9919 · 2017-06-12 12:55:58 +03:00
  6c71e8447c
• Merge pull request #927 from smoogipooo/general-fixes

  Update framework.

  Dean Herbert · 2017-06-12 13:02:36 +09:00
  8bd9c112ba
• Remove unused file.
  smoogipooo · 2017-06-12 12:57:34 +09:00
  157e0e569a
• Update in line with framework.
  smoogipooo · 2017-06-12 12:48:47 +09:00
  ffbb46f668
• Merge pull request #921 from smoogipooo/dynamic-vertex-attributes

  Dynamically determine vertex attributes (framework update)

  Dan Balasescu · 2017-06-10 17:31:58 +09:00
  df899d3de3
• Merge branch 'master' into dynamic-vertex-attributes

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-06-10 17:26:16 +09:00
  0521d4b761
• Merge pull request #922 from nairaner/unix-nuget-issue

  Fix unix nuget issue

  Dean Herbert · 2017-06-09 21:18:01 +09:00
  v2017.609.0 c8212e5d35
• Merge branch 'master' into unix-nuget-issue
  Dean Herbert · 2017-06-09 21:07:37 +09:00
  50e6bdf773
• Merge pull request #920 from peppy/raw-input-osd

  Add on-screen display support for RawInput and CursorSensitivity

  Dan Balasescu · 2017-06-09 21:06:49 +09:00
  c525784141
• Fix issue where nuget was only sometimes updating modules case-sensitive
  Krzysztof "Nairaner" Machura · 2017-06-09 12:03:18 +02:00
  e7a732068c
• Update framework
  Dean Herbert · 2017-06-08 21:30:37 +09:00
  3be4db2e83
• Fix some discrepancies when changing settings
  Dean Herbert · 2017-06-08 20:57:21 +09:00
  1b0e96f411
• Update framework
  Dean Herbert · 2017-06-08 20:41:19 +09:00
  72cbf76a48
• Merge remote-tracking branch 'upstream/master' into raw-input-osd
  Dean Herbert · 2017-06-08 20:41:04 +09:00
  83cdec3ee6
• Merge pull request #917 from johnneijzen/master

  More Clean Up

  Dean Herbert · 2017-06-08 20:39:53 +09:00
  6047bfc3ec
• Merge remote-tracking branch 'upstream/master' into johnneijzen-master
  Dean Herbert · 2017-06-08 20:33:39 +09:00
  a454ca606f
• Merge pull request #918 from peppy/update-framework

  Update framework

  Dean Herbert · 2017-06-08 20:24:40 +09:00
  b2b1c08432
• Merge branch 'master' into update-framework
  Dan Balasescu · 2017-06-08 19:55:21 +09:00
  ad3d6f8fb4
• Merge branch 'better-invalidations' into update-framework
  Dean Herbert · 2017-06-08 19:46:19 +09:00
  e3403c619c
• Add on-screen display support for RawInput and CursorSensitivity

  Also allows resetting both at once using Ctrl+Alt+R.
  
  - Depends on https://github.com/ppy/osu-framework/pull/807

  Dean Herbert · 2017-06-08 17:58:57 +09:00
  028364b2d9
• Merge remote-tracking branch 'origin/master' into dynamic-vertex-attributes
  smoogipooo · 2017-06-08 17:57:39 +09:00
  513ec4f05f
• Update with framework changes.
  smoogipooo · 2017-06-08 17:57:06 +09:00
  25ff4de39a
• Merge pull request #907 from Drezi126/osu-difficulty-refactor

  Refactor ppv2 to allow integration of pp+ features.

  Thomas Müller · 2017-06-08 10:27:06 +02:00
  067a5a2401
• Merge branch 'master' into osu-difficulty-refactor
  Thomas Müller · 2017-06-08 10:16:11 +02:00
  0438fd2058
• Update framework
  Dean Herbert · 2017-06-08 17:05:25 +09:00
  64682a741c
• Use new invalidation rules
  Tom94 · 2017-06-08 09:53:45 +02:00
  5f7270ee4b
• More Clean up
  John Neijzen · 2017-06-08 15:27:35 +08:00
  2f7d9655fd
• EOF remove blank spaces
  John Neijzen · 2017-06-08 14:56:03 +08:00
  d9a9616125
• Fix Black Space after } and Symbol Spacing
  John Neijzen · 2017-06-08 14:48:42 +08:00
  4abad17b92
• Keyword Spacing and Brackets Fixing
  John Neijzen · 2017-06-08 14:35:10 +08:00
  431d225a60
• Merge pull request #912 from johnneijzen/master

  Clean up

  Dean Herbert · 2017-06-08 14:26:03 +09:00
  8f909354bf
• Merge branch 'master' into master
  Dean Herbert · 2017-06-08 12:55:25 +09:00
  bf45155ed5
• Merge pull request #915 from tacchinotacchi/unix-fix

  Fix build error on unix

  Dean Herbert · 2017-06-08 12:12:30 +09:00
  bafd56b196
• Fix comment placement.
  Drezi126 · 2017-06-08 00:17:58 +02:00
  9d915a691d
• Merge branch 'master' into osu-difficulty-refactor
  Thomas Müller · 2017-06-07 20:43:48 +02:00
  286097d8bd
• Aaand docs again.
  Péter Nemes · 2017-06-07 20:29:03 +02:00
  a0bdab9f0d
• Fix build error on unix
  Alex Amadori · 2017-06-07 18:03:27 +02:00
  59e539f166
• Review Changes
  John Neijzen · 2017-06-07 22:00:14 +08:00
  aa3a231763
• Merge pull request #914 from DrabWeb/searchable-list-padding

  Add padding to the bottom of SearchableListOverlay's ScrollFlow

  Dean Herbert · 2017-06-07 22:36:15 +09:00
  2124ffab5a
• Add padding to the bottom of SearchableListOverlay's ScrollFlow
  DrabWeb · 2017-06-07 10:11:10 -03:00
  0b204bd157
• Merge pull request #913 from peppy/update-resources

  Fix resources getting rolled back

  Dan Balasescu · 2017-06-07 21:28:25 +09:00
  eb6a27e420