61410 Commits

This Branch

This Branch

All Branches

• 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
• Document private method getBeatmapSet(path)
  Mikal Stodal · 2017-03-01 17:57:57 +01:00
  418ae24fea
• Only set StoryBoardFile once
  Mikal Stodal · 2017-03-01 17:08:12 +01:00
  1e901a1604
• Merge remote-tracking branch 'refs/remotes/ppy/master' into moarOptions
  Jorolf · 2017-03-01 16:06:12 +01:00
  08e96c2460
• wankoz
  Dean Herbert · 2017-03-01 22:56:20 +09:00
  b6e7e054c3
• Basic partial replay support.
  Dean Herbert · 2017-03-01 22:04:20 +09:00
  58ae9e888d
• 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
• Merge remote-tracking branch 'origin/master' into tournament_drawings
  smoogipooo · 2017-03-01 19:32:33 +09:00
  35d246b59d
• 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
• Only delete on successful import.
  Mikal Stodal · 2017-02-28 14:46:16 +01:00
  eff66a1da6
• Update tests
  Mikal Stodal · 2017-02-28 14:36:11 +01:00
  7e72911d3a
• Delete file after importing BeatmapSet w/error handling,

  also changed batch-commit of multiple sets to database.

  Mikal Stodal · 2017-02-28 14:35:42 +01:00
  d54a75a5c5
• Moved Bindable init
  Jorolf · 2017-02-28 11:44:12 +01:00
  522034020e
• Updated to work with latest framework
  DrabWeb · 2017-02-28 02:25:38 -04:00
  c3a81127f2
• Merge https://github.com/ppy/osu into mod-overlay
  DrabWeb · 2017-02-28 02:22:59 -04:00
  570c95cb98
• 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
• Add background.
  smoogipooo · 2017-02-28 10:26:37 +09:00
  1e15318da6
• 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
• Update to work with latest framework
  DrabWeb · 2017-02-27 16:41:45 -04:00
  64d036fe81
• Merge https://github.com/ppy/osu into popup-dialog
  DrabWeb · 2017-02-27 16:40:04 -04:00
  3094c01a40
• Merge branch 'master' into fix-db-deletion
  Thomas Müller · 2017-02-27 20:59:52 +01:00
  f96144f234
• Merge pull request #402 from peppy/welded-bindables

  Welded bindable updates & nuget updates

  Thomas Müller · 2017-02-27 20:59:33 +01:00
  6d8b4cd31e
• Update References to FlowStrategies

  References now use the Create*-names instead of the outdated
  Get*-names to create instances of FlowStrategies.

  default0 · 2017-02-27 16:55:55 +01:00
  03889e6ca6