268 Commits

• Fix most warnings.
  Dean Herbert · 2017-03-07 13:05:57 +09:00
  0cad5d7d41
• Remove unnecessary usings
  Thomas Müller · 2017-03-04 19:43:59 +01:00
  73fef85b12
• Use Color4Extensions from Framework and remove redundant Name
  Thomas Müller · 2017-03-04 19:42:37 +01:00
  a14bdf8624
• Merge pull request #385 from DrabWeb/mod-overlay

  Mod select

  Dean Herbert · 2017-03-03 21:09:08 +09:00
  6f3b59268a
• Merge branch 'master' into tournament_drawings
  Dean Herbert · 2017-03-03 20:48:07 +09:00
  dc6a728cce
• Move around some namespaces.
  Dean Herbert · 2017-03-03 20:42:22 +09:00
  bc01935a89
• Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.
  Dean Herbert · 2017-03-03 20:21:11 +09:00
  4a109fcc55
• Add missing acronyms in TestCaseDrawings.
  Dean Herbert · 2017-03-03 20:07:36 +09:00
  9789d1e602
• Better way to initialize team lists.
  smoogipooo · 2017-03-03 18:47:56 +09:00
  5a4d07d770
• Merge branch 'master' into mod-overlay
  Seth · 2017-03-03 04:12:42 -04:00
  fde509ab1d
• Make test case add test drawings file.
  smoogipooo · 2017-03-03 16:33:40 +09:00
  7cac2680b1
• Remove full-screen background layer and add half-height holder.

  Doesn't interact well with dialog popups. May add back later with complementing logic.

  Dean Herbert · 2017-03-03 16:11:23 +09:00
  b0ee728528
• Merge branch 'master' into mod-overlay
  Seth · 2017-03-03 01:11:15 -04:00
  1891bdf51e
• Merge branch 'master' into beatmap-options
  Seth · 2017-03-03 00:52:45 -04:00
  2e74b4be60
• Merge branch 'master' into tournament_drawings
  Dan Balasescu · 2017-03-03 13:06:18 +09:00
  09a2d39e3e
• Fixed visual test
  DrabWeb · 2017-03-02 21:24:34 -04:00
  b4091eff30
• Move PauseOverlay to correct namespace.
  Dean Herbert · 2017-03-03 10:17:39 +09:00
  3a8246f56d
• Implemented beatmap options overlay
  DrabWeb · 2017-03-02 08:40:55 -04:00
  b856fb5991
• Use bindable for PlayMode.
  Dean Herbert · 2017-03-02 21:16:58 +09:00
  e399d6c6d1
• 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 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
• 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 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