Dean Herbert
|
d06e52505a
|
Fix thread safety of KeyBindingStore.GetReadableKeyCombinationsFor
|
2021-06-18 17:11:39 +09:00 |
|
smoogipoo
|
19f0e3d695
|
Add HighPerformanceSession
|
2021-06-16 20:53:48 +09:00 |
|
Bartłomiej Dach
|
cc5145a131
|
Fix languages with a sub-language part not working properly
|
2021-06-16 11:10:03 +02:00 |
|
Dean Herbert
|
68fa7d68cc
|
Merge pull request #13511 from smoogipoo/fix-possible-nullref-2
Fix possible nullref in difficulty recommender
|
2021-06-16 15:20:45 +09:00 |
|
smoogipoo
|
a5261f0cb3
|
Add difficulty recommender instantly
|
2021-06-16 11:48:49 +09:00 |
|
smoogipoo
|
579a4aa9c8
|
Remove comment
|
2021-06-15 14:10:09 +09:00 |
|
smoogipoo
|
eb4c093371
|
Use hash as fallback
|
2021-06-15 14:06:17 +09:00 |
|
smoogipoo
|
f6c6eea6dc
|
Make PresentScore() only consider replay hash
|
2021-06-15 11:16:35 +09:00 |
|
Dean Herbert
|
26312bf60a
|
Merge branch 'master' into chat-mention
|
2021-06-11 20:03:44 +09:00 |
|
Dean Herbert
|
3d645608eb
|
Remove nullability of DI dependencies and fix incorrect load order
|
2021-06-11 16:28:53 +09:00 |
|
smoogipoo
|
0b9916b266
|
Add parens to declare operator precedence
|
2021-06-08 18:39:52 +09:00 |
|
smoogipoo
|
860f1aebb3
|
Only call OnBackButton() if the screen has finished loading
|
2021-06-08 17:38:12 +09:00 |
|
Craftplacer
|
39c3b08fc7
|
Merge remote-tracking branch 'upstream/master' into chat-mention
|
2021-06-05 11:18:06 +02:00 |
|
Dean Herbert
|
145e42928b
|
Fix remaining null checks
|
2021-06-01 16:49:05 +09:00 |
|
Dean Herbert
|
52ca2f4797
|
Merge branch 'master' into chat-mention
|
2021-05-26 16:00:26 +09:00 |
|
Dean Herbert
|
b13a68592f
|
Merge branch 'master' into localisation-proof-of-concept
|
2021-05-22 17:07:23 +09:00 |
|
Dean Herbert
|
b0a113a36b
|
Merge branch 'master' into localisation-proof-of-concept
|
2021-05-21 17:57:54 +09:00 |
|
Lucas A
|
dabe8bd4c7
|
Fix code inspections and remove now unused code.
|
2021-05-17 12:55:58 +02:00 |
|
Lucas A
|
851e33fd15
|
Hook up StableImportManager.
|
2021-05-17 12:55:57 +02:00 |
|
Gagah Pangeran Rosfatiputra
|
f2de28814a
|
add and handle OpenWiki link action
|
2021-05-17 00:43:59 +07:00 |
|
smoogipoo
|
cd25d76dbe
|
Merge branch 'master' into localisation-proof-of-concept
|
2021-05-08 18:11:07 +09:00 |
|
Dean Herbert
|
aff32b0d19
|
Merge branch 'master' into skin-components-list
|
2021-05-06 14:17:33 +09:00 |
|
Dean Herbert
|
df8609b3dc
|
Move private field for skin editor overlay to where others exist
|
2021-05-03 15:17:04 +09:00 |
|
Dean Herbert
|
f3b305bbe6
|
Rename and improve xmldoc of SkinEditorOverlay
|
2021-05-03 14:58:25 +09:00 |
|
Dean Herbert
|
20ff05c9ff
|
Fix crosstalk between notification/setting overlay nudge padding and skin overlay position adjust
|
2021-04-30 13:10:42 +09:00 |
|
Dean Herbert
|
63435ba548
|
Ensure toolbar doesn't overlap editor content
|
2021-04-29 17:41:07 +09:00 |
|
Dean Herbert
|
b936043956
|
Add the skin editor to the game
|
2021-04-29 17:20:22 +09:00 |
|
Gagah Pangeran Rosfatiputra
|
004cd7c834
|
add wiki button in main toolbar
|
2021-04-22 16:16:12 +07:00 |
|
Dean Herbert
|
623eae1576
|
Add basic language switching ability
|
2021-04-20 17:06:01 +09:00 |
|
jvyden
|
ffc1e841e0
|
Fix sessionIdleTracker not being properly added to OsuGame
|
2021-04-19 01:06:26 -04:00 |
|
Dean Herbert
|
dbb8f7f4a9
|
Tidy up initialisation code and avoid using DI on inherited class
|
2021-04-19 11:30:55 +09:00 |
|
jvyden
|
9c6914d29d
|
Fix redundant lambda parentheses
|
2021-04-16 06:26:45 -04:00 |
|
jvyden
|
ec0211809f
|
Apply peppy's suggestions
|
2021-04-16 05:53:27 -04:00 |
|
jvyden
|
43e6e5e049
|
increase GameIdleTracker time to 5 minutes
|
2021-04-16 05:15:58 -04:00 |
|
jvyden
|
7d23973ef8
|
Reset SessionStatics on activity
Closes #12424
|
2021-04-16 05:01:58 -04:00 |
|
Dean Herbert
|
beebdb0734
|
Clean up implementation
|
2021-04-05 22:30:51 +09:00 |
|
Dean Herbert
|
a2f50af424
|
Fix fall-through scroll redirection
|
2021-03-30 19:42:40 +09:00 |
|
Dean Herbert
|
f95175983a
|
Make code more concise and move method to a more appropriate place
|
2021-03-24 13:37:37 +09:00 |
|
Owen Young
|
c8542d2434
|
Merge branch 'master' into default-fullscreen
|
2021-03-23 19:44:22 -05:00 |
|
Owen Young
|
437dadc85f
|
Changed comment on GetFrameworkConfigDefaults() to be more accurate
|
2021-03-23 19:37:55 -05:00 |
|
Owen Young
|
67a03ebc23
|
Fixed formatting issues to be in line with osu coding standards
|
2021-03-23 19:31:16 -05:00 |
|
Owen Young
|
fbb992fc7e
|
Added a comment to new method
|
2021-03-23 19:18:32 -05:00 |
|
Owen Young
|
254b0f5dc3
|
removed line (?) - tried doing testing to see if it launched in fullscreen (i.e., overriding the method ppy mentioned), but to no avail :(
|
2021-03-23 00:24:33 -05:00 |
|
Owen Young
|
d9e2c44a34
|
implemented GetFrameworkConfigDefaults for overriding framework default, removed previous code that added a new OsuSetting and modified settings layout.
|
2021-03-22 23:36:55 -05:00 |
|
Owen Young
|
9f788f5854
|
removed code from OsuGameBase for fullscreen.....OsuSetting still exists but cannot figure out a way to set it to a default and have it actually work
|
2021-03-22 22:52:16 -05:00 |
|
Owen Young
|
8ea7271d5c
|
moved windowmode code to LoadComplete (?)
|
2021-03-22 19:48:52 -05:00 |
|
Owen Young
|
fc632fd48a
|
Added WindowSetting setting to OsuSetting enum so that it can be set by default at startup. Modified LayoutSettings.cs so that when it is changed in the settings, it is written to the local settings as well.
|
2021-03-22 01:30:20 -05:00 |
|
owen-young
|
f7bf23dbe9
|
first attempt at changing windowMode to be fullscreen on default
|
2021-03-21 21:50:19 -05:00 |
|
Dean Herbert
|
095b7f8668
|
Rewrite code to account for non-loaded edge case
|
2021-03-19 20:09:12 +09:00 |
|
Dean Herbert
|
bd1e2da1c2
|
Always hide other overlays, even if the new one is not loaded
|
2021-03-19 19:09:39 +09:00 |
|
Dean Herbert
|
a9c4fa442a
|
Avoid potential crash if an overlay is toggled before it has been loaded
|
2021-03-19 16:49:09 +09:00 |
|
Dean Herbert
|
249ab8ab3d
|
Merge branch 'master' into input-handler-configuration
|
2021-03-17 18:05:14 +09:00 |
|
smoogipoo
|
da3dc61aae
|
Remove newline
|
2021-03-16 10:58:42 +09:00 |
|
Joehu
|
3dd72d6f7d
|
Fix disable mouse buttons setting not showing default indicator when using keybind
|
2021-03-14 22:47:05 -07:00 |
|
Joehu
|
0ba5312a40
|
Move blocking show logic to UpdateState
|
2021-03-13 00:05:26 -08:00 |
|
Joehu
|
62f2a823f6
|
Hide toolbar forever when the user hides it
|
2021-03-12 15:48:50 -08:00 |
|
Joehu
|
6c0734a09f
|
Handle global action in toolbar instead of osugame
|
2021-03-12 15:48:49 -08:00 |
|
Dean Herbert
|
86164c027a
|
Update the method we use to reset input settings
|
2021-03-12 18:44:10 +09:00 |
|
Dean Herbert
|
b1cd01ceb8
|
Apply ConfigureAwait changes to game side
|
2021-03-08 14:36:35 +09:00 |
|
Salman Ahmed
|
fe64c3dbd4
|
Refrain from disabling cursor sensitivity at config-level
|
2021-03-04 17:00:44 +03:00 |
|
Dean Herbert
|
7c59040082
|
Re-present even when already the current beatmap
This feels better and closer to what a user would expect.
|
2021-03-03 14:17:07 +09:00 |
|
Dean Herbert
|
fcea900a53
|
Move main menu (song select) presentation logic to a local implementation
Reduces cross-dependencies between OsuGame and MainMenu.
|
2021-03-03 14:13:51 +09:00 |
|
Dean Herbert
|
36e1fb6da8
|
Add flow to allow MatchSubScreen to handle beatmap presentation locally
|
2021-03-03 14:13:51 +09:00 |
|
Dean Herbert
|
d85a4a22e5
|
Allow beatmap imports from any derived version of SongSelect, rather than only PlaySongSelect
|
2021-02-18 19:19:28 +09:00 |
|
Dean Herbert
|
a080a9bdbc
|
Merge pull request #11603 from Game4all/handle-stable-imports-custom-songs-folder
Handle beatmap import from a stable installation with a custom Songs directory
|
2021-02-12 21:42:36 +09:00 |
|
Jamie Taylor
|
2ee634d173
|
Create subclass for "Error" notifications to allow them to have a unique pop-in sound
|
2021-02-11 13:55:43 +09:00 |
|
Dean Herbert
|
630c5bb747
|
Avoid potential crashes when lease is held on SelectedMods
|
2021-02-05 16:46:21 +09:00 |
|
Dean Herbert
|
425dc8a210
|
Ensure mods are always in a valid state at a game level
|
2021-02-01 20:20:19 +09:00 |
|
Lucas A
|
a4a7f0c578
|
Address CI inspections.
|
2021-01-25 19:05:16 +01:00 |
|
Lucas A
|
d71ac83428
|
Use StableStorage in ArchiveModelManager.
|
2021-01-24 19:46:10 +01: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 |
|
smoogipoo
|
98e9c4dc25
|
General refactorings
|
2020-09-07 21:08:48 +09:00 |
|
smoogipoo
|
6cc4517600
|
Merge branch 'master' into collection-database
|
2020-09-07 20:03:11 +09:00 |
|
smoogipoo
|
345fb9d8e0
|
Rename classes
|
2020-09-05 03:55:43 +09:00 |
|
smoogipoo
|
ebd11ae0b7
|
Add a collection management dialog
|
2020-09-05 03:52:07 +09:00 |
|
smoogipoo
|
1143d5d992
|
Update class exclusion for dynamic compilation
|
2020-09-04 20:41:08 +09:00 |
|
Salman Ahmed
|
001509df55
|
Move music global action handling to an own component
Due to requiring components that are added at an OsuGame-level
|
2020-09-04 10:24:54 +03:00 |
|
Dean Herbert
|
2fac0a180e
|
Adjust toolbar button sizing
|
2020-09-03 16:34:58 +09:00 |
|
Dan Balasescu
|
84b3604192
|
Merge branch 'master' into game-overlay-activation-mode
|
2020-09-03 13:34:22 +09:00 |
|
Lucas A
|
754274a146
|
Fix and add XMLDoc
|
2020-09-02 20:55:26 +02:00 |
|
smoogipoo
|
a56f9d6770
|
Implement collection import
|
2020-09-03 00:08:33 +09:00 |
|
Lucas A
|
ad223bc460
|
Make game bindable immutable.
|
2020-08-29 19:34:53 +02:00 |
|
Lucas A
|
5949a281fc
|
Make Introduce bindable property OverlayActivationMode in OsuScreen
|
2020-08-29 19:34:35 +02:00 |
|
Shane Woolcock
|
00f15231bc
|
Cache ConfineMouseTracker
|
2020-08-16 21:52:39 +09:30 |
|
Dean Herbert
|
429ad783cf
|
Merge branch 'update-framework' into beatmap-track-rework
|
2020-08-12 23:35:46 +09:00 |
|
Dean Herbert
|
8bfe6ba27c
|
Fix informational overlays not hiding each other correctly
|
2020-08-11 23:15:08 +09:00 |
|
Dean Herbert
|
730d13fda6
|
Always show newly presented overlay at front
This feels much better. Does not change order if the overlay to be shown
is not yet completely hidden.
- Closes #9815.
|
2020-08-10 20:48:04 +09:00 |
|
smoogipoo
|
bf21fdd6da
|
Merge branch 'master' into beatmap-track-rework
|
2020-08-07 18:41:34 +09:00 |
|
smoogipoo
|
adf4f56dce
|
Move MusicController to OsuGameBase
|
2020-08-06 19:01:23 +09:00 |
|
smoogipoo
|
ef689d943a
|
Fix intros playing incorrectly
|
2020-08-06 18:54:08 +09:00 |
|
Joehu
|
7bcb68ffac
|
Handle overlay toggling with toolbar buttons instead
|
2020-08-06 01:17:24 -07:00 |
|
smoogipoo
|
e9fc783b1d
|
Add back loop-on-completion
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
58660c70a3
|
Cache before idle tracker
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
6e42b8219c
|
Move track to MusicController, compiles
|
2020-08-06 16:24:14 +09:00 |
|
Andrei Zavatski
|
b821d619b5
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into news
|
2020-07-25 09:13:12 +03:00 |
|
Dean Herbert
|
d093dc09f9
|
Limit notification text length to avoid large error messages degrading performance
|
2020-07-24 14:10:05 +09:00 |
|
Dean Herbert
|
a7fcce0bf7
|
Fix hard crash on notifications firing before NotificationOverlay is ready
|
2020-07-19 11:52:30 +09:00 |
|
Andrei Zavatski
|
f67b93936f
|
Remove shortcut
|
2020-07-16 23:11:55 +03:00 |
|
Andrei Zavatski
|
dac98c8914
|
Add shortcut for news overlay
|
2020-07-16 14:55:02 +03:00 |
|
Andrei Zavatski
|
68d2888a8c
|
Add NewsOverlay to the game
|
2020-07-16 14:48:40 +03:00 |
|
Joehu
|
1a2f5cb477
|
Add OnBackButton bool to OsuScreen
|
2020-07-13 23:59:20 -07:00 |
|
vntxx
|
d18609e900
|
Added notifications keybinding
Implementation of #9502
|
2020-07-12 12:44:00 +02:00 |
|