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