238 Commits

• 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
• Testing build
  DrabWeb · 2017-02-28 17:09:31 -04:00
  d5d8352b62
• 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
• 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 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
• 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
• Merge remote-tracking branch 'upstream/master'
  Alex Amadori · 2017-02-18 15:18:26 +01:00
  d92382c1aa
• Implemented sorting in TestCasePlaySong
  Alex Amadori · 2017-02-18 15:11:40 +01:00
  6bbbbd8f96
• Fix backgrounds in TestCasePlayer dimming to gray instead of black.
  Dean Herbert · 2017-02-18 15:54:26 +09:00
  cf8b6c0697
• GameMode -> Screen.
  Dean Herbert · 2017-02-17 19:23:58 +09:00
  e6ef9f67aa
• Add the concept of nested DrawableHitObjects.

  - Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
  - Removed SliderTicksLayer abstraction for now.

  Dean Herbert · 2017-02-16 17:02:36 +09:00
  8bf3902cbd
• Add a TickDistance to TestCaseHitObjects.
  Dean Herbert · 2017-02-16 13:20:40 +09:00
  c90f5e247d
• Add spinners and improve TestCaseHitObjects.
  Dean Herbert · 2017-02-15 01:23:20 +09:00
  10dfe47638
• Add/update license headers.
  Dean Herbert · 2017-02-14 18:17:35 +09:00
  f207da6041
• Add background layer to VisualTestGame.
  Dean Herbert · 2017-02-14 18:09:46 +09:00
  ce29f0b0be
• Update framework.
  Thomas Müller · 2017-02-13 17:46:50 +09:00
  aaaf7163e0
• Merge remote-tracking branch 'upstream/master' into installer-updater
  Dean Herbert · 2017-02-12 17:18:04 +09:00
  874af48de6
• add explicit false values to prevent warnings as errors
  John Leuenhagen · 2017-02-12 02:32:11 -05:00
  7ad9cd6b6e