1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 21:43:21 +08:00
Commit Graph

14257 Commits

Author SHA1 Message Date
Dean Herbert
1c3614d6e8
Merge branch 'master' into no-objects-logging 2018-08-22 16:42:21 +09:00
Dean Herbert
d0c1091e72
Merge pull request #3285 from smoogipoo/more-import-logging
Log the archive when failing to create model
2018-08-22 16:35:01 +09:00
Dean Herbert
985528d08b
Merge branch 'master' into more-import-logging 2018-08-22 16:30:55 +09:00
Dean Herbert
ba048275fa
Merge pull request #3283 from smoogipoo/invalid-obj-types
Skip invalid hitobject types, log error instead
2018-08-22 16:30:31 +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
Dean Herbert
cfc64fb62a
Merge pull request #3280 from smoogipoo/invalid-sb-origins
Handle invalid storyboard origins as Anchor.TopLeft
2018-08-22 16:20:04 +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
Dean Herbert
47ec139700
Merge pull request #3279 from smoogipoo/fix-dbcontext-disposal
Fix threads being cross-disposed from DatabaseContextFactory
2018-08-22 14:22:29 +09:00
smoogipoo
50b8daf939 Fix threads being cross-disposed from DatabaseContextFactory 2018-08-22 14:07:52 +09:00
Dean Herbert
0d4dbee34b
Merge pull request #3276 from smoogipoo/fix-invalid-latencymode
Fix invalid GC latency mode being set
2018-08-22 12:10:44 +09:00
smoogipoo
ce367bcc42 Fix invalid GC latency mode being set 2018-08-22 12:02:14 +09:00
Dean Herbert
1a51e5b56a
Merge pull request #3273 from smoogipoo/fix-swell-isstrong
Fix taiko beatmap conversion attempting to make strong swells
2018-08-22 11:49:17 +09:00
Dean Herbert
f36fe1040a
Merge branch 'master' into fix-swell-isstrong 2018-08-22 11:40:48 +09:00
smoogipoo
2bc827fa0c Fix taiko beatmap conversion attempting to make strong swells 2018-08-22 11:32:00 +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
7f42b57388
Merge pull request #3088 from AlFasGD/circular-button
Refactor OsuButton and TriangleButton inheritance relation
2018-08-21 21:12:59 +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
Dean Herbert
63b596f75a
Merge pull request #3267 from smoogipoo/fix-stacking
Fix hitobject stacking being applied too early
2018-08-21 18:33:24 +09:00
smoogipoo
8b795cd52a Add very simple stacking test 2018-08-21 17:22:28 +09:00
smoogipoo
d14dad64e8 Fix hitobject stacking being applied too early 2018-08-21 16:01:28 +09:00
Dean Herbert
1984ae6d0b
Merge pull request #3266 from smoogipoo/remove-override
Remove sliderball's ReceiveMouseInput override
2018-08-21 13:04:04 +09:00
smoogipoo
34b1abeca3 Remove sliderball's input override 2018-08-21 12:24:48 +09:00
Dan Balasescu
6d446e1502
Merge pull request #3172 from tgi74/relax
Implement Relax mod
2018-08-21 12:24:17 +09:00
Dan Balasescu
c4264794e0
Merge branch 'master' into relax 2018-08-21 12:11:10 +09:00
Dean Herbert
9182302254
Merge pull request #3265 from smoogipoo/storyboard-hotpath
Slightly improve performance of beatmap/storyboard parsing
2018-08-21 12:10:37 +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
a8b20b8b98
Merge pull request #3255 from peppy/catch-cancelled
Catch OperationCanceledException in single file load sequence
2018-08-21 10:32:08 +09:00
Dan Balasescu
1d50dacacd
Merge branch 'master' into catch-cancelled 2018-08-21 10:24:11 +09:00
Dan Balasescu
0711f30395
Merge pull request #3256 from peppy/fix-logo-flying
Fix logo flying off-screen when exiting game
2018-08-21 10:24:03 +09:00
Dan Balasescu
9d2c679f12
Merge branch 'master' into fix-logo-flying 2018-08-21 10:16:03 +09:00
Dan Balasescu
d921d50e11
Merge pull request #3262 from peppy/fix-mod-crash
Fix crash when selecting mods after entering play mode
2018-08-21 10:10:30 +09:00
Dan Balasescu
9f985928f6
Merge branch 'master' into fix-mod-crash 2018-08-21 10:00:48 +09:00
Dean Herbert
3551005071
Merge pull request #3263 from smoogipoo/fix-string-interp
Fix missed string interpolation
2018-08-21 09:25:50 +09:00
smoogipoo
da13266ae9 Fix missed string interpolation 2018-08-21 09:17:44 +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
0501d58f70
Merge pull request #3258 from peppy/update-framework
Update framework
2018-08-20 18:43:30 +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
9376a4fe49
Merge pull request #3253 from peppy/update-framework
Update framework
2018-08-20 14:34:49 +09:00
Dean Herbert
18aa30fcb0 Unbind song select's ruleset to avoid test failures 2018-08-20 14:27:32 +09:00
Dean Herbert
e628e78f24 Update uniform usage 2018-08-20 13:39:22 +09:00