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

9355 Commits

Author SHA1 Message Date
smoogipoo
b56d09c83b Set hitobject placement time manually 2018-10-10 15:32:59 +09:00
smoogipoo
f53bb81723 Remove unnecessary lambda allocation 2018-10-10 14:58:54 +09:00
smoogipoo
417ebaeb85 Reduce hitobject size by removing lazy 2018-10-10 13:03:18 +09:00
smoogipoo
1125075b37 Use list with post-sort for nested hitobjects 2018-10-10 13:02:27 +09:00
Paul Teng
a91dda1a89
Merge branch 'master' into result-no-gamemode-switch 2018-10-09 13:04:53 -04:00
HoLLy
4bd1416a89
Merge branch 'master' into database-standardize-paths 2018-10-09 18:28:44 +02:00
HoLLy
b35f88b8ba Standardize AudioFile and BackgroundImage paths 2018-10-09 17:49:18 +02:00
Paul Teng
ae79c3832e Add base. for safety 2018-10-09 11:05:15 -04:00
Dean Herbert
06ea174f34
Merge branch 'master' into fix-sv 2018-10-09 18:00:34 +09:00
smoogipoo
6d24bde72b Fix beatmap details not displaying 2018-10-09 17:39:27 +09:00
smoogipoo
ccb6723711 Debounce music controller seeks 2018-10-09 16:50:29 +09:00
Dan Balasescu
a2838d32bf
Merge branch 'master' into skinnable-spritetext 2018-10-09 16:23:43 +09:00
Dean Herbert
a171ed3500 Fix joined channels not appearing as joined in the channel list 2018-10-09 16:12:20 +09:00
smoogipoo
9facf707be Add diffcalc beatmap decoder 2018-10-09 11:49:24 +09:00
smoogipoo
b7499fa956 Allow TimingControlPoint to be overridden 2018-10-09 11:34:38 +09:00
Paul Teng
8873fa3fca
Merge branch 'master' into result-no-gamemode-switch 2018-10-08 14:10:51 -04:00
HoLLy
97f8619301 Add database migration for standardizing paths 2018-10-07 21:07:30 +02:00
HoLLy
db443babb6 Fix database entries using platform-specific path separator 2018-10-07 19:15:42 +02:00
Paul Teng
aedb6e3bb7 Remove dedundant this qualifier 2018-10-06 08:12:29 -04:00
Paul Teng
6b236e3f2a Handle non positional input only when opened 2018-10-06 08:06:26 -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
smoogipoo
f7ebd063c3 Make user profile graph use a smooth path 2018-10-05 15:45:53 +09:00
smoogipoo
794501cc5a Fix incorrect result of ternary 2018-10-05 12:06:24 +09:00
smoogipoo
40c17cfa5a Remove ugly if-statement 2018-10-05 11:55:59 +09:00
smoogipoo
cb1703c6e2 Fix colours with alpha components not being parsed 2018-10-05 11:19:01 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
Dean Herbert
716eee9a5c Fix last visit not supporting null values
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
ekrctb
b9d0fc927b Remove duplicated code 2018-10-04 18:03:34 +09:00
Dan Balasescu
20391fd28c
Merge branch 'master' into fix-button-disable-regression 2018-10-04 15:43:50 +09:00
Dean Herbert
d801ce7afb
Merge pull request #3318 from cl8n/update-user-api
Update LastVisit JSON property name
2018-10-04 13:56:37 +09:00
smoogipoo
e931aa3d9e Move positional modifications to HitCirclePlacementMask 2018-10-04 13:43:50 +09:00
Dean Herbert
593dee202c Fix gameplay mouse button disable setting no longer having any effect
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
2018-10-04 03:07:00 +09:00
Dean Herbert
88bcc48204
Merge branch 'master' into fix-screenshot-cursor 2018-10-04 02:34:19 +09:00
smoogipoo
7809ce9361 Fix 1-frame position discrepancy 2018-10-03 17:05:22 +09:00
smoogipoo
934b687965 Fix selection masks not being added for new objects 2018-10-03 16:49:59 +09:00
smoogipoo
34ed60830c Keep the placement hitobject time up-to-date 2018-10-03 16:44:37 +09:00
smoogipoo
3420e0c7eb Re-implement composition tools + implement placement masks 2018-10-03 16:27:26 +09:00
smoogipoo
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
smoogipoo
4cdb6dcea5 Rename HitObjectMask -> SelectionMask 2018-10-03 13:28:00 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +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
97c585c54c Fix cursor not hiding in screenshots 2018-10-02 10:12:07 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup 2018-10-02 09:37:04 +09:00
Dan Balasescu
87d8945af9
Give the body a size 2018-10-02 09:33:31 +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
smoogipoo
b68eeae777 Fix scrolling rulesets not accounting for slider multiplier 2018-10-01 18:12:30 +09:00
Hanamuke
6c1b3cf1a5 Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch 2018-09-30 16:09:27 +02:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc Move judgement text to internal container 2018-09-30 04:01:33 -04:00
Dean Herbert
862d3c4a69 Add back autojoins 2018-09-28 19:33:35 +09:00
Dean Herbert
3cacc11af1 Fix outdated API variable 2018-09-28 19:33:30 +09:00
Dean Herbert
6841d5c2ec Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework 2018-09-28 18:32:59 +09:00
Dean Herbert
d3eb24e70a Fix score retrieval no longer working 2018-09-28 18:29:49 +09:00
Dean Herbert
9baf587246 Bump framework again 2018-09-28 18:25:40 +09:00
Dean Herbert
e1c187b641 Merge remote-tracking branch 'origin/update-chat-api' into update-framework 2018-09-28 18:23:09 +09:00
smoogipoo
3539874262 Add missing scale
Makes about a 1px difference.
2018-09-28 11:40:13 +09:00
Dean Herbert
d5d8a28b53 Add explanatory comment about startup channel joins 2018-09-28 10:01:25 +09:00
Dean Herbert
6a763334a1 Exit early as safety when no messages are received 2018-09-28 10:00:40 +09:00
Dean Herbert
f0b1aa7edf Fix unnecessary messages retrieval 2018-09-27 20:04:22 +09:00
smoogipoo
1c242556ca Add comments + cleanup 2018-09-27 17:40:28 +09:00
smoogipoo
8191f03503 Implement HitCircleFont skin configuration 2018-09-27 17:40:28 +09:00
smoogipoo
0d8276c5f8 Implement skinnable sprite text 2018-09-27 17:40:28 +09:00
smoogipoo
b84994e643 Make GetTexture return the post-scaled texture 2018-09-27 17:40:28 +09:00
Dean Herbert
a4bf21268b Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:59:18 +09:00
Dean Herbert
6f3c8e9f8b Add explicit usage via attribute 2018-09-26 19:58:58 +09:00
Dean Herbert
16d74a5983
Merge pull request #3465 from plankp/patch-1
Check if object to be deleted actually exists
2018-09-26 19:53:51 +09:00
Dean Herbert
2ed7785cfc Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:50:48 +09:00
Dean Herbert
1b77d9fd05 Merge branch 'update-chat-api' into update-framework 2018-09-26 19:50:23 +09:00
Dean Herbert
a77a55d71d Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework 2018-09-26 19:49:41 +09:00
Dean Herbert
b8f19f8640
Merge branch 'master' into judgement-size-fix 2018-09-26 19:42:09 +09:00
Dean Herbert
5197bf77e4
Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions
Fix files with upper-case extensions failing to import correctly
2018-09-26 19:40:00 +09:00
Dean Herbert
1fd2782dd4 Fix loading spinner not disappearing on empty channels 2018-09-26 19:15:02 +09:00
Dean Herbert
2436ee589d Remove incorrect API response 2018-09-26 19:13:38 +09:00
smoogipoo
e259911875 Use invariant tolower 2018-09-26 18:44:03 +09:00
Dan Balasescu
e71e871d1f
Remove unnecessary comment 2018-09-26 18:41:55 +09:00
Dan Balasescu
3a5e380e46
Merge branch 'master' into judgement-size-fix 2018-09-26 18:36:12 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760 Update chat to work with new API version 2018-09-25 20:53:24 +09:00
smoogipoo
cb500e80e4 Make BeatmapInfoWedge present until info is not null 2018-09-25 14:45:26 +09:00
Paul Teng
319ed1bf0f Reorder if statement 2018-09-24 21:35:13 -04:00
Paul Teng
dd36b6a381 Remove unused field storage 2018-09-24 21:08:58 -04:00
Paul Teng
b95cc798b2 Remove unused fallback 2018-09-24 20:56:18 -04:00
Paul Teng
62df0ec7d4 Handle external files with File instead 2018-09-24 07:16:19 -04:00
Kyle Chang
7a43677849 Make judgements scale with cs 2018-09-22 22:54:38 -04:00
Dean Herbert
6efecc4b35 Fix files with upper-case extensions failing to import correctly 2018-09-23 05:23:49 +09:00
Dean Herbert
dafbabec31 Fix import buttons having incorrect mappings when setting disabled states 2018-09-21 21:08:21 +09:00
Paul Teng
ed0ea3ad41
Merge branch 'master' into patch-1 2018-09-21 06:31:15 -04:00
smoogipoo
4380ef15bf Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
Dan Balasescu
c1604145df
Merge branch 'master' into background-brightness 2018-09-21 16:20:32 +09:00
smoogipoo
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7 Make Playfield not a ScalableContainer 2018-09-21 14:02:32 +09:00
Paul Teng
f01dfc2860
Merge branch 'master' into patch-1 2018-09-20 23:45:44 -04:00
Paul Teng
eaf7697b85 Add boolean return value 2018-09-20 23:21:27 -04:00
Dean Herbert
293a5dd099 Use string interpolation 2018-09-21 11:50:36 +09:00
Paul Teng
654345f380 Remove duplicate condition test 2018-09-20 22:32:24 -04:00
Paul Teng
1644719893 Update SongSelect.cs 2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a Test if there are beatmaps when click on delete btn 2018-09-20 22:00:20 -04:00
Paul Teng
52877eca83
Update ArchiveModelManager.cs 2018-09-20 20:01:04 -04:00
Dean Herbert
83bf38f4bc Make menu background blurrable
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510 Fade menu background a bit when menu is active 2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5 Use random default background on starting the game 2018-09-21 03:12:20 +09:00
Dean Herbert
fa33e0bd6b Fix background brightness being adjusted globally 2018-09-21 02:51:14 +09:00
Paul Teng
199d76217e
Merge branch 'master' into patch-2 2018-09-20 06:47:42 -04:00
Dean Herbert
aa453f8ff8 Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework 2018-09-20 19:03:49 +09:00
Dean Herbert
1861547c86 Apply review 2018-09-20 19:01:04 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
Dean Herbert
5ee4130351 Update framework reference 2018-09-20 18:39:44 +09:00
Dan Balasescu
4b907336c5
Move readonly field above ctor 2018-09-20 13:17:17 +09:00
smoogipoo
62135c39aa Cleanup 2018-09-20 12:56:39 +09:00
smoogipoo
04cd68f970 Hide status pill when status is none 2018-09-20 12:53:45 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
Hanamuke
309d8c8cb4 CI 2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Dean Herbert
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5 Merge branch 'localisation-changes' into update-framework 2018-09-20 00:29:31 +09:00
smoogipoo
73fb3fa3a4 Fix macOS crashing in fullscreen mode 2018-09-19 17:52:35 +09:00
smoogipoo
38a3c2a820 Fix song select wedge sometimes not updating when localisation changes 2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
ekrctb
c8e9d9375f Use new InputStateChangeEvent for RulesetInputManager 2018-09-19 11:36:55 +09:00
Hanamuke
6d229716e7 Remove unused using directives 2018-09-18 20:42:55 +02:00
Hanamuke
2afcdb1451 Add the file 2018-09-18 20:23:25 +02:00
Hanamuke
e3cc25a96a Implement ConstantScrollingSpeedVisualiser 2018-09-18 20:21:10 +02:00
Dan Balasescu
ad31962643
Cleanup, use similar code to everywhere else 2018-09-18 15:27:21 +09:00
LastExceed
27ea6102bc only return true on Mclick 2018-09-18 08:07:19 +02:00
Dan Balasescu
af6618a239
Merge branch 'master' into close-chattabs-with-Mclick 2018-09-18 14:52:56 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
Dan Balasescu
9f1f879f3d
Merge branch 'master' into music-controller-topmost 2018-09-18 13:56:13 +09:00
Dan Balasescu
29e023b252
Merge branch 'master' into fix_combo 2018-09-18 12:54:51 +09:00
smoogipoo
aba1de8b1a Cleanup 2018-09-18 12:54:07 +09:00
Paul Teng
8bfd981a50 Handle directory checking before entering task 2018-09-17 21:05:28 -04:00
Paul Teng
000beea01b
Merge branch 'master' into patch-2 2018-09-17 15:20:54 -04:00
LastExceed
ed01f3067f
Merge branch 'master' into close-chattabs-with-Mclick 2018-09-15 18:05:01 +02:00
LastExceed
fce9740f28 return true since we are handling the action 2018-09-15 18:00:47 +02:00
Dean Herbert
00d0613053 Fix new resharper redundant parenthesis inspections 2018-09-16 00:09:17 +09:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Paul Teng
d469748612 Reformat code 2018-09-15 09:53:59 -04:00
Paul Teng
42b2c32222 Catch directory not found exception 2018-09-15 09:47:50 -04:00
Dean Herbert
6a1e2c6fa5 Update efcore packages 2018-09-15 18:49:01 +09:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead 2018-09-15 18:33:22 +09:00
Dean Herbert
79b56cb35c Make saveState private 2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2 Simplify implementation 2018-09-15 14:51:04 +09:00
Hanamuke
3e7006ec1f Fix fonction name 2018-09-14 19:52:32 +02:00
Hanamuke
c8d3776c79 Remove uneeded brackets 2018-09-14 19:46:04 +02:00
Hanamuke
347cb0a1b5 Check for type conversion, mais the update recursive 2018-09-14 19:41:29 +02:00
Hanamuke
a17200a66a Merge branch 'master' into fix_combo 2018-09-14 18:48:13 +02:00
LastExceed
9f546bd484 close tab on Mclick 2018-09-14 13:50:35 +02:00
Dean Herbert
1662575f88
Merge branch 'master' into replay_keycounter 2018-09-14 19:08:54 +09:00
Dean Herbert
a1328fb4e5
Merge branch 'master' into fix-system-user 2018-09-14 17:19:17 +09:00
Hanamuke
b8afd01950 Merge branch 'master' into fix_combo 2018-09-13 21:55:19 +02:00
Hanamuke
1c2cc3837a Compute combo for nested Objects. Display fruit depending on Combo for
osu!catch
2018-09-13 21:52:15 +02:00
Dean Herbert
c6b909e4a5
Merge branch 'master' into judgement-fixes 2018-09-14 04:03:54 +09:00
Unknown
04853b8c83 don't show StatusPill without a difficulty 2018-09-13 13:49:57 +02:00
Unknown
638a2e5ba8 populate Status for Beatmap + BeatmapSet
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
Unknown
5414ce9932 add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet 2018-09-13 10:18:20 +02:00
Unknown
13b988053a add status column to BeatmapInfo + BeatmapSetInfo 2018-09-13 10:10:58 +02:00
Unknown
221a99d886 fix StatusPill not setting text when initially set with NONE 2018-09-13 10:07:26 +02:00
Dean Herbert
4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
Dean Herbert
0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
smoogipoo
067bc39185 Update nuget package 2018-09-13 12:47:26 +09:00
Dan Balasescu
96b4cb7821
Merge branch 'master' into texture-dispose-fix 2018-09-13 11:54:23 +09:00
Dan Balasescu
04f49200e2
Merge branch 'master' into fix-collection-modified 2018-09-13 11:43:48 +09:00
smoogipoo
356a60b561 Fix hitobjects in scrolling rulesets getting masked away 2018-09-12 15:14:51 +09:00
Dean Herbert
02313c6d6e Wait longer before confirming test players are cleaned up 2018-09-11 13:21:05 +09:00
smoogipoo
9b0954ab81 Reference whether texture is available rather than disposed 2018-09-11 11:28:02 +09:00
Dean Herbert
7c7f0e11e3
Merge branch 'master' into fix-logo-overhead 2018-09-11 01:22:44 +09:00
Dean Herbert
144779c698 Update framework 2018-09-11 00:30:13 +09:00
smoogipoo
92386edb32 Scale the results screen score to keep it in view 2018-09-10 18:13:44 +09:00
Dean Herbert
55372496d1 Fix thread-safety of queued events list in ArchiveModelManager 2018-09-09 22:37:15 +09:00
Dean Herbert
27ac7685e1 Bring music controller in front of notification overlay 2018-09-09 22:12:37 +09:00
Dean Herbert
f149a66a4d Use LargeTextureStore for all online texture retrieval
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.
2018-09-09 02:45:37 +09:00
Dean Herbert
0f9aa834e5 Fix osu! logo being present throughout the whole game 2018-09-08 16:31:59 +09:00
Roman Kapustin
125b569ccb Change AudioClock type to IFrameBasedClock and comment its usage 2018-09-07 21:39:41 +03:00
Roman Kapustin
dae54d252d Remove redundant checks in RestoreState 2018-09-07 21:35:32 +03:00
Dean Herbert
6c150c9ed7 Remove unnecessary override 2018-09-08 03:21:42 +09:00
Dean Herbert
c1cdff8505 Add default resolution to avoid crashing 2018-09-07 19:29:51 +09:00
Dean Herbert
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
Dean Herbert
7cca990be4 Merge remote-tracking branch 'upstream/master' into framework-image-changes 2018-09-07 18:56:00 +09:00
Dean Herbert
bb67f1a361 Merge remote-tracking branch 'upstream/master' into add-skin-import-delete 2018-09-07 18:18:03 +09:00
Dean Herbert
75d2cb199c Fix formatting 2018-09-07 18:14:27 +09:00
Dean Herbert
168dbe9329 Fix error notification 2018-09-07 18:14:23 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete 2018-09-07 16:48:01 +09:00
Dean Herbert
2c0ba401d5 Add ability to click on imported complete notification to present last import 2018-09-07 16:30:11 +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
Dean Herbert
1327aed164 Update framework again 2018-09-06 19:23:19 +09:00
Dean Herbert
01389f0443 Merge remote-tracking branch 'upstream/master' into update-framework-with-everyrthing 2018-09-06 18:04:58 +09:00
Dean Herbert
da906c0ddf Update framework 2018-09-06 18:03:27 +09:00
Dean Herbert
a1780fddc9 DrawInfo -> DrawColourInfo 2018-09-06 18:02:04 +09:00
Dean Herbert
ab7c0ccd18 Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing 2018-09-06 18:00:54 +09:00
Dean Herbert
966101e50e Merge branch 'framework-refcount-changes' into update-framework-with-everyrthing 2018-09-06 18:00:36 +09:00
Dean Herbert
2ba7885e58 Merge branch 'unload-carousel-panels' into update-framework-with-everyrthing 2018-09-06 18:00:25 +09:00