1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Commit Graph

14267 Commits

Author SHA1 Message Date
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
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
Dean Herbert
41f8609e0f Also handle OnScroll 2018-08-17 20:13:14 +09:00
Dean Herbert
442f6795bc Block user input 2018-08-17 19:33:14 +09:00
Dean Herbert
29df5b5353
Merge pull request #3241 from smoogipoo/fix-mirror-note-conversion
Fix mirror note generation never completing
2018-08-17 14:54:13 +09:00
Dean Herbert
786ed8203f
Merge branch 'master' into fix-mirror-note-conversion 2018-08-17 14:47:16 +09:00
smoogipoo
9a1e92800b Adjust with framework-side screenchanges 2018-08-17 14:30:44 +09:00
Dean Herbert
d0ffab6987
Merge pull request #3244 from peppy/log-display-fix
Fix notifications suggesting automatic reporting in non-deployed builds
2018-08-17 14:27:56 +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
Dean Herbert
0e5dbe5689
Merge pull request #3239 from smoogipoo/spinner-combo-fix
Fix spinners creating an extra combo
2018-08-17 13:57:48 +09:00
Dean Herbert
7de958769d
Merge branch 'master' into import-output 2018-08-17 13:57:39 +09:00
Dan Balasescu
2aae39eff3
Merge branch 'master' into log-display-fix 2018-08-17 13:53:45 +09:00
Dean Herbert
8915ed658e
Merge branch 'master' into spinner-combo-fix 2018-08-17 13:50:41 +09:00
smoogipoo
83bda313d1 Output the currently importing model 2018-08-17 13:50:27 +09:00
Dean Herbert
c6cfdf97ef
Merge pull request #3243 from smoogipoo/increase-conversion-leniency
Increase the maximum allowable iterations during mania conversion
2018-08-17 13:37:21 +09:00
smoogipoo
16d30f6756 Add explanatory comments 2018-08-17 13:31:12 +09:00
Dean Herbert
583e026906 Don’t suppress unhandled exceptions in debug builds 2018-08-17 13:28:35 +09:00
smoogipoo
3d6721111a Increase the maximum allowable iterations during mania conversion 2018-08-17 13:26:53 +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
smoogipoo
99ace9805f Fix mirror note generation never completing 2018-08-17 12:54:32 +09:00
Dan Balasescu
af7cda37ca
Merge pull request #3240 from peppy/fix-multiple-sentry-reports
Fix multiple sentry reports arriving for similar exceptions
2018-08-17 12:51:54 +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
557a2ee39d Add more comprehensive tests 2018-08-17 10:04:00 +09:00
Dan Balasescu
3818cd6030
Merge pull request #3238 from peppy/no-sentry-on-debug-build
Don't forward errors to sentry for local builds
2018-08-17 09:30:18 +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
Dan Balasescu
ae3ce910d2
Merge pull request #3237 from peppy/fix-ui-stack-output
Fix notifiation stack trace output on mania conversion failure
2018-08-16 21:14:41 +09:00
Dean Herbert
e23cb8772b Merge remote-tracking branch 'upstream/master' into peppy-fix-ui-stack-output 2018-08-16 20:42:05 +09:00
Dean Herbert
dfecb3235b Fix custom exception stack trace output 2018-08-16 20:41:53 +09:00
Dan Balasescu
694a034d24
Merge pull request #3169 from peppy/sentry-logging
Add sentry logging
2018-08-16 20:37:07 +09:00
Dean Herbert
bc22a28fef Clean up logic and variables 2018-08-16 18:18:15 +09:00
Dean Herbert
870f6bea47 Only process alive objects 2018-08-16 18:18:08 +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