1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Commit Graph

698 Commits

Author SHA1 Message Date
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