1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 14:52:55 +08:00
Commit Graph

480 Commits

Author SHA1 Message Date
Joehu
115cf47ed5 Fix settings sidebar showing scrollbar at max ui scale 2019-08-03 15:20:44 -07:00
Dean Herbert
4c6cccb3a3 Update settings in line with framework changes 2019-07-30 23:31:21 +09:00
smoogipoo
fab3ec3e5b Add maximum height to skin dropdown 2019-07-30 19:28:02 +09:00
Dean Herbert
19e8198bff
Merge branch 'master' into flow_container_insert 2019-07-11 22:53:57 +09:00
Dean Herbert
27e79d56ec
Merge branch 'master' into collapse-graph-option 2019-07-09 23:40:43 +09:00
Salman Ahmed
b10c35b6ab
Update label text
Co-Authored-By: Aergwyn <aergwyn@t-online.de>
2019-07-07 06:13:27 +03:00
Dean Herbert
84919d70bb Health bar -> Health display
Also inverts logic
2019-07-07 05:30:30 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
iiSaLMaN
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
Unknown
ee44caf964 better setting description 2019-07-05 08:52:44 +02:00
Dean Herbert
99da04527d Replays -> scores 2019-07-05 14:07:14 +09:00
Unknown
608223cbb4 Add setting to collapse the song progress graph 2019-07-04 11:59:38 +02:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores 2019-07-04 01:00:42 +09:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud 2019-07-02 05:24:56 +03:00
Salman Ahmed
72e5cbb07f Add checkbox for hiding health bar 2019-07-02 01:45:09 +03:00
Roman Kapustin
0c95dff3d6 Make FlowContainer insertion cleaner 2019-07-01 18:41:08 +03:00
Dean Herbert
3902da9135 Merge remote-tracking branch 'upstream/master' into abstract-menu 2019-06-28 18:13:44 +09:00
Dean Herbert
6d0cc1f770 Remove GC debug setting 2019-06-28 15:59:19 +09:00
smoogipoo
23df1a5d42 Merge remote-tracking branch 'HollyHacker/master' into abstract-menu 2019-06-28 13:42:56 +09:00
HoLLy
55216dffb7 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-27 14:07:17 +02:00
Dean Herbert
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
smoogipoo
fb94cd43a4 Remove unnecessary local item storage in SettingsDropdown 2019-06-25 12:00:05 +09:00
jorolf
4d8f49b9bc update code to work with https://github.com/ppy/osu-framework/pull/2568 2019-06-24 23:17:07 +02:00
HoLLy
f072a53e93 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-21 17:42:59 +02:00
HoLLy
d99f4d1a87 Change import button to mention replays instead of scores 2019-06-21 17:42:54 +02:00
Unknown
1bc1e2459e add SettingsNumberBox and use it in tournament tools 2019-06-21 15:04:52 +02:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
HoLLy
15c75b4442 Add basic score import from stable 2019-06-19 18:33:51 +02:00
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status (#4619)
Split out user activity from user status

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
Dean Herbert
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
Dean Herbert
94e65a3244 Fix settings checkboxes not being searchable 2019-06-12 15:16:59 +09:00
Dean Herbert
b29b1bf254
Merge branch 'master' into mod-grow-improvement 2019-06-12 13:18:02 +09:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
smoogipoo
a9758ba813 Merge remote-tracking branch 'origin/master' into fix-checkbox-overlap 2019-06-11 18:26:42 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Lucas A
141775d98c Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-10 21:41:00 +02:00
Lucas A
2e911d0e96 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-10 19:13:54 +02:00
Shane Woolcock
807d434be0 Access WindowModes via IBindableList 2019-06-09 17:52:02 +09:30
Dean Herbert
d500f3605e Fix checkboxes with long labels overlapping nub 2019-06-09 16:48:03 +09:00
Ganendra Afrasya
49193a2703 Rename the setting label 2019-06-09 13:12:41 +07:00
Ganendra Afrasya
afc3a08953 Use existing setting instead
Now it read IncreaseFirstObjectVisibility bindable instead
2019-06-09 13:11:40 +07:00
Ganendra Afrasya
f326264a85 Adding increase first object grow mod visibility setting 2019-06-08 00:42:57 +07:00
smoogipoo
4d035afcc6 Add setting to bypass front-to-back 2019-06-06 16:49:42 +09:00
Dean Herbert
65e3b7c2ae Remove unused DI 2019-06-03 13:58:55 +09:00
Dean Herbert
4e5788959e Make clickable text actually a button 2019-06-03 13:38:06 +09:00
Dean Herbert
115a75e4c6 Use a constant for lazer variables 2019-06-03 13:16:05 +09:00
Lucas A
d8f45f7299 Disallow null references for dependencies loaded via load() 2019-06-02 15:17:03 +02:00
Lucas A
0a867e37af Resolve dependencies via Resolved Attribute 2019-06-02 12:40:18 +02:00
Lucas A
58564579e4 Invert if statement 2019-06-01 08:46:38 +02:00
Lucas A
0625f51e65 Allow dependencies to be null in certain cases (Unit tests) 2019-05-31 22:42:09 +02:00
Lucas A
55c0c6a1bb Show changelog for current build by clicking on settings footer in settings overlay. 2019-05-31 17:43:58 +02:00
Lucas A
2d966682dc Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-14 18:09:58 +02:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Lucas A
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02: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
Lucas A
88b8afbb6a Make UserPanel show current user activity when
user status is online.
2019-05-05 20:51:55 +02:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36: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
Dean Herbert
2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09: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
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
Shane Woolcock
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
Shane Woolcock
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
Shane Woolcock
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00
Shane Woolcock
94199e628c Only display SupportedWindowModes in settings 2019-02-28 20:20:12 +09:00
Dean Herbert
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +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
Shane Woolcock
ce17e37c74 Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +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
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +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
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
1550908edb Add tooltip to key configuration button 2019-02-15 11:56:33 +09:00
Dean Herbert
a5f1aa644b Fix cursor sensitivity tooltip not updating instantly 2019-01-25 17:30:35 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
1025c51e0d Allow filtering settings matching based on dropdown content 2019-01-23 17:30:05 +09:00
Dean Herbert
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
Bear Daniel
7cdb823c87 Moved "Use beatmap hitsounds" button 2019-01-21 08:04:06 -06:00
Bear Daniel
858541bcf4 Added "Use beatmap hitsounds" button to volume section of settings 2019-01-18 02:33:39 -06:00
nwabear
42fa04beee
Update SkinSection.cs
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
Dean Herbert
93a08bdb23 Remove stray using 2019-01-17 20:23:15 +09:00
Dean Herbert
d16f4af92b Use TransferValueOnCommit for mouse sensitivity 2019-01-17 19:18:40 +09:00
Dean Herbert
5e4bea9d99 Fix extra newline 2019-01-10 12:11:14 +09:00
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
smoogipoo
2c44b928d3 Remove unused references 2019-01-08 16:38:34 +09:00
smoogipoo
daeba63242 Remove more unused code 2019-01-08 16:37:18 +09:00
Dean Herbert
a2a7aa708f Use better logic for setting slider bar settings 2019-01-08 14:56:42 +09:00
Dean Herbert
01aa4c2a72 Use TransferOnCommit 2019-01-08 13:48:38 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
Dean Herbert
3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b Size -> scale 2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642 Delay updates when changes would affect mouse position 2019-01-04 14:55:59 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration 2018-12-14 19:45:27 +09:00
Dean Herbert
4fc9902cd2 Fix reverting to default skin via settings button causing a hard crash 2018-12-12 21:30:21 +09:00
Dean Herbert
1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
smoogipoo
5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
HoLLy
9dd3d28436 Fix SettingsTextBox having width of 0 2018-11-14 22:29:11 +01:00
smoogipoo
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00
smoogipoo
aff5fa6169 Update with osu!-side dropdown changes 2018-11-14 18:02:38 +09:00
Roman Kapustin
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
Roman Kapustin
805f8d98c4 Implement warn about opening external links option 2018-10-22 23:57:37 +03:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dan Balasescu
b1450b1f1a
Merge branch 'master' into fix-3514 2018-10-02 09:24:58 +09:00
AtomCrafty
6c55efdf20 Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode 2018-10-01 13:12:34 +02:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
Dean Herbert
dafbabec31 Fix import buttons having incorrect mappings when setting disabled states 2018-09-21 21:08:21 +09:00
Dean Herbert
1861547c86 Apply review 2018-09-20 19:01:04 +09:00
Hanamuke
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
smoogipoo
73fb3fa3a4 Fix macOS crashing in fullscreen mode 2018-09-19 17:52:35 +09:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
c1cdff8505 Add default resolution to avoid crashing 2018-09-07 19:29:51 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete 2018-09-07 16:48:01 +09:00
Dean Herbert
bf0ad723f5 Add default fallback for headless operation 2018-09-07 14:35:38 +09:00
Dean Herbert
f76d00e8ae Simplify null checks 2018-09-07 14:31:38 +09:00
Dean Herbert
8b217ad803
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-09-07 14:25:10 +09:00
smoogipoo
d5acc96efa Apply changes in line with osu!framework changes 2018-09-05 14:59:37 +09:00
Dean Herbert
581da108fc Rewrite to not suck 2018-09-05 11:32:38 +09:00
Dean Herbert
46b6601cbf Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode 2018-09-05 10:47:34 +09:00
Dean Herbert
5efa9c7652 Fix items in skin settings not always being removed corrrectly 2018-09-03 11:51:03 +09:00
Dean Herbert
144e80dff6 Add "import all skins from stable" option (and mass delete) 2018-09-03 10:10:04 +09:00
smoogipoo
ce367bcc42 Fix invalid GC latency mode being set 2018-08-22 12:02:14 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button 2018-08-02 20:25:45 +09:00