737 Commits

• Merge branch 'master' into android-multiple-import-support-suppot
  Bartłomiej Dach · 2021-01-16 23:13:11 +01:00
  1d7be6a604
• Merge branch 'master' into tourney-switching-ui
  Shivam · 2021-01-10 17:33:52 +01:00
  e5c670f843
• Fix RemoveBlockingOverlay causing transform mutation from disposal threads
  Dean Herbert · 2021-01-04 17:49:11 +09:00
  3b08faa0ea
• Fix merge conflicts.
  Lucas A · 2020-12-27 13:52:45 +01:00
  7ae4979882
• Merge branch 'master' into tourney-switching-ui
  Shivam · 2020-12-26 15:45:29 +01:00
  a933483848
• Move graceful exit to OsuGameBase
  Shivam · 2020-12-26 15:36:21 +01:00
  9e15dccc56
• Add website root URL and update most links to use it

  For what it's worth, I intentionally didn't include news / changelog /
  supporter, because these should never change.

  Dean Herbert · 2020-12-24 18:11:42 +09:00
  323da82477
• Move from OsuGameBase to OsuGame

  Also moves to a more suitable namespace.

  Dean Herbert · 2020-12-22 14:28:27 +09:00
  8cc2ed3fae
• Tidy up comments, code, and multiple linq enumeration
  Dean Herbert · 2020-12-22 14:12:02 +09:00
  dff865f335
• Merge branch 'master' into present-recommended
  Dean Herbert · 2020-12-22 13:52:29 +09:00
  d229fbba6e
• Remove not used using statement.
  Lucas A · 2020-12-19 10:55:39 +01:00
  4fba0c8e6a
• Resolve merge conflicts
  Lucas A · 2020-12-19 10:55:18 +01:00
  a397db4f15
• Make IAPIProvider read-only bindables into IBindables
  Dean Herbert · 2020-12-18 15:16:36 +09:00
  206bf3713e
• Refactor Import() overload to take a list of import tasks instead.
  Lucas A · 2020-12-16 14:28:16 +01:00
  5d7294451f
• Add comment regarding the reasoning for encapsulating the task in another
  Dean Herbert · 2020-12-14 18:03:01 +09:00
  c5112edd08
• Change waitForReady back to private implementation
  Dean Herbert · 2020-12-14 17:59:04 +09:00
  f3e6c586f7
• Store and return unstarted task for consumers to await on.
  Lucas A · 2020-12-12 17:12:15 +01:00
  08b79bb921
• Move scheduled import logic to OsuGame.
  Lucas A · 2020-12-09 13:32:59 +01:00
  6da854e37c
• Apply review suggestions
  Lucas A · 2020-12-06 18:46:30 +01:00
  2ea8b105d5
• Merge branch 'master' of https://github.com/ppy/osu into present-recommended
  Endrik Tombak · 2020-12-03 19:38:32 +02:00
  cbbcf36eaa
• Allow importing osz files / osk files from Downloads directory.
  Lucas A · 2020-12-02 18:03:49 +01:00
  827e957568
• Apply review suggestions
  Endrik Tombak · 2020-11-21 14:26:09 +02:00
  72d9da5fac
• Merge branch 'master' of https://github.com/ppy/osu into present-recommended

  
   Conflicts:
  
  	osu.Game/OsuGameBase.cs
  
  	osu.Game/Screens/Select/DifficultyRecommender.cs
  
  	osu.Game/Screens/Select/SongSelect.cs

  Endrik Tombak · 2020-11-21 14:01:01 +02:00
  944f3480c2
• Remove default allowRetry parameter value from ResultsScreen
  Dean Herbert · 2020-11-20 14:35:44 +09:00
  2db42f8e67
• Merge branch 'master' into perform-from-menu-dialog-aware
  Bartłomiej Dach · 2020-11-12 15:05:45 +01:00
  96fbfc33fa
• Merge pull request #10792 from peppy/remove-double-external-link-opener

  Remove duplicate instantiation of externalLinkOpener

  Dean Herbert · 2020-11-11 16:58:35 +09:00
  6fa0cc9bda
• Remove duplicate instantiation of externalLinkOpener
  Dean Herbert · 2020-11-11 15:49:45 +09:00
  804450e707
• Move logic for performing actions from specific screen to its own component
  Dean Herbert · 2020-11-11 14:45:50 +09:00
  c308eb75d9
• Merge branch 'osd-custom-bindings-display' into add-random-skin-hotkey
  Dean Herbert · 2020-11-11 13:53:49 +09:00
  f78f2fb59e
• Move default config tracking calls out of OnScreenDisplay itself
  Dean Herbert · 2020-11-11 13:53:09 +09:00
  324626e097
• Add hotkey to select random skin
  Dean Herbert · 2020-11-11 13:05:03 +09:00
  8d38d9cc93
• Add the ability for the game OSD to display user bindings

  Adds binding display for mouse button toggle / HUD toggle keys.
  
  - [ ] Depends on #10786 for ease-of-merge

  Dean Herbert · 2020-11-11 12:56:10 +09:00
  6014751e29
• Display skin changes via on-screen display overlay
  Dean Herbert · 2020-11-11 12:19:01 +09:00
  9caa56c64f
• Extract UserActivity logic to OsuGame.
  Lucas A · 2020-11-08 12:29:52 +01:00
  790a2ca97d
• Use int instead of long for user_id fields for now
  Dean Herbert · 2020-11-06 12:59:46 +09:00
  1e1569eb53
• Use string.Starts-/EndsWith char overloads
  Berkan Diler · 2020-10-16 11:27:02 +02:00
  cc11283143
• Add missing string function ordinal specifications
  Dean Herbert · 2020-10-16 12:49:31 +09:00
  cc41845f56
• Move reset logic to OsuGame
  Dean Herbert · 2020-10-08 18:29:19 +09:00
  dbdb25ccf7
• Add xmldoc covering usage restrictions
  Dean Herbert · 2020-10-08 18:28:56 +09:00
  0967db768f
• Remove ConfineMouseTracker field
  Shane Woolcock · 2020-10-07 18:11:47 +10:30
  f88ba1734b
• Don't cache ConfineMouseTracker
  Shane Woolcock · 2020-10-07 16:15:32 +10:30
  d1ec380692
• Rename IsGameplay
  Shane Woolcock · 2020-10-07 16:14:49 +10:30
  7fff762dfc
• Maintain the current gameplay state in OsuGame
  Shane Woolcock · 2020-10-06 22:39:35 +10:30
  478f2dec96
• Merge branch 'master' into confine-during-gameplay

  # Conflicts:
  #	osu.Game/Configuration/OsuConfigManager.cs
  #	osu.Game/OsuGame.cs
  #	osu.Game/Screens/Play/Player.cs

  Shane Woolcock · 2020-10-05 10:23:37 +10:30
  4b6f893408
• Move CollectionManager to OsuGame
  smoogipoo · 2020-09-09 15:39:15 +09:00
  0360f7d845
• Merge branch 'master' into collection-database
  Dean Herbert · 2020-09-08 23:18:47 +09:00
  66d3bda962
• Merge branch 'master' into fix-music-controller-regressed
  Dean Herbert · 2020-09-08 18:26:15 +09:00
  072aab90ab
• Rename class to match derived class
  Dean Herbert · 2020-09-08 18:10:14 +09:00
  b1110e5e3a
• Add import/deletion progress notifications
  smoogipoo · 2020-09-08 17:59:27 +09:00
  06328e0000
• General refactorings
  smoogipoo · 2020-09-07 21:08:48 +09:00
  98e9c4dc25