h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 23:37:52 +08:00
Code Issues Releases Wiki Activity
69,771 Commits 3 Branches 656 Tags 367 MiB
275b86cd3c
Commit Graph

1116 Commits

Author SHA1 Message Date
Dean Herbert
b6e07ff59c
Merge pull request #13572 from bdach/fix-unsupported-locales 
Fix game crashes due to attempting localisation load for unsupported locales
 2021-06-19 17:09:39 +09:00
Dean Herbert
afcc3e14f4
m 2021-06-19 16:16:29 +09:00
Bartłomiej Dach
76db87f9cb Try-catch around localisation store registration 
Some platforms (android, older windows versions) will throw exceptions
at runtime when an unsupported `CultureInfo` is attempted to be
instantiated, leading to nasty crashes. Add a preventative try-catch
registration to prevent the crash, and log the errors for visibility.
 2021-06-19 08:02:30 +02:00
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
Lucas A
508d34fd3a Fix notification redirecting to the old log folder when game installation has been migrated to another location. 2020-06-30 19:51:10 +02:00
Dan Balasescu
b4dfd2bbaa
Merge branch 'master' into score-results-screen 2020-06-15 22:58:33 +09:00
Dean Herbert
c3c5a99a22 Load imported scores to results screen rather than gameplay 2020-06-15 20:23:35 +09:00
Dean Herbert
93572fc17d
Merge branch 'master' into present-recommended 2020-06-03 12:31:23 +09:00
Dean Herbert
9ab3e3a6d5
Merge branch 'master' into update-button 2020-05-13 20:50:33 +09:00
Dean Herbert
bbf4c687a8 Improve xmldoc 2020-05-13 11:09:17 +09:00
Craftplacer
39c36998c9 Revert changes that are to be resolved in #9002 2020-05-12 06:06:31 +02:00
Craftplacer
a86c7f478c Initial commit 2020-05-12 05:49:35 +02:00
Dean Herbert
3f78ddf482 Add CanBeNull hinting 2020-05-09 19:13:18 +09:00
Dean Herbert
fa711a6456 Fix null reference causing hard freeze if game is forcefully closed during disclaimer 2020-05-09 19:11:51 +09:00
Craftplacer
75e65766ff Annotate dependency 2020-05-08 01:09:16 +02:00
Craftplacer
c025814f40 Finalize changes 2020-05-07 23:04:18 +02:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
Endrik Tombak
33a608fd15 Merge branch 'master' of https://github.com/ppy/osu into present-recommended 
 Conflicts:
	osu.Game/Screens/Select/SongSelect.cs
 2020-05-01 11:06:20 +03:00
Dean Herbert
21c6ac8c43 Allow closing the game during intro 2020-04-30 12:12:28 +09:00
Endrik Tombak
cea582992f Fix early return check 2020-04-25 10:47:12 +03:00
Endrik Tombak
657bf5ad86 Merge branch 'master' of https://github.com/ppy/osu into present-recommended 2020-04-25 10:13:57 +03:00
Dean Herbert
1cec0575b7 Remove unused classes and replace overlay in game 2020-04-21 16:38:47 +09:00
Andrei Zavatski
894598eb22 Replace SocialOverlay with DashboardOverlay 2020-04-16 12:05:51 +03:00
Endrik Tombak
47187ec14c Simplify recommended beatmap presenting 2020-04-15 18:04:23 +03:00
Endrik Tombak
58e122a7cb Better fallback logic 2020-04-14 19:56:41 +03:00
Endrik Tombak
80949e89b9 Offline fallback and commenting 2020-04-14 19:49:42 +03:00
Endrik Tombak
872551733f Present recommended beatmaps 2020-04-14 19:39:14 +03:00
Endrik Tombak
ed28e8c8f5 Rename param 2020-04-12 19:38:09 +03:00
Endrik Tombak
ecd25e567d Present selected difficulty 2020-04-12 16:00:05 +03:00
unknown
2340142dc1 Merge branch 'master' of https://github.com/ppy/osu into linkify-metadata 2020-03-18 14:18:53 +08:00
Dan Balasescu
aafdfbca1f
Merge pull request #8129 from peppy/fix-dummy-track-completion-feedback 
Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap
 2020-03-05 17:57:57 +09:00
smoogipoo
0c1775b522 Fix incorrect condition and add test 2020-03-05 17:12:14 +09:00
smoogipoo
9307caa3bf Fix typos 2020-03-05 16:58:07 +09:00
Dean Herbert
74b5e76c0e Fix dependency initialisation ordering 2020-03-05 13:39:55 +09:00
Dean Herbert
6477a7b73e Centralise creation of UpdateManagers 2020-03-05 13:34:04 +09:00
Dean Herbert
bac35b2a68 Handle beatmap track changing in a saner way 2020-03-04 19:11:35 +09:00
Dean Herbert
7464a486d9 Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap 2020-03-04 16:35:45 +09:00
Dean Herbert
ed516f05c2 Forward any unhandled scroll events to volume overlay 2020-03-02 18:56:09 +09:00
Andrei Zavatski
5d813bf421 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings 2020-02-19 16:23:18 +03:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
Andrei Zavatski
382cc1a91b Fix incorrect overlays overlapping 2020-02-13 14:26:35 +03:00
Andrei Zavatski
a677aa6cfc Add rankings overlay to the game 2020-02-13 13:39:33 +03:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal 
Fix disposal-related errors by making WorkingBeatmap non-disposable
 2020-02-13 18:52:47 +09:00
Dean Herbert
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
smoogipoo
cef682aa03 Make WorkingBeatmap non-disposable 2020-02-10 17:02:01 +09:00
Dan Balasescu
098b3ac294
Merge branch 'master' into present-replay-from-ss 2020-02-03 16:28:38 +09:00
Dean Herbert
5312586351 Merge remote-tracking branch 'origin/perform-from-screen' into present-replay-from-ss 2020-02-01 02:14:17 +09:00
Dean Herbert
9a1907d8e0
Apply doc fixes from code review 
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2020-01-31 09:48:20 +09:00
unknown
2274d70dac apply suggestions 2020-01-31 06:41:50 +08:00
Dean Herbert
14f88bb725 Merge branch 'perform-from-screen' into present-replay-from-ss 2020-01-30 23:45:51 +09:00
Dean Herbert
878250056c Remove unused parameter 2020-01-30 23:34:04 +09:00
Dean Herbert
0975002ef5 Allow presenting scores from PlaySongSelect 2020-01-30 18:16:28 +09:00
Dean Herbert
f637e0e5a7 Remove unused bypassScreenAllowChecks argument 2020-01-30 18:10:05 +09:00
Dean Herbert
bc21e30b09 Allow specifying a valid list of types to performFromMenu 2020-01-30 18:10:05 +09:00
unknown
c5995acfff linkify metadata 2020-01-30 12:30:25 +08:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
Craftplacer
64fe9692ed Resolve CA errors 2020-01-18 15:57:51 +01:00
Craftplacer
2b5d541857 Merge remote-tracking branch 'upstream/master' into chat-mention 2020-01-16 23:15:39 +01:00
Joehu
f43602518a Add global action for toggling now playing overlay 2020-01-11 11:43:51 -08:00
Dean Herbert
f603dd82bc Fix difficulty adjust mod not correctly reading settings while leaderboard visible 2019-12-26 14:52:08 +09:00
Craftplacer
b6c31e7764 Remove ignore list, move code to MessageNotifier and add it to DI 
This also adds countable private message notifications.
 2019-12-17 06:59:27 +01:00
Dean Herbert
6893ec22bb Fix currenTrackCompleted not being run on main thread 2019-12-02 18:26:45 +09:00
Dean Herbert
ac2dfffb23 Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation 2019-11-21 22:52:45 +09:00
Dean Herbert
6d06b444ba Allow screen to specify whether to apply audio rate adjustments from mods 2019-11-15 13:47:14 +09:00
Huo Yaoyuan
6ae6603ded Cleanup. 2019-11-12 22:08:16 +08:00
Huo Yaoyuan
de732c6c24 Change code to use Sentry client. 2019-11-12 21:12:38 +08:00
Dean Herbert
faa5997b48
Move scaling container to OsuGame so OsuGameBase doesn't apply… (#6804) 
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
 2019-11-12 16:40:49 +09:00
Dean Herbert
35351d7f7c Use variable instead of duplicated list 2019-11-12 15:04:51 +09:00
Dean Herbert
25eb964290 Simplify overlay adding logic 2019-11-12 15:03:58 +09:00
Dean Herbert
e28ddec8d6
Merge branch 'master' into fix-home-not-closing-all-overlays 2019-11-12 12:05:19 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
8ac708ada5 Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale 2019-11-11 13:58:35 +09:00
Joehu
ff225c3691 Remove toolbarElements 2019-11-08 06:04:18 -08:00
Joehu
5235d2b319 Fix home button not closing login and now playing overlays 2019-11-07 14:38:06 -08:00
Dean Herbert
fe3583b6ee Move schedule call 2019-11-03 13:16:54 +09:00
Dean Herbert
f038c579f0 Protect against requests to show overlays before the target overlay is ready 2019-11-01 11:41:00 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame 
This allows for future calls from arguments / associations
 2019-11-01 11:40:51 +09:00
Joehu
ccc753a315 Make OverlayContainers with no blocking input VisibilityContainers 2019-10-14 16:27:59 -07:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification 2019-09-28 20:33:32 +08:00
Dean Herbert
42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
Craftplacer
08ab4e508f Use loadComponentSingleFile for caching 2019-09-15 17:15:52 +02:00
Craftplacer
72af640df7 Expose VolumeOverlay as available dependencies 2019-09-15 16:31:40 +02:00
Dean Herbert
53fe290ef3
Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +09:00
Dean Herbert
40c1c6072e Add "osu!classic" as a bundled skin choice 2019-08-29 16:39:42 +09:00
Dean Herbert
5886420a5d
Merge branch 'master' into back-button-part-2 2019-08-13 21:38:31 +09:00
Dean Herbert
9aac5efa4e Move logic out of OsuGame 2019-08-13 14:42:59 +09:00
Dean Herbert
8d23cda51a Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:33:35 +09:00
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
David Zhao
4a28bdd384 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-13 12:26:12 +09:00
Dean Herbert
f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00
Lucas A
fdf76be967 Merge branch 'master' into music-controller-hotkeys 2019-08-10 16:29:02 +02:00
Lucas A
8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
iiSaLMaN
d772bbaf8c Simplify disposing 2019-08-01 10:04:04 +03:00
David Zhao
d05b9b1734 Use dummyAPI and move load check into MusicController 2019-08-01 14:19:45 +09:00
iiSaLMaN
3af1aaeabe Unsubscribe from Completed event on old beatmap 2019-07-31 15:19:02 +03:00
David Zhao
351b6e6259 Add new options test 2019-07-31 19:47:41 +09:00
David Zhao
980686f6bf get tests running again 2019-07-31 19:30:35 +09:00
David Zhao
f81e691bf5 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-31 16:03:14 +09:00
David Zhao
5aece2d5f2 fix tests 2019-07-31 16:03:05 +09:00
David Zhao
82fcb88f5c update names 2019-07-30 12:11:08 +09:00
David Zhao
d70b99b4c0 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-30 12:05:23 +09:00
David Zhao
6d1203a599 Move screen pushes into function, rename receptor 2019-07-30 12:00:04 +09:00
Dean Herbert
ece5a9622e Fix scores without an online ID not always presenting correctly 2019-07-30 06:32:05 +09:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence (#5275) 
Improve testability of intro sequence
 2019-07-29 18:56:38 +09:00
David Zhao
e8c039bb8a Use a receptor model instead 2019-07-29 18:45:16 +09:00
David Zhao
2e242075b4 Remove and re-add backbutton instead and add tests 2019-07-29 16:42:23 +09:00
Dean Herbert
088c04a20f Revert "Fix BackButton handling escape before all other elements (#5440)" 
This reverts commit 17a6563f4c.
 2019-07-28 23:38:55 +09:00
David Zhao
bd2fce4bb7 don't use extra container 2019-07-28 13:45:54 +09:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority 2019-07-28 12:50:18 +09:00
Dean Herbert
53ecb2ae82 Reduce notification span during beatmap imports 2019-07-26 13:48:29 +09:00
David Zhao
bbcc8f0721 Add new container level and unblock footer 2019-07-25 11:11:20 +09:00
David Zhao
263ccfcbcb Merge remote-tracking branch 'upstream/master' into back-button-priority 2019-07-24 12:50:16 +09:00
David Zhao
38559685a9 proxy backbutton instead 2019-07-24 12:47:41 +09:00
Dean Herbert
292bd22f92 Allow multiple instances of osu! when running under debug 2019-07-23 13:38:05 +09:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements 2019-07-22 23:44:14 +09:00
Lucas A
2926932a1a Add MusicControllerToast used to display current music playback status on OSD 2019-07-20 21:10:17 +02:00
Dean Herbert
d4c1005c7e Fix incorrect comparison in line updating logic 2019-07-15 15:53:19 +09:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
David Zhao
fbd300e664 Move ruleset into ReplayPlayerLoader as well 2019-07-08 17:37:20 +09:00
David Zhao
6a86f62d17 Get mods from score info 2019-07-08 16:13:03 +09:00
David Zhao
5853a877c2 create base dependencies before caching, create player in playerloader 2019-07-08 15:40:10 +09:00
David Zhao
2747d7692b Create ReplayPlayerLoader for local mod caching 2019-07-08 14:55:05 +09:00
Lucas A
5f8bd6eca7 Fix CI issues + minor issues 2019-07-05 16:51:15 +02:00
Lucas A
89acd9da3e Add game-wide jukebox keybindings handling to OsuGame 2019-07-05 16:33:13 +02:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores 2019-07-04 01:00:42 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4 2019-07-03 11:47:10 +09:00
Dean Herbert
f31d840c13 Dispose previous WorkingBeatmap on change 2019-07-02 22:26:08 +09:00
naoey
04c467fd81
Add comment 2019-06-29 16:10:16 +05:30
naoey
6c81d57178
Remove hacks for updating model info 
- Re-retrieve score from database when presenting scores
 2019-06-29 16:08:48 +05:30
HoLLy
55216dffb7 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-27 14:07:17 +02:00
Dean Herbert
0bad86f6d9 Merge remote-tracking branch 'upstream/master' into async-beatmap-load 2019-06-27 13:58:59 +09:00
smoogipoo
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
smoogipoo
5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
smoogipoo
d9927204f8 Relieve OsuScreen of back button input duties 2019-06-25 18:33:18 +09:00
smoogipoo
f53d2fbe76 Scale backbutton along with screens 2019-06-25 18:33:13 +09:00
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
1830362337 Move task out of ctor to avoid initialisation ordering issues 2019-06-24 17:10:50 +09:00
HoLLy
f072a53e93 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-21 17:42:59 +02:00
Dean Herbert
cff5ddb137
Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
Dean Herbert
f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
HoLLy
15c75b4442 Add basic score import from stable 2019-06-19 18:33:51 +02:00
Dean Herbert
c32d17d16a Fix audio not dimming after race condition 
Also adjusts transition slightly for smoother effect.
 2019-06-18 01:32:52 +09:00
Lucas A
04dc1c1744
Fix typo in comment 
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
 2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00
Lucas A
d7d6feb001 Fade volume in / out when game window becomes active / inactive 2019-06-17 12:31:23 +02:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo
4dc77d64a3 Fix overlay group + depth 2019-05-31 13:23:50 +09:00
Dean Herbert
40f7cbde3a Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-21 14:00:50 +09:00
Dean Herbert
85a41cf6c3 Allow chaining of loadComponentSingleFile 2019-05-21 13:44:18 +09:00
Dean Herbert
d7098e2066 Hide other overlays when showing changelog 2019-05-15 17:38:19 +09:00
Dean Herbert
e46a61febf Allow chaining of loadComponentSingleFile 2019-05-15 17:36:29 +09:00
Dean Herbert
88528e797f Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 14:24:45 +09:00
Dean Herbert
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
Dean Herbert
ec5b024fa6 Define toolbarElements 2019-05-14 18:34:25 +09:00
Dan Balasescu
bffde7de08
Merge branch 'master' into exit-hide-music-controller 2019-05-14 17:36:38 +09:00
Dean Herbert
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Dean Herbert
50c440de8d Add toolbar button 2019-05-13 17:01:17 +09:00
Dean Herbert
65097fddc1 Hide music controller when exiting via Alt-F4 
Closes #4764.
 2019-05-12 22:34:58 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections 
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
 2019-05-07 13:20:17 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Lucas A
d5b7865ab8 Invert notification and loginOverlay depth order 2019-04-06 17:40:48 +02:00
Joehu
debda7ae7d Fix volume overlay container reference 2019-04-05 00:05:42 -07:00
Joehu
53906e87ec Split floatingOverlayContent 2019-04-05 00:00:21 -07:00
Dean Herbert
1709e22763
Merge branch 'master' into fix-blocked-volume-overlay 2019-04-04 17:28:46 +09:00
Samuel Van Allen
55a6e43778 Check against databasedSet instead of function param 2019-04-03 21:49:33 +08:00
Samuel Van Allen
e9269dc83b Prevent unnecessary query in OsuGame::PresentBeatmap 
This resolves issue #4575
 2019-04-02 23:57:31 +08:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Joehu
1ba608f01f Remove line spacing on similar code 2019-03-29 00:26:17 -07:00
Joehu
eefc55f89b Fix volume overlay being blocked by other floating overlays 
- excluding settings
 2019-03-29 00:20:16 -07:00
Dean Herbert
ccc0853f75 Change login overlay's depth and load order 2019-03-29 14:53:40 +09:00
Dean Herbert
90a4cb8e04 Fix unnecessary positioning 2019-03-29 14:49:15 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior 2019-03-28 22:28:56 -07:00
Dean Herbert
95bf0b9ed6 Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset 2019-03-29 13:57:02 +09:00
Dean Herbert
c4096fb628 Remove unused using 2019-03-29 13:56:56 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility 2019-03-28 23:47:44 +09:00
Joehu
9a3528ea9d Fix field modifier 2019-03-27 22:31:40 -07:00
Joehu
53f3dacdfb Fix login overlay behavior 2019-03-27 22:01:06 -07:00
Joehu
bdb39a79a9 Fix offset of music controller when toolbar is hidden 2019-03-27 20:27:26 -07:00
Joseph Madamba
cdf79ffe39
Merge branch 'master' into clean-overlays-code-1 2019-03-27 10:32:13 -07:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
David Zhao
5169f7a43c Change default for null screen parallax, apply reviews 2019-03-24 16:21:43 +09:00
David Zhao
dcae86e39a Add a new test for OsuScreenStack, fix parallax 2019-03-22 14:10:38 +09:00
Joseph Madamba
d5272a83cf
Rename "urgent" to "topMost" 2019-03-21 11:16:10 -07:00
Joehu
1f95abf7c7 Fix regressions caused by removing specified depths 
- urgentOverlayContent is added so toolbar can be loaded first
 2019-03-19 21:30:24 -07:00
Joehu
a39648edbc Normalize format of single line curly brackets 2019-03-19 20:51:43 -07:00
Joehu
44e0291737 Remove specified depths of overlays 2019-03-19 20:47:12 -07:00
David Zhao
9368081b99 Fix TestCasePlayer 2019-03-12 17:33:16 +09:00
David Zhao
e3567a5507 Make OsuGame use OsuScreenStack too 2019-03-12 16:03:25 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo
7583279e08 Remove unnecessary precondition 2019-03-01 13:29:02 +09:00
Shane Woolcock
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
smoogipoo
951b95ff78 Fix potential race condition 2019-02-28 17:17:57 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00