2012 Commits

This Branch

This Branch

All Branches

• Fix Toolbar's mode changer not working correctly.
  Dean Herbert · 2017-03-02 22:01:24 +09:00
  ef8a35f5cc
• Update version number generation slightly.
  Dean Herbert · 2017-03-02 20:08:01 +09:00
  v2017.302.1 d74a601180
• Merge pull request #368 from tacchinotacchi/master

  Added basic sorting functionality

  Dean Herbert · 2017-03-02 18:46:34 +09:00
  v2017.302.0 35c920d04b
• Fix some license headers.
  Dean Herbert · 2017-03-02 18:45:20 +09:00
  4163569e57
• Fix potential nullref caused by test data.
  Dean Herbert · 2017-03-02 18:35:24 +09:00
  68a359698d
• Merge branch 'master' into master
  Dean Herbert · 2017-03-02 18:06:31 +09:00
  51950eef43
• Merge pull request #409 from DrabWeb/popup-dialog

  Popup dialog

  Dean Herbert · 2017-03-02 18:01:41 +09:00
  ffd65606be
• Fix incorrect event order.
  Dean Herbert · 2017-03-02 17:41:33 +09:00
  963117f07d
• More code tidying.
  Dean Herbert · 2017-03-02 17:14:05 +09:00
  68857b573d
• Tidy up code.

  The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.

  Dean Herbert · 2017-03-02 17:08:00 +09:00
  c4871bbbf3
• Post-merge fixes.
  Dean Herbert · 2017-03-02 16:54:55 +09:00
  d1cd077e0d
• Merge branch 'master' into popup-dialog
  Dean Herbert · 2017-03-02 16:42:20 +09:00
  ff5f0af2d3
• Merge pull request #404 from default0/flowcontainer-refactor

  Flowcontainer refactor

  Dean Herbert · 2017-03-02 16:42:03 +09:00
  66cea49ba6
• Remove references to PassThrough.
  Dean Herbert · 2017-03-02 16:28:51 +09:00
  c4ca18eeba
• Update framework.
  Dean Herbert · 2017-03-02 16:27:49 +09:00
  0bd3138887
• Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
  DrabWeb · 2017-03-01 18:41:00 -04:00
  befdf68abe
• FlowDirection -> FillDirection
  Thomas Müller · 2017-03-01 20:15:38 +01:00
  4d28696479
• Update framewörk
  Thomas Müller · 2017-03-01 19:33:01 +01:00
  9c853b0465
• Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

  # Conflicts:
  #	osu-framework
  #	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

  Thomas Müller · 2017-03-01 18:05:58 +01:00
  d46e68b36b
• Merge pull request #414 from EVAST9919/input_overlay

  KeyCounter visibility

  Dean Herbert · 2017-03-01 21:50:13 +09:00
  b3a411d8c3
• Triggering fix
  Andrey Zavadskiy · 2017-03-01 13:36:53 +03:00
  a6504e8f22
• KeyCounter visibility
  Andrey Zavadskiy · 2017-03-01 13:22:01 +03:00
  cc92459ee1
• Merge pull request #408 from Jorolf/pluginManager

  Disable mousewheel while playing

  Dean Herbert · 2017-03-01 13:10:47 +09:00
  327300e9a7
• Merge pull request #410 from peppy/general-fixes

  Add exponential fall-off of triangles' alpha values.

  Dean Herbert · 2017-03-01 13:08:04 +09:00
  5bd18ce629
• Fix CI?
  Dean Herbert · 2017-03-01 13:03:33 +09:00
  22c46ec9fb
• Update framework.
  Dean Herbert · 2017-03-01 11:56:26 +09:00
  ec83da2845
• Fix regression in TrianglesPiece.
  Dean Herbert · 2017-03-01 11:56:14 +09:00
  f0e9ed4636
• Testing build
  DrabWeb · 2017-02-28 17:09:31 -04:00
  d5d8352b62
• Merge branch 'master' into pluginManager
  Jorolf · 2017-02-28 20:34:56 +01:00
  61cbcfd597
• Merge branch 'master' into general-fixes
  Thomas Müller · 2017-02-28 19:02:07 +01:00
  e462ec46c3
• Improve naming and correctness of triangles fading
  Thomas Müller · 2017-02-28 19:01:02 +01:00
  585d42f89f
• Moved Bindable init
  Jorolf · 2017-02-28 11:44:12 +01:00
  522034020e
• DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
  DrabWeb · 2017-02-28 02:09:36 -04:00
  ce1798b8bc
• Merge pull request #406 from EVAST9919/warning_fixes

  Warning fixes

  Dean Herbert · 2017-02-28 14:03:29 +09:00
  6ce0b7c83a
• Added DialogManager(not wired up for desktop project yet)
  DrabWeb · 2017-02-28 00:59:36 -04:00
  50d172be39
• Restore potentially breaking change.
  Dean Herbert · 2017-02-28 13:56:35 +09:00
  654859a2a1
• Merge remote-tracking branch 'upstream/master' into warning_fixes
  Dean Herbert · 2017-02-28 13:49:19 +09:00
  e60cead483
• Merge pull request #411 from huoyaoyuan/vs2017

  EditorConfig naming style settings for vs2017.

  Dean Herbert · 2017-02-28 13:45:25 +09:00
  98cd0d0733
• EditorConfig naming style settings for vs2017.
  Huo Yaoyuan · 2017-02-28 11:37:08 +08:00
  3208b3d8b4
• Added beatmap delete dialog
  DrabWeb · 2017-02-27 23:19:28 -04:00
  fbd9523596
• Remove uneccesary cast, move enter OK button to one liner
  DrabWeb · 2017-02-27 22:38:44 -04:00
  bc7fd3bd39
• Forgot returns
  DrabWeb · 2017-02-27 22:32:30 -04:00
  94f34b985b
• Enter key presses first OK button, 1-9 presses button at number
  DrabWeb · 2017-02-27 22:31:23 -04:00
  0ce8fff666
• Add exponential fall-off of triangles' alpha values.
  Dean Herbert · 2017-02-28 11:28:25 +09:00
  aa9582c0fa
• Remove new override in DialogButton
  DrabWeb · 2017-02-27 21:38:25 -04:00
  e8cae3b45e
• Remove SpaceTextOnHover
  DrabWeb · 2017-02-27 21:30:10 -04:00
  164f205ee5
• Conform to naming conventions
  DrabWeb · 2017-02-27 20:55:10 -04:00
  b3a231185b
• Removed background triangles
  DrabWeb · 2017-02-27 20:44:27 -04:00
  34ba3129a3
• Disable mousewheel while playing
  Jorolf · 2017-02-28 00:08:34 +01:00
  8b3477820f
• Merge pull request #405 from peppy/fix-db-deletion

  Actually delete all related database entries, not just the set.

  Dean Herbert · 2017-02-28 07:05:18 +09:00
  v2017.228.0 2e84188be7