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

9052 Commits

Author SHA1 Message Date
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
smoogipoo
21d5322899 Update with async changes 2018-08-27 17:05:58 +09:00
Dean Herbert
5c7ff31675 Add note about null return 2018-08-25 14:51:42 +09:00
Dean Herbert
8204d3292e Log to correct file 2018-08-25 14:50:46 +09:00
smoogipoo
aeb4d47c06 Remove skipping part of message 2018-08-24 18:07:39 +09:00
smoogipoo
99574ecad8 Softly handle errors when no beatmap file exists in archive 2018-08-24 17:57:39 +09:00
Dean Herbert
59d6ccbaab Update framework 2018-08-24 15:27:13 +09:00
Dean Herbert
196fc03180 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-08-24 15:26:46 +09:00
Dean Herbert
ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
Dan Balasescu
83ca3053c5
Merge branch 'master' into break-overlay-double-parallax 2018-08-24 15:10:28 +09:00
Dan Balasescu
2fee90dbd8
Merge branch 'master' into fix-notifications-too-early 2018-08-24 15:02:17 +09:00
smoogipoo
55370165c0 Compare with invariant culture 2018-08-24 10:12:30 +09:00
smoogipoo
407968bb7e Log the format line when a decoder isn't found 2018-08-24 10:03:56 +09:00
smoogipoo
90ebabd2db Fix nullref 2018-08-23 15:21:36 +09:00
smoogipoo
c7db407832 Fix operation cancelled exception when changing visual settings 2018-08-23 14:53:16 +09:00
Dean Herbert
9f3f07df2e Fix notifications appearing too early in load process 2018-08-23 11:21:56 +09:00
smoogipoo
8f261988f7 Log all files when no beatmap files in archive error occurs 2018-08-23 10:59:21 +09:00
Dean Herbert
9cbead55d6 Add a second parallax layer to break overlay arrows 2018-08-22 17:41:13 +09:00
Dean Herbert
1c3614d6e8
Merge branch 'master' into no-objects-logging 2018-08-22 16:42:21 +09:00
Dean Herbert
985528d08b
Merge branch 'master' into more-import-logging 2018-08-22 16:30:55 +09:00
Dean Herbert
f1c6dfd735
Change grammar slightly 2018-08-22 16:22:29 +09:00
Dean Herbert
c6df93c438
Merge branch 'master' into invalid-obj-types 2018-08-22 16:21:17 +09:00
smoogipoo
2fb62827e2 Soft-handle errors when beatmap contains no objects 2018-08-22 16:01:58 +09:00
smoogipoo
551581e5cd Skip invalid hitobject types, log error instead 2018-08-22 15:59:58 +09:00
smoogipoo
bdd618a99d Log the archive when failing to create model 2018-08-22 15:42:43 +09:00
smoogipoo
df84889646 Handle invalid origins as Anchor.TopLeft 2018-08-22 14:50:03 +09:00
smoogipoo
50b8daf939 Fix threads being cross-disposed from DatabaseContextFactory 2018-08-22 14:07:52 +09:00
smoogipoo
ce367bcc42 Fix invalid GC latency mode being set 2018-08-22 12:02:14 +09:00
Dean Herbert
859e2504c0
Merge pull request #3268 from peppy/update-framework
Update framework
2018-08-21 21:13:08 +09:00
Dean Herbert
4cd21fabf3
Remove extra newlines 2018-08-21 19:16:07 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button 2018-08-21 19:15:20 +09:00
Dean Herbert
c97548804e Update framework 2018-08-21 18:46:44 +09:00
Dan Balasescu
c4264794e0
Merge branch 'master' into relax 2018-08-21 12:11:10 +09:00
smoogipoo
fcf98390f5 Cleanup 2018-08-21 12:10:00 +09:00
smoogipoo
541c4daa81 Use ordinal string comparison in hot paths 2018-08-21 11:10:54 +09:00
Dan Balasescu
1d50dacacd
Merge branch 'master' into catch-cancelled 2018-08-21 10:24:11 +09:00
Dan Balasescu
9d2c679f12
Merge branch 'master' into fix-logo-flying 2018-08-21 10:16:03 +09:00
Dean Herbert
4a68b14447 Fix crash when selecting mods after entering play mode
Closes #3260.
2018-08-21 00:15:51 +09:00
Dean Herbert
7add4a8cc7 Update framework 2018-08-20 18:26:34 +09:00
Dean Herbert
295ccabf64 Expand out on to multiple lines 2018-08-20 16:06:12 +09:00
Dean Herbert
39aa98d12d Fix logo flying off-screen when exiting game 2018-08-20 14:58:02 +09:00
Dean Herbert
65dc9f44e5 Catch OperationCanceledException in single file load sequence 2018-08-20 14:42:37 +09:00
Dean Herbert
18aa30fcb0 Unbind song select's ruleset to avoid test failures 2018-08-20 14:27:32 +09:00
Dean Herbert
e982901205 Merge remote-tracking branch 'smoogipoo/screenshot-fix' into update-framework 2018-08-20 13:38:07 +09:00
Dean Herbert
6b0ed4a68d Update framework 2018-08-20 13:37:59 +09:00
Dean Herbert
6a4ff19c90
Merge branch 'master' into relax 2018-08-17 23:17:07 +09:00
smoogipoo
9a1e92800b Adjust with framework-side screenchanges 2018-08-17 14:30:44 +09:00
Dan Balasescu
e7e14cc76c
Merge branch 'master' into log-display-fix 2018-08-17 14:15:14 +09:00
Dean Herbert
5ddef1afed
Merge pull request #3245 from smoogipoo/import-output
Output the currently importing model
2018-08-17 13:57:57 +09:00
smoogipoo
83bda313d1 Output the currently importing model 2018-08-17 13:50:27 +09:00
smoogipoo
16d30f6756 Add explanatory comments 2018-08-17 13:31:12 +09:00
Dean Herbert
7a8aabc402 Fix notifications suggesting automatic reporting in non-deployed builds 2018-08-17 13:18:48 +09:00
Dean Herbert
49f455e55d
Merge branch 'master' into spinner-combo-fix 2018-08-17 12:59:36 +09:00
Dean Herbert
0ae487b9c9 Add back missing statement 2018-08-17 12:27:36 +09:00
Dean Herbert
4aedd252fb
Merge branch 'master' into spinner-combo-fix 2018-08-17 12:07:37 +09:00
Dean Herbert
83dc01d07c Fix multiple sentry reports arriving for similar exceptions 2018-08-17 12:05:21 +09:00
smoogipoo
eb6f1ae72c Fix spinners providing one extra combo 2018-08-17 09:16:28 +09:00
Dean Herbert
9f5a6457f2 Don't forward errors to sentry for local builds 2018-08-17 09:08:58 +09:00
Dean Herbert
12b81df2f3 Fix unhandled exception on startup when arguments are present 2018-08-16 22:01:04 +09:00
Dean Herbert
ff0dfa7acf
Merge branch 'master' into relax 2018-08-16 17:36:24 +09:00
Dean Herbert
6297ad95aa Remove test exception 2018-08-16 16:49:06 +09:00
Dean Herbert
9f55afe569 Let user know automatic reporting happened 2018-08-16 16:44:12 +09:00
Dean Herbert
9fc0a75b71
Merge branch 'master' into sentry-logging 2018-08-16 13:33:24 +09:00
ekrctb
cf4cb934cf
Merge branch 'master' into fix-combo-colours 2018-08-16 10:45:54 +09:00
Roman Kapustin
8a9b3f6459 Remove rewinded keycounter states 2018-08-15 22:18:48 +03:00
smoogipoo
85dc42d47a Re-namespace/rename CircularButton 2018-08-15 16:49:53 +09:00
smoogipoo
add78508e0 Update framework 2018-08-15 15:54:26 +09:00
smoogipoo
767c284793 Fix import not working 2018-08-15 15:49:55 +09:00
smoogipoo
4dfb63023f Update with recent changes 2018-08-15 15:49:48 +09:00
smoogipoo
d0c9e2257b Merge remote-tracking branch 'origin/master' into framework-storage-update 2018-08-15 14:54:09 +09:00
smoogipoo
539dd3134f Fix beatmap processor not setting combo index on first object 2018-08-15 11:48:50 +09:00
smoogipoo
4c3e551295 Fix first object not receiving new combo
Note: If a normal catch fruit is the first object, it does not receive a new combo...
2018-08-15 11:48:28 +09:00
smoogipoo
31f324945e Implement combo offsets 2018-08-15 11:47:31 +09:00
smoogipoo
da3e2cfee2 Catch/osu! spinners should have combo 2018-08-15 11:13:23 +09:00
smoogipoo
4f0305ffeb Taiko convert hitobjects should not have combo 2018-08-15 10:58:59 +09:00
smoogipoo
83f75ac896 Mania convert hitobjects should not have combo 2018-08-15 10:57:11 +09:00
smoogipoo
8faf12579a Fix field not being set correctly 2018-08-15 10:53:25 +09:00
smoogipoo
d2709613bc Add combo offset to ConvertHitObjectParser 2018-08-15 10:49:45 +09:00
smoogipoo
ce77473910 Simplify usage of ConvertHitObjectParser 2018-08-15 10:24:56 +09:00
Dean Herbert
9cdaefb64b
Merge branch 'master' into extend-modoverlay 2018-08-15 09:23:44 +09:00
smoogipoo
aa3f6337a2 Add comment 2018-08-15 09:14:07 +09:00
Dean Herbert
607769c9ce
Merge branch 'master' into fix-rewinding 2018-08-15 08:45:34 +09:00
smoogipoo
e04b2f4fa9 Fix hitobject results not rewinding 2018-08-14 18:31:32 +09:00
smoogipoo
e360985d73 Replace variables into the entire line 2018-08-14 18:15:09 +09:00
smoogipoo
f69bc23ab8 Overflow mod select to account for parallax 2018-08-14 17:26:25 +09:00
Dean Herbert
5112f9b69f
Merge branch 'master' into fix-ruleset-change 2018-08-14 14:48:09 +09:00
smoogipoo
970aa811bd Fix mods not being reset prior to ruleset changing 2018-08-14 13:19:50 +09:00
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework 2018-08-14 13:16:16 +09:00
smoogipoo
b8824a41b5 Fix certain control points not being replaced 2018-08-14 11:44:53 +09:00
smoogipoo
2a5b9f79ff Indent 2018-08-08 15:49:27 +09:00
smoogipoo
ee0cefdd5b Merge remote-tracking branch 'origin/master' into direct-list-view 2018-08-08 15:48:34 +09:00
smoogipoo
bfbe00e6ec Remove multiple caching 2018-08-08 15:38:09 +09:00
Dean Herbert
4453b5faca Cache mods at PlaySongSelect 2018-08-08 12:43:08 +09:00
Dean Herbert
70ce9da321
Merge branch 'master' into judgement-rework 2018-08-07 18:09:06 +09:00
Dean Herbert
4cb7063801 Add automated testing of mod preservation/removal 2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c Fix mod selection not restoring when re-entering song select 2018-08-07 14:49:44 +09:00
Dean Herbert
7233e863db Update framework 2018-08-07 01:07:50 +09:00
Dan Balasescu
12b99acb2b
Merge branch 'master' into add-loading-animation 2018-08-06 13:06:51 +09:00
smoogipoo
60c94a8ea3 Fix ScoreProcessor.ApplyBeatmap never being called 2018-08-06 12:42:54 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo
2a54b5b78d ResetResult -> RevertResult 2018-08-06 12:29:22 +09:00
smoogipoo
c48a4d9993 Add exception 2018-08-06 12:29:12 +09:00
smoogipoo
3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo
0d6a8a2bf5 More xmldocs 2018-08-06 11:31:54 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
ab642b563f CreateJudgementResult -> CreateResult 2018-08-06 11:07:41 +09:00
smoogipoo
754f3c8621 Move result creation to load(), add exceptions 2018-08-06 11:07:05 +09:00
smoogipoo
b35817c877 More xmldocs to hitobject/drawablehitobject 2018-08-06 10:55:38 +09:00
smoogipoo
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
WebFreak001
b33954d9db Implement blinds mod 2018-08-05 14:20:56 +02:00
WebFreak001
b011edd85d added Overlays container to RulesetContainer
this is required for mods such as flashlight which always want to draw
objects above hitcircles. If just adding children to a RulesetContainer
the hit circles would always be above the added children (no matter
the Depth).
2018-08-05 13:12:31 +02:00
tgi74000
b1d1a2400b Remove IUpdatableByHitObject completely 2018-08-05 09:52:19 +02:00
Dean Herbert
6d6fea47ab Reduce animations of osu!direct list mode
The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.
2018-08-05 14:36:09 +09:00
tgi74000
07d6a75e23 Rename variables to be human readable 2018-08-04 00:18:09 +02:00
Dan Balasescu
1981b94e32
Merge branch 'master' into fix-fade-discrepancies 2018-08-04 00:21:48 +09:00
Dean Herbert
808754a191
Merge branch 'master' into fix-fade-discrepancies 2018-08-03 21:50:03 +09:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation 2018-08-03 21:50:02 +09:00
Dean Herbert
46b3ba9edb
Merge branch 'master' into scroll-chat-on-message 2018-08-03 21:50:00 +09:00
Dean Herbert
8d98826f69 Update framework 2018-08-03 21:17:17 +09:00
tgi74000
7310c38df9 Add relax mod 2018-08-03 14:03:11 +02:00
Dean Herbert
fc8526d8ba
Merge branch 'master' into scroll-chat-on-message 2018-08-03 20:09:54 +09:00
Dean Herbert
b4ef3dd4dd Add LocalMessage 2018-08-03 20:03:43 +09:00
Dean Herbert
4c57e629ff Use private implementation 2018-08-03 19:32:34 +09:00
Dan Balasescu
e3490b1270
Merge branch 'master' into improve-visual-settings-preview 2018-08-03 19:29:12 +09:00
Dean Herbert
2ea90ef98a Add sentry logging 2018-08-03 19:25:55 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections 2018-08-03 18:48:31 +09:00
smoogipoo
482526135f Make IsHit not consider nested hitobjects 2018-08-03 16:07:20 +09:00
smoogipoo
2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
jorolf
123f304cf1 update storage usages 2018-08-02 19:24:17 +02:00
smoogipoo
35b4ab5456 Introduce the concept of a "MainResult" 2018-08-02 21:07:40 +09:00
smoogipoo
8d81e66f88 Fix osu score processor crashing 2018-08-02 21:07:11 +09:00
Dean Herbert
6ee06602b8
Merge branch 'master' into mania-mask-container 2018-08-02 20:41:27 +09:00
smoogipoo
3619290c34 Split out judgement definition from judgement result 2018-08-02 20:35:54 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button 2018-08-02 20:25:45 +09:00
Dean Herbert
b1afcf0e5d Add loading animation to player loader to make it more obvious when loading is complete 2018-08-02 19:47:50 +09:00
Dean Herbert
7097ecb740 Fix discrepancies in how elements of play mode fade when restarting/exiting 2018-08-02 19:08:23 +09:00
Dean Herbert
4a11f2ec2a Improve UX when adjusting visual settings at loading screen 2018-08-02 18:18:55 +09:00
Dean Herbert
9fdba887e4
Merge branch 'master' into fix-playerloader-ready-check 2018-08-02 11:37:45 +09:00
Dean Herbert
70ee7e4afd Scroll chat to end of buffer when posting a new message 2018-08-02 08:00:14 +09:00
smoogipoo
d51d0e8547 Initial structure for new hitobject judgement system 2018-08-01 21:45:59 +09:00
smoogipoo
41512667a8 Require all judgements to be present for map completion 2018-08-01 19:51:24 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
smoogipoo
10b8708d4e Make SetupCircularButton adjust corner radius by height 2018-08-01 17:47:32 +09:00
smoogipoo
9eb47ae691 Make SetupCircularButton inherit OsuButton 2018-08-01 17:02:52 +09:00
smoogipoo
b9814b64ed Move default button implementation from TriangleButton to OsuButton 2018-08-01 17:02:38 +09:00
Dean Herbert
4224d35a75 Use forked squirrel
Allows for updating SharpCompress, too.
2018-08-01 16:56:36 +09:00
ekrctb
ecc6d55380 Fix player loader not gets ready when multiple mouse button is down 2018-08-01 16:20:29 +09:00
Dean Herbert
3d136bf207 Remove unused nuspec 2018-08-01 03:37:59 +09:00
Shane Woolcock
4fdca2b198 Update framework 2018-07-31 21:21:26 +09:30