161 Commits

• Implemented beatmap options overlay
  DrabWeb · 2017-03-02 08:40:55 -04:00
  b856fb5991
• 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
• 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
• 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 https://github.com/ppy/osu into popup-dialog
  DrabWeb · 2017-02-27 16:40:04 -04:00
  3094c01a40
• Update nuget packages.
  Dean Herbert · 2017-02-27 20:38:30 +09:00
  a22216d0b0
• Initial groups implementation.
  smoogipooo · 2017-02-27 14:19:07 +09:00
  25a1c7a8ad
• Added popup dialog
  DrabWeb · 2017-02-24 00:05:37 -04:00
  c94da4fcf0
• ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
  DrabWeb · 2017-02-18 07:28:22 -04:00
  006fb5502d
• ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
  DrabWeb · 2017-02-16 18:32:27 -04:00
  9fc3726925
• Added mod selection overlay
  DrabWeb · 2017-02-16 16:05:03 -04:00
  0a58fc62db
• add explicit false values to prevent warnings as errors
  John Leuenhagen · 2017-02-12 02:32:11 -05:00
  7ad9cd6b6e
• Merge remote-tracking branch 'upstream/master' into desktop-unit-tests
  Dean Herbert · 2017-02-10 17:22:38 +09:00
  e23202c449
• Implement notifications.
  Dean Herbert · 2017-02-10 16:30:23 +09:00
  8ec927899f
• Add desktop unit tests project.
  Dean Herbert · 2017-02-09 19:24:53 +09:00
  e0b7517535
• Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class
  DrabWeb · 2017-02-08 16:22:31 -04:00
  50f93bc215
• Added back current work
  DrabWeb · 2017-02-03 15:22:02 -04:00
  0d8815bd37
• Merge branch 'master' into skip-button

  # Conflicts:
  #	osu.Game/Graphics/UserInterface/BackButton.cs
  #	osu.Game/Screens/Play/Player.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-02-01 14:05:58 +09:00
  7ce5fc08ee
• TwoLayerButton
  Dean Herbert · 2017-01-27 21:08:36 +09:00
  420e61fa97
• Small cleanups
  DrabWeb · 2017-01-27 05:39:15 -04:00
  dedd6a4bcf
• Fix incorrect folder name.
  Dean Herbert · 2016-12-08 21:36:34 +09:00
  40ea6e0d72
• Move play modes to their own projects.
  Dean Herbert · 2016-11-14 18:54:24 +09:00
  4590be552f
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-05 16:21:59 +08:00
  2d86cb1e81
• Fix OpenTK reference in osu.Desktop.VisualTests
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  55821a1a2b
• Implement General options section
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  9f78f8607b
• Create MusicController UI class and visual test.
  Huo Yaoyuan · 2016-10-27 13:34:43 +08:00
  e1f6ab1a42
• Merge branch 'master' into song-select
  Drew DeVault · 2016-10-26 10:37:18 -04:00
  157512b45f
• Fix incorrect framework specification for VisualTests.
  Dean Herbert · 2016-10-26 19:11:17 +09:00
  faca23163c
• Add missing reference.
  Dean Herbert · 2016-10-26 10:18:08 +09:00
  7ca5bf951c
• Fix up sqlite
  Drew DeVault · 2016-10-25 19:39:09 -04:00
  ddfa457ad3
• Introduce TestStorage
  Drew DeVault · 2016-10-25 10:44:43 -04:00
  d986d66c2f
• Fix up JSON reference
  Drew DeVault · 2016-10-24 15:02:13 -04:00
  cea660dce5
• Add test data to db for VisualTests

  Also fixes the broken IPC condition

  Drew DeVault · 2016-10-24 14:57:00 -04:00
  063fdd9a2d
• Add test case for song selection
  Drew DeVault · 2016-10-24 11:39:18 -04:00
  bc6e705e2b
• Update nuget package versions.
  Dean Herbert · 2016-10-24 22:46:44 +09:00
  1ce16afa23
• Make the Player class more friendly and add a test case.
  Dean Herbert · 2016-10-19 18:00:35 +09:00
  a1d961dc87
• Add initial implementation of osu! HitCircle.
  Dean Herbert · 2016-10-19 16:19:01 +09:00
  94968a8b7c
• Add score counter test again
  Adonais Romero González · 2016-10-13 17:33:26 -05:00
  c48e3a74f8
• Revert all counter commits. Requires much further review.
  Dean Herbert · 2016-10-13 14:45:41 +09:00
  5e3e949fd6
• Merge branch 'master' into counters
  Adonais Romero González · 2016-10-08 22:02:43 -05:00
  37115c8c9f
• Never Prefer32bit.
  Dean Herbert · 2016-10-08 15:54:04 +09:00
  656aee41e2
• Remove "Deploy" configuration.
  Dean Herbert · 2016-10-08 15:54:03 +09:00
  4f2bb25853
• Rolling counters (initial)
  Adonais Romero González · 2016-10-07 02:05:02 -05:00
  00cfc51004
• Merge branch 'refs/heads/master' into api-channels-messages

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

  Dean Herbert · 2016-10-01 17:05:56 +09:00
  b110a879a7
• Merge remote-tracking branch 'upstream/master' into beatmap_framework
  Dean Herbert · 2016-09-30 00:13:08 +09:00
  643ae0cefe