1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

249 Commits

Author SHA1 Message Date
EVAST9919
e5a6d920cd Implement an abstract RulesetSelector class 2019-06-12 23:23:01 +03:00
EVAST9919
8d8615773c Fix selection is being possible even in disabled state 2019-06-12 20:54:19 +03:00
EVAST9919
3150b5cfb4 Naming adjustments 2019-06-12 20:51:21 +03:00
EVAST9919
065b4cd055 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-12 20:35:51 +03:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
EVAST9919
27163c9996 Fix crashes in some cases
When we want to switch ruleset from outside of the selector, but it's
blocked (multiplayer is a good example)
2019-06-10 09:18:48 +03:00
EVAST9919
ec8c09dd39 Fix unability to mannualy switch ruleset 2019-06-10 04:36:34 +03:00
EVAST9919
9b8540d818 Add a testcase 2019-06-10 03:35:00 +03:00
EVAST9919
62eadf21c9 Remove useless line 2019-06-08 18:38:52 +03:00
EVAST9919
06dfa42a5a Refactor 2019-06-08 18:27:40 +03:00
EVAST9919
210437042f Remove useless update calls in ToolbarRulesetSelector 2019-06-07 02:39:36 +03: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
50c440de8d Add toolbar button 2019-05-13 17:01:17 +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
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior 2019-03-28 22:28:56 -07:00
Joehu
53f3dacdfb Fix login overlay behavior 2019-03-27 22:01:06 -07:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
smoogipoo
09b5cf4891 Move sizing to ctor 2019-03-08 15:14:07 +09:00
Dean Herbert
075ea70124 Move more toolbar to async load 2019-03-08 12:15:27 +09:00
Joehu
f4a6612d48 Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Paul Teng
ae79c3832e Add base. for safety 2018-10-09 11:05:15 -04:00
Paul Teng
ca9cbf1aea Fix rulsets being completed unselectable 2018-10-06 07:51:56 -04:00
Paul Teng
8b27741cb0 Do not propagate positional input to subtree 2018-10-05 11:37:44 -04:00
Paul Teng
8264dd49de Update bindable only if enabled 2018-10-05 07:13:18 -04:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
da3eb18784 Fix the toolbar being visible during startup causing a weird offset 2018-09-05 10:46:19 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad Fix review issues 2018-06-26 17:01:40 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Aergwyn
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
Dean Herbert
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
Aergwyn
707af02097 apply feedback
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
Aergwyn
2b3a630270 add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
Dean Herbert
42519e3723 Rewrite code for clarity
This also uses the AvailableRulesets list rather than private IDs
2018-05-21 14:49:26 +09:00
ocboogie
ebd9d1a037 Resolve linting issues in ToolbarModeSelector.cs 2018-05-13 19:43:26 -07:00
ocboogie
327c7432be Use OnKeyDown instead of a IKeyBindingHandler 2018-05-13 19:33:52 -07:00
ocboogie
26f06a9ae1 Resolve linting issues in ToolbarModeSelector.cs 2018-05-12 17:25:15 -07:00
ocboogie
8a5bd27c20 Add global key bindings for changing current ruleset 2018-05-12 16:30:29 -07:00
TocoToucan
ca574f2345 Disable RulesetToggleButton whenever the ruleset can't be changed 2018-04-29 18:36:19 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
vperus
ba44813c00 Fixed exit from game save username instead of email. Resolve #2156 2018-03-13 12:10:47 +02:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Aergwyn
205d3ed896 fix settings not getting injected 2018-01-23 19:42:21 +01:00
Dean Herbert
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dean Herbert
33dbd1b1a7 Remove search button on toolbar 2017-12-31 03:47:50 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Dean Herbert
24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
Dean Herbert
0886107ec9 Connect counter with button display 2017-12-26 01:56:57 +09:00
Dean Herbert
bb33d0211a Add a count of unread notifications to the toolbar 2017-12-26 01:36:58 +09:00
Dean Herbert
dff082ed94 Make toolbar testable and add the most basic of visual tests 2017-12-26 01:12:46 +09:00
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09:00
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
Dean Herbert
0e04260b3c Move ToolbarUserArea initialisation to BDL 2017-10-24 10:08:42 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
86bde4b6b2 Use the correct icon for osu!direct in the toolbar 2017-08-25 13:03:34 +09:00
Dean Herbert
0082640548 Add missing licence header 2017-08-24 20:25:18 +09:00
Dean Herbert
9adff5f697 Add osu!direct toggle to toolbar 2017-08-24 20:18:47 +09:00
Dan Balasescu
69a3251f61 Merge branch 'master' into toolbar-button-swap 2017-08-17 10:39:02 +09:00
MrTheMake
94d664a626 Swap the order of the social and chat toolbar buttons 2017-08-16 17:00:30 +02:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00