912 Commits

• Merge branch 'master' into mod-overlay

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  #	osu.Game/Screens/Select/PlaySongSelect.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-02 20:27:04 +09:00
  471b9daa93
• Merge branch 'master' into DrabWeb/song-progress-graph

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  #	osu.Game/Overlays/Pause/PauseProgressBar.cs
  #	osu.Game/Overlays/Pause/PauseProgressGraph.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-02 20:20:27 +09:00
  435e845067
• Merge branch 'master' into master
  Dean Herbert · 2017-03-02 18:06:31 +09:00
  51950eef43
• Merge branch 'master' into popup-dialog
  Dean Herbert · 2017-03-02 16:42:20 +09:00
  ff5f0af2d3
• Fix audio disposal issues and share more code between visualtests.
  Dean Herbert · 2017-03-02 16:08:37 +09:00
  4bd85fe5cb
• 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
• 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 remote-tracking branch 'origin/master' into tournament_drawings
  smoogipooo · 2017-03-01 19:32:33 +09:00
  35d246b59d
• Testing build
  DrabWeb · 2017-02-28 17:09:31 -04:00
  d5d8352b62
• 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
• Added DialogManager(not wired up for desktop project yet)
  DrabWeb · 2017-02-28 00:59:36 -04:00
  50d172be39
• Merge remote-tracking branch 'upstream/master' into warning_fixes
  Dean Herbert · 2017-02-28 13:49:19 +09:00
  e60cead483
• Conform to naming conventions
  DrabWeb · 2017-02-27 20:55:10 -04:00
  b3a231185b
• Merge https://github.com/ppy/osu into popup-dialog
  DrabWeb · 2017-02-27 16:40:04 -04:00
  3094c01a40
• Removed unused variables and parameters
  Andrey Zavadskiy · 2017-02-27 17:32:32 +03:00
  3487dfe236
• Merge remote-tracking branch 'upstream/master'
  Alex Amadori · 2017-02-27 14:55:44 +01:00
  8b336156f0
• Update nuget packages.
  Dean Herbert · 2017-02-27 20:38:30 +09:00
  a22216d0b0
• Fix TestCaseGamefield.
  Dean Herbert · 2017-02-27 18:30:10 +09:00
  21c6f66017
• Initial groups implementation.
  smoogipooo · 2017-02-27 14:19:07 +09:00
  25a1c7a8ad
• New design
  DrabWeb · 2017-02-26 23:35:13 -04:00
  d78dca3d85
• Update usages of AddToggle in Tests
  default0 · 2017-02-26 21:31:40 +01:00
  1b92519a86
• Update with framework structural changes.
  Dean Herbert · 2017-02-26 20:54:32 +09:00
  686372a7f9
• Update framework
  Thomas Müller · 2017-02-26 11:22:58 +09:00
  1585ae842a
• Merge https://github.com/ppy/osu into popup-dialog
  DrabWeb · 2017-02-25 21:22:47 -04:00
  a009268370
• Merge remote-tracking branch 'upstream/master'
  Alex Amadori · 2017-02-24 16:54:37 +01:00
  51b6075210
• Merge with upstream/master
  Alex Amadori · 2017-02-24 16:54:27 +01:00
  e2ae03e798
• Visual and readability improvements to StarCounter.
  Dean Herbert · 2017-02-24 19:30:56 +09:00
  12db33ad4b
• Centralise access to WorkingBeatmaps.

  They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).

  Dean Herbert · 2017-02-24 13:43:21 +09:00
  3a89348413
• Added popup dialog
  DrabWeb · 2017-02-24 00:05:37 -04:00
  c94da4fcf0
• Merge remote-tracking branch 'upstream/master' into remove-usings
  Dean Herbert · 2017-02-24 11:29:34 +09:00
  c5552dfb27
• Update framework and add "Async" suffix to asynchronous methods
  Thomas Müller · 2017-02-23 22:32:10 +01:00
  2689de0c0c
• Remove unnecessary using statements
  Thomas Müller · 2017-02-23 21:38:10 +01:00
  a5dfa7ab06
• Merge branch 'master' into mod-overlay
  Seth · 2017-02-23 08:00:24 -04:00
  b4b88712ad
• Merge branch 'master' into general-fixes
  Dean Herbert · 2017-02-23 17:04:53 +09:00
  6701cd9016
• oops
  Dean Herbert · 2017-02-23 16:44:59 +09:00
  011d2cc7cc
• Framework updates.
  Dean Herbert · 2017-02-23 16:42:12 +09:00
  da2bfe6d3c
• Remove unused local variable.
  Dean Herbert · 2017-02-23 12:17:42 +09:00
  aec5fa9d72
• Update to work with latest framework
  DrabWeb · 2017-02-22 12:46:38 -04:00
  416772e96f
• Merge https://github.com/ppy/osu into mod-overlay
  DrabWeb · 2017-02-22 12:35:55 -04:00
  99f1f88c75
• Fix TestCasePlayer regression.
  Dean Herbert · 2017-02-22 23:27:29 +09:00
  d19a7813f3
• Add loading screen.
  Dean Herbert · 2017-02-22 21:53:59 +09:00
  aef0eb49a1
• Improved delegate syntax
  Alex Amadori · 2017-02-21 18:43:10 +01:00
  fbb16295ae
• Using random generator from osu-framework
  Alex Amadori · 2017-02-20 17:49:02 +01:00
  a6fbfc8349
• Stop TestCaseChatDisplay basically reimplementing ChatOverlay.
  Dean Herbert · 2017-02-19 17:06:51 +09:00
  2a099bb56c
• Complying with rule "Instance fields (private)"
  Alex Amadori · 2017-02-18 16:45:46 +01:00
  87ec0e36ea
• More sorting rookie mistakes
  Alex Amadori · 2017-02-18 16:23:13 +01:00
  21cf96ec10
• Fix silly sorting mistakes
  Alex Amadori · 2017-02-18 15:56:29 +01:00
  f48c83b787