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 |
|