Dean Herbert
|
425dc8a210
|
Ensure mods are always in a valid state at a game level
|
2021-02-01 20:20:19 +09:00 |
|
Bartłomiej Dach
|
1d7be6a604
|
Merge branch 'master' into android-multiple-import-support-suppot
|
2021-01-16 23:13:11 +01:00 |
|
Shivam
|
e5c670f843
|
Merge branch 'master' into tourney-switching-ui
|
2021-01-10 17:33:52 +01:00 |
|
Dean Herbert
|
3b08faa0ea
|
Fix RemoveBlockingOverlay causing transform mutation from disposal threads
|
2021-01-04 17:49:11 +09:00 |
|
Lucas A
|
7ae4979882
|
Fix merge conflicts.
|
2020-12-27 13:52:45 +01:00 |
|
Shivam
|
a933483848
|
Merge branch 'master' into tourney-switching-ui
|
2020-12-26 15:45:29 +01:00 |
|
Shivam
|
9e15dccc56
|
Move graceful exit to OsuGameBase
|
2020-12-26 15:36:21 +01:00 |
|
Dean Herbert
|
323da82477
|
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.
|
2020-12-24 18:11:42 +09:00 |
|
Dean Herbert
|
8cc2ed3fae
|
Move from OsuGameBase to OsuGame
Also moves to a more suitable namespace.
|
2020-12-22 14:28:27 +09:00 |
|
Dean Herbert
|
dff865f335
|
Tidy up comments, code, and multiple linq enumeration
|
2020-12-22 14:12:02 +09:00 |
|
Dean Herbert
|
d229fbba6e
|
Merge branch 'master' into present-recommended
|
2020-12-22 13:52:29 +09:00 |
|
Lucas A
|
4fba0c8e6a
|
Remove not used using statement.
|
2020-12-19 10:55:39 +01:00 |
|
Lucas A
|
a397db4f15
|
Resolve merge conflicts
|
2020-12-19 10:55:18 +01:00 |
|
Dean Herbert
|
206bf3713e
|
Make IAPIProvider read-only bindables into IBindables
|
2020-12-18 15:16:36 +09:00 |
|
Lucas A
|
5d7294451f
|
Refactor Import() overload to take a list of import tasks instead.
|
2020-12-16 14:28:16 +01:00 |
|
Dean Herbert
|
c5112edd08
|
Add comment regarding the reasoning for encapsulating the task in another
|
2020-12-14 18:03:01 +09:00 |
|
Dean Herbert
|
f3e6c586f7
|
Change waitForReady back to private implementation
|
2020-12-14 17:59:04 +09:00 |
|
Lucas A
|
08b79bb921
|
Store and return unstarted task for consumers to await on.
|
2020-12-12 17:12:15 +01:00 |
|
Lucas A
|
6da854e37c
|
Move scheduled import logic to OsuGame.
|
2020-12-09 13:32:59 +01:00 |
|
Lucas A
|
2ea8b105d5
|
Apply review suggestions
|
2020-12-06 18:46:30 +01:00 |
|
Endrik Tombak
|
cbbcf36eaa
|
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
|
2020-12-03 19:38:32 +02:00 |
|
Lucas A
|
827e957568
|
Allow importing osz files / osk files from Downloads directory.
|
2020-12-02 18:03:49 +01:00 |
|
Endrik Tombak
|
72d9da5fac
|
Apply review suggestions
|
2020-11-21 14:26:09 +02:00 |
|
Endrik Tombak
|
944f3480c2
|
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
|
2020-11-21 14:01:01 +02:00 |
|
Dean Herbert
|
2db42f8e67
|
Remove default allowRetry parameter value from ResultsScreen
|
2020-11-20 14:35:44 +09:00 |
|
Bartłomiej Dach
|
96fbfc33fa
|
Merge branch 'master' into perform-from-menu-dialog-aware
|
2020-11-12 15:05:45 +01:00 |
|
Dean Herbert
|
6fa0cc9bda
|
Merge pull request #10792 from peppy/remove-double-external-link-opener
Remove duplicate instantiation of externalLinkOpener
|
2020-11-11 16:58:35 +09:00 |
|
Dean Herbert
|
804450e707
|
Remove duplicate instantiation of externalLinkOpener
|
2020-11-11 15:49:45 +09:00 |
|
Dean Herbert
|
c308eb75d9
|
Move logic for performing actions from specific screen to its own component
|
2020-11-11 14:45:50 +09:00 |
|
Dean Herbert
|
f78f2fb59e
|
Merge branch 'osd-custom-bindings-display' into add-random-skin-hotkey
|
2020-11-11 13:53:49 +09:00 |
|
Dean Herbert
|
324626e097
|
Move default config tracking calls out of OnScreenDisplay itself
|
2020-11-11 13:53:09 +09:00 |
|
Dean Herbert
|
8d38d9cc93
|
Add hotkey to select random skin
|
2020-11-11 13:05:03 +09:00 |
|
Dean Herbert
|
6014751e29
|
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
|
2020-11-11 12:56:10 +09:00 |
|
Dean Herbert
|
9caa56c64f
|
Display skin changes via on-screen display overlay
|
2020-11-11 12:19:01 +09:00 |
|
Lucas A
|
790a2ca97d
|
Extract UserActivity logic to OsuGame.
|
2020-11-08 12:29:52 +01:00 |
|
Dean Herbert
|
1e1569eb53
|
Use int instead of long for user_id fields for now
|
2020-11-06 12:59:46 +09:00 |
|
Berkan Diler
|
cc11283143
|
Use string.Starts-/EndsWith char overloads
|
2020-10-16 11:27:02 +02:00 |
|
Dean Herbert
|
cc41845f56
|
Add missing string function ordinal specifications
|
2020-10-16 12:49:31 +09:00 |
|
Dean Herbert
|
dbdb25ccf7
|
Move reset logic to OsuGame
|
2020-10-08 18:29:19 +09:00 |
|
Dean Herbert
|
0967db768f
|
Add xmldoc covering usage restrictions
|
2020-10-08 18:28:56 +09:00 |
|
Shane Woolcock
|
f88ba1734b
|
Remove ConfineMouseTracker field
|
2020-10-07 18:11:47 +10:30 |
|
Shane Woolcock
|
d1ec380692
|
Don't cache ConfineMouseTracker
|
2020-10-07 16:15:32 +10:30 |
|
Shane Woolcock
|
7fff762dfc
|
Rename IsGameplay
|
2020-10-07 16:14:49 +10:30 |
|
Shane Woolcock
|
478f2dec96
|
Maintain the current gameplay state in OsuGame
|
2020-10-06 22:39:35 +10:30 |
|
Shane Woolcock
|
4b6f893408
|
Merge branch 'master' into confine-during-gameplay
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/OsuGame.cs
# osu.Game/Screens/Play/Player.cs
|
2020-10-05 10:23:37 +10:30 |
|
smoogipoo
|
0360f7d845
|
Move CollectionManager to OsuGame
|
2020-09-09 15:39:15 +09:00 |
|
Dean Herbert
|
66d3bda962
|
Merge branch 'master' into collection-database
|
2020-09-08 23:18:47 +09:00 |
|
Dean Herbert
|
072aab90ab
|
Merge branch 'master' into fix-music-controller-regressed
|
2020-09-08 18:26:15 +09:00 |
|
Dean Herbert
|
b1110e5e3a
|
Rename class to match derived class
|
2020-09-08 18:10:14 +09:00 |
|
smoogipoo
|
06328e0000
|
Add import/deletion progress notifications
|
2020-09-08 17:59:27 +09:00 |
|