112 Commits

• Remove unnecessary extra property
  smoogipoo · 2019-06-25 18:38:14 +09:00
  aa81c95f30
• Move back button to OsuGame
  smoogipoo · 2019-06-25 18:33:08 +09:00
  8c96e4c1fa
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2019-06-19 14:55:34 +09:00
  dd926f55bd
• Fix startup crash if main menu does not load fast enough
  Dean Herbert · 2019-06-19 13:16:19 +09:00
  f26fe53feb
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2019-05-18 19:20:44 +09:00
  e93fea7dc3
• Fix crash on switching from main menu to gameplay too fast
  Dean Herbert · 2019-05-15 19:39:36 +09:00
  958598d13b
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2019-05-15 12:08:23 +09:00
  7b56180b8b
• Centralise caching of components at OsuGame level
  Dean Herbert · 2019-05-13 17:10:25 +09:00
  4b508915f6
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2019-04-03 16:23:33 +09:00
  1ef2a4c46f
• Apply more missed cases
  Dean Herbert · 2019-04-01 12:44:46 +09:00
  c39c37a18d
• Preload main menu background
  Dean Herbert · 2019-03-12 00:04:19 +09:00
  81d9e391f4
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2019-03-02 13:13:51 +09:00
  796f6c3092
• Move MainMenu initialisation from ctor to load
  Shane Woolcock · 2019-02-26 09:54:42 +09:00
  e91c07209f
• Merge branch 'master' into hide-exit-button

  # Conflicts:
  #	osu.Game/Screens/Menu/MainMenu.cs

  Shane Woolcock · 2019-02-25 21:48:42 +09:00
  bebb635ca1
• Fix some weird formatting
  Dean Herbert · 2019-02-25 19:19:28 +09:00
  a4e119786f
• Conditionally add ExitConfirmOverlay and disable back action
  Shane Woolcock · 2019-02-25 10:43:47 +09:00
  61be4f2695
• Adjust namespaces
  smoogipoo · 2019-02-21 19:05:52 +09:00
  d8c55bc729
• Update with framework bindable changes
  smoogipoo · 2019-02-21 18:56:34 +09:00
  bca347427f
• Merge branch 'master' into tournament-tools

  # Conflicts:
  #	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
  #	osu.Game/OsuGameBase.cs
  #	osu.Game/Overlays/ChatOverlay.cs
  #	osu.Game/Screens/Menu/MainMenu.cs
  #	osu.Game/Screens/Tournament/Drawings.cs
  #	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
  #	osu.Game/osu.Game.csproj
  #	osu.sln

  Dean Herbert · 2019-02-02 19:09:48 +09:00
  482a01e7ba
• Merge remote-tracking branch 'origin/master' into iscreen

  # Conflicts:
  #	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
  #	osu.Game/Screens/Multi/Multiplayer.cs
  #	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
  #	osu.Game/Screens/OsuScreen.cs
  #	osu.Game/osu.Game.csproj
  #	osu.sln

  smoogipoo · 2019-01-29 21:21:36 +09:00
  91302ea0bc
• Move toolbar showing and overlay activation to OsuGame

  Now exposed through IOsuScreen.

  smoogipoo · 2019-01-28 15:42:06 +09:00
  7b1c1f3728
• Convert everything to use IScreen
  smoogipoo · 2019-01-24 19:47:44 +09:00
  8ea7ec6445
• Update licence header (and remove year)
  Dean Herbert · 2019-01-24 17:43:03 +09:00
  8617aaa2a7
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-12-01 10:03:31 +09:00
  03e416cda9
• Only allow replay screen changes in menu + songselect
  smoogipoo · 2018-11-30 18:25:54 +09:00
  d07a724970
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-22 10:25:30 +09:00
  f91d2e2e07
• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Use UIEvent level getters for modifier keys.
  ekrctb · 2018-10-02 13:26:36 +09:00
  b7a2ad1aa5
• Adapt signature change of event handlers
  ekrctb · 2018-10-02 12:02:55 +09:00
  50091252e2
• Change signature to new event handler
  ekrctb · 2018-10-02 12:02:47 +09:00
  99fc04c8af
• Move existing tournament resources to new project
  Dean Herbert · 2018-09-21 18:18:28 +09:00
  51dcfeee92
• Fade menu background a bit when menu is active
  Dean Herbert · 2018-09-21 03:13:15 +09:00
  78d78b5510
• Update framework
  Dean Herbert · 2018-07-21 16:21:53 +09:00
  0f37758314
• Add the ability to click completed download notifications to select beatmap

  Closes #2731.

  Dean Herbert · 2018-07-11 01:32:10 +09:00
  1418d1369f
• Improve code quality of main menu button system
  Dean Herbert · 2018-07-03 18:23:41 +09:00
  2aae528e1c
• Rewrite much state logic
  Dean Herbert · 2018-06-06 16:17:51 +09:00
  55921efffb
• apply feedback

  -don't directly set AllowOverlay Bindable
  this should be done specifically where needed
  -remove AllowOverlay Bindable from ButtonSystem
  -remove unnecessary xmldoc

  Aergwyn · 2018-06-03 11:31:04 +02:00
  707af02097
• add OverlayActivation enum

  + fix Toolbar being toggleable when it shouldn't be able to
  + allow opening overlays in MenuState.Initial again

  Aergwyn · 2018-05-28 13:43:47 +02:00
  2b3a630270
• expose two Bindables with split logic instead of one with mixed logic
  Aergwyn · 2018-05-21 15:53:55 +02:00
  b7e3ea348b
• Rename for better understanding

  ShowOverlays -> AllowOverlays
  ShowOverlaysOnEnter -> HideOverlaysOnEnter

  Aergwyn · 2018-05-21 09:42:29 +02:00
  1482bca147
• Resolve merge conflict
  Roman Kapustin · 2018-05-18 00:25:47 +03:00
  81d7e8a393
• Add Multiplayer screen.
  DrabWeb · 2018-05-15 21:14:10 -03:00
  1a78ac3d10
• Use both OnKeyDown and GlobalAction.Back
  Roman Kapustin · 2018-05-14 22:09:09 +03:00
  f2f2fb8c73
• Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"

  This reverts commit 44bbb8700e.

  Roman Kapustin · 2018-05-14 20:27:05 +03:00
  e802b722f0
• Merge branch 'master' into exit-hold-confirmation
  Dean Herbert · 2018-05-14 18:13:40 +09:00
  f14948c022
• Remove unused usings caused by multiplayer folder restructuring.
  DrabWeb · 2018-05-10 20:49:42 -03:00
  a86843ccc9
• Move multiplayer screens to osu.Game/Screens/Multi/Screens
  DrabWeb · 2018-05-10 20:47:25 -03:00
  bc9ac8f72a
• Rename osu.Game/Screens/Multiplayer to Multi.
  DrabWeb · 2018-05-10 20:39:05 -03:00
  c35760fdef
• Implement a hold-to-confirm screen when exiting game using escape key
  Dean Herbert · 2018-05-10 17:07:19 +09:00
  5df9f126d1
• Handle mouse back button using OnMouseDown override instead of using GlobalAction
  Roman Kapustin · 2018-05-08 00:22:11 +03:00
  44bbb8700e