1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 16:42:53 +08:00
Commit Graph

14410 Commits

Author SHA1 Message Date
Dan Balasescu
83ca3053c5
Merge branch 'master' into break-overlay-double-parallax 2018-08-24 15:10:28 +09:00
Dean Herbert
5ec1a5a774
Merge pull request #3296 from peppy/fix-notifications-too-early
Fix notifications appearing too early in load process
2018-08-24 15:09:03 +09:00
Dan Balasescu
2fee90dbd8
Merge branch 'master' into fix-notifications-too-early 2018-08-24 15:02:17 +09:00
Dan Balasescu
0802dbdce5
Merge pull request #3308 from smoogipoo/decoder-logging
Log the format line when a decoder isn't found
2018-08-24 10:45: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
Dean Herbert
dc8bcb2a18
Merge pull request #3298 from smoogipoo/fix-canceledexception
Fix operation cancelled exception when changing visual settings
2018-08-23 23:02:22 +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
Dean Herbert
de31187de6
Merge pull request #3294 from smoogipoo/more-empty-archive-logging
Log all files when no beatmap files in archive error occurs
2018-08-23 11:10:49 +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
601ae43e87
Merge pull request #3293 from smoogipoo/allow-2b-mania-conversion
Allow 2B maps to be converted to mania
2018-08-23 09:43:36 +09:00
smoogipoo
6475dfaeef Allow 2B maps to be converted to mania 2018-08-23 09:19:33 +09:00
miterosan
0a48f8eadd remove empty object ctar args 2018-08-22 21:39:59 +02:00
miterosan
6600f7b30e correct the namings and styling 2018-08-22 21:27:20 +02:00
miterosan
957a026c08 Merge branch 'ArrangeMod' of https://github.com/miterosan/osu into ArrangeMod 2018-08-22 21:20:49 +02:00
miterosan
5c5191b9c3 Rename the mod class to transform. 2018-08-22 21:19:28 +02:00
miterosan
173d12c1ec rename arrange to transform 2018-08-22 21:17:18 +02:00
miterosan
c374755cc8 only affect spinner, hitcircle and slider and nothing else. 2018-08-22 21:16:45 +02:00
miterosan
d070a3e2d8 Only affect hitcicles, slider and spinner 2018-08-22 20:46:03 +02:00
Dean Herbert
9cbead55d6 Add a second parallax layer to break overlay arrows 2018-08-22 17:41:13 +09:00
Dean Herbert
cd3e9b7d54
Merge pull request #3287 from smoogipoo/no-objects-logging
Soft-handle errors when beatmap contains no objects
2018-08-22 16:52:34 +09:00
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