h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 03:22:57 +08:00
Code Issues Releases Wiki Activity
41,441 Commits 6 Branches 666 Tags 365 MiB
f8fe4ab482
Commit Graph

309 Commits

Author SHA1 Message Date
Dean Herbert
7253866e17 Move customisation panel to be in same area as main content 2020-12-07 16:42:55 +09:00
Joehu
0f9b38da08 Add fade in/out animations to mod settings container 2020-12-06 11:35:14 -08:00
Dean Herbert
28daff1716 Stop mod select overlay hotkeys handling input when control is pressed 
Closes https://github.com/ppy/osu/issues/10766 in about the best way we
can for now.
 2020-11-10 17:57:59 +09:00
Dean Herbert
3e326a9234 Use bindable flow for event propagation 2020-10-14 15:22:17 +09:00
Dean Herbert
24eff8c66d Rename container to match "settings" term used everywhere 2020-10-14 15:13:49 +09:00
Leon Gebler
3fd913b13f rename customisation container class 2020-10-13 19:38:25 +02:00
Leon Gebler
663b806974 move ModSettingsContainer to seperate component 2020-10-13 17:45:40 +02:00
Leon Gebler
1a85123b89 rename container class to be more descriptive 2020-10-12 21:24:42 +02:00
Leon Gebler
7df9282727 CodeAnalysis fixes 2020-10-12 15:58:34 +02:00
Leon Gebler
e5548a1216 Move ModSettingsContainer class inside ModSelectOverlay 2020-10-12 00:16:18 +02:00
Joehu
4dacdb9994 Fix mod select overlay absorbing input from toolbar ruleset selector 2020-09-13 11:50:21 -07:00
smoogipoo
94834e4920 Select mods via exact types 2020-07-15 19:35:52 +09:00
smoogipoo
d8ebb8e3eb Move override to a bit better location 2020-07-15 13:17:22 +09:00
Joehu
79f6092344 Fix back button not glowing when closing mod select with escape 2020-07-14 13:31:15 -07:00
Dean Herbert
832fa74a5e Reword comment slightly 2020-04-28 13:26:42 +09:00
Joseph Madamba
a34ec03efc
Reword width comment 
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2020-04-27 12:44:20 -07:00
Joehu
1b9362041a Revert multiplier number changes and set width 
Safe arbitrary width taken from "0.00x" (highest width of 67), rounded to the nearest tenth.
 2020-04-26 19:50:11 -07:00
Joehu
8a47a615db Remove unranked label from footer 2020-04-26 19:29:22 -07:00
Joehu
4b60be87b5 Move unranked label under multiplier number to avoid width changes 2020-04-24 16:34:41 -07:00
Joehu
0f6ec274f9 Add transitions to footer when flowing to another row 2020-04-23 22:44:17 -07:00
Joehu
118db03b56 Fix vertical spacing and score multiplier splitting apart 
Also cleans up margin and its hacks (alignment done with anchor/origin now).
 2020-04-23 22:41:38 -07:00
Joehu
abb687286b Fix score multiplier being cut off in mod select at higher ui scales 2020-04-23 22:34:00 -07:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing 2020-02-04 11:57:54 +09:00
Joehu
22e3150f68 Fix comment and remove magic numbers 2020-02-03 17:21:06 -08:00
Joehu
609ee26030 Fix mod select overlay not showing up in test 2020-02-01 11:41:41 -08:00
Joehu
2d42a83bb9 Fix mod select overlay overflowing toolbar at max ui scale 2020-02-01 11:24:29 -08:00
Dean Herbert
7bf2e9b369 Decouple ModSelectOverlay from global SelectedMods 2020-01-30 17:38:15 +09:00
Dan Balasescu
e988976012
Merge branch 'master' into mod-autoopen 2020-01-23 15:34:19 +09:00
ProTheory8
61d7b63914
Readability Improvement 2020-01-21 09:30:11 +05:00
ProTheory8
41295bc27c Difficulty Adjust mod customisation menu opens automatically now 2020-01-20 21:06:36 +05:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
mcendu
abdebcfddc
switch to changing Mod property 2020-01-14 20:11:32 +08:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert
8052aeb238 Fix potential nullref in disposal logic 2019-12-13 21:36:50 +09:00
Dean Herbert
440a8470e1 Move available mods to global context 
This also tidies up ModSelectOverlay and setting creation flow in general.
 2019-12-13 21:36:50 +09:00
Dean Herbert
5624b9fd3f Fix US english 2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0 Simplify settings update logic 2019-12-11 13:19:02 +09:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Joehu
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
Joehu
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
Joehu
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
Dean Herbert
347373a3ba Fix test failures 2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a Customize -> Customise 2019-12-06 18:59:45 +09:00
Dean Herbert
a5d5099868 Use SettingsSource for mod cusomisation 2019-12-06 17:09:48 +09:00
Dean Herbert
af35df4077 Add multiple mod testing and update test code style 2019-12-06 15:42:11 +09:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods 2019-11-27 19:44:32 +09:00
Albie Spriddell
4cb09df754 increase padding 2019-11-22 18:23:48 +00:00
Andrei Zavatski
0f1a3d97c8 Naming adjustments 2019-11-21 20:34:19 +03:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow 2019-11-12 11:35:01 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
unknown
a92b32f6dc add basic tests 2019-11-05 00:56:09 +08:00
Joehu
fe23b9a262 Fix mod section overflowing mod select overlay at higher ui scale 2019-11-03 07:32:47 -08:00
LeNitrous
9375ef5eea clear settings controls when changing rulesets 2019-10-08 19:42:15 +08:00
LeNitrous
59b2f02828 initial implementation of customizable mods 2019-10-08 18:34:09 +08:00
Bartłomiej Dach
c4dc34eefd Consolidate HoverClickSounds constructors 
As suggested in review, merge both HoverClickSounds constructors into
one accepting optional arguments. Due to existing usages the parameter
is added as second and supplied by name in ModButton.
 2019-09-01 13:10:11 +02:00
Bartłomiej Dach
658e0edc3e Handle other button clicks in HoverClickSounds 
As suggested in review, remove previously introduced HoverMouseUpSounds
and instead change effect playing logic in HoverClickSounds by moving it
out of OnClick() to OnMouseUp().

Users of the class can either use the existing constructor to play
the effect only on left click or use the newly introduced constructor
with the MouseButton[] parameter to specify which button clicks should
trigger the sound.
 2019-08-31 20:16:16 +02:00
Bartłomiej Dach
a1c72db5f6 Fix inconsistent sound effects on mod buttons 
Because HoverClickSounds.OnClick() does not fire upon right clicking
on mod buttons, the sound effects that play on left and right click
were inconsistent. Introduce HoverMouseUpSounds drawable that allows
to play the click sound effect upon mouse up events for an arbitrary
set of mouse buttons and use it on mod buttons.
 2019-08-31 17:01:12 +02:00
Andrei Zavatski
1d42f0959a ModIcon improvements 2019-08-07 08:46:27 +03:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
Dean Herbert
08cf8dd299 Adjust for readability 2019-06-20 01:39:54 +09:00
andy840119
84b4e877f8 using FadeTo instead of show/hide 
headerLabel.FadeTo() is still remain because effect can be visible when expand== true
 2019-06-16 13:27:01 +09:00
andy840119
1a73178260 using FadeTo() instead of FadeIn()/FadeOut() 2019-06-15 13:28:03 +08:00
為什麼
9114c8dee7 remve unnecessary effect. 2019-06-14 11:44:03 +08:00
為什麼
0db9816321 expanded -> expand 2019-06-14 11:23:41 +08:00
為什麼
c30e467717 oops 2019-06-14 11:12:30 +08:00
andy840119
3a14794c43 use show/hide instead because FillFlowContainer's spacing 2019-06-14 01:43:20 +09:00
andy840119
4f0aff3d9c hide label when mod is empty 2019-06-14 01:12:56 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert
8f30c9b0a3 Fix file layout of ModSelectOverlay 2019-06-07 15:58:24 +09:00
Dean Herbert
7ffc08b187
Merge branch 'master' into master 2019-06-07 15:34:14 +09:00
Dean Herbert
b914bb1e2e Remove key hints for now 
A proper design for this will come in the future.
 2019-06-07 15:32:48 +09:00
Dean Herbert
0ce5c7468f Use switch and consume/block input 2019-06-07 15:31:23 +09:00
Welsar55
c04c6693c2 Change close action from PopOut to Hide and switched to TriangleButton.Click() 2019-06-05 13:01:21 -05:00
Welsar55
194bb80354 Added close button and indictors of hotkeys to buttons 2019-06-03 11:09:21 -05:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Welsar55
9e1f2d4fbc Added ability to reset all mods by pressing 1 as present on stable. 2019-05-21 21:48:09 -05: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
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
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09: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
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
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
a25dce53cd
Fix logical regression 2019-01-25 15:03:32 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09: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