smoogipoo
|
d25d39b315
|
Add cancellation to storyboard/hitobject loading
|
2019-05-10 16:31:09 +09:00 |
|
Dan Balasescu
|
5fa721fdab
|
Merge pull request #4744 from nyquillerium/result-count
Fix incorrect judgement counts for rewinding
|
2019-05-10 12:31:16 +09:00 |
|
David Zhao
|
9480c74fcc
|
Merge remote-tracking branch 'upstream/master' into result-count
|
2019-05-10 11:20:16 +09:00 |
|
David Zhao
|
5c096cbc91
|
Revert mirroring condition too
|
2019-05-09 18:59:00 +09:00 |
|
David Zhao
|
9e0af723cc
|
Split out affectscombo change
|
2019-05-09 18:56:19 +09:00 |
|
David Zhao
|
b0e34d86d5
|
Subtract a result from count if its been reverted
|
2019-05-09 16:16:20 +09:00 |
|
David Zhao
|
39fb5712f1
|
Only combo-incrementing results add to result count
|
2019-05-09 15:31:37 +09:00 |
|
Dan Balasescu
|
3f702d13a3
|
Merge pull request #4728 from nyquillerium/zoomablescrollcontainer-fix
Fix ZoomableScrollContainer not getting initial width
|
2019-05-09 14:22:33 +09:00 |
|
Dan Balasescu
|
2e50c1ce48
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 14:09:47 +09:00 |
|
Dean Herbert
|
0ab0406962
|
Fix user bindable being written to from background thread (#4742)
Fix user bindable being written to from background thread
|
2019-05-09 14:00:45 +09:00 |
|
Dan Balasescu
|
22940373a0
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 13:54:21 +09:00 |
|
smoogipoo
|
5c6b4d923f
|
Reorder methods
|
2019-05-09 13:53:53 +09:00 |
|
Dan Balasescu
|
c7305d4e97
|
Merge branch 'master' into fix-api-crossthread
|
2019-05-09 13:52:00 +09:00 |
|
Dan Balasescu
|
b99ffa1d44
|
Merge pull request #4739 from peppy/add-more-pause-asserts
Add more asserts to pause test in an attempt to track down intermittent test failures
|
2019-05-09 13:51:38 +09:00 |
|
smoogipoo
|
35624a5d1c
|
Invert scheduling order
|
2019-05-09 13:42:04 +09:00 |
|
smoogipoo
|
3fed165b74
|
Cleanup some schedules
|
2019-05-09 13:33:18 +09:00 |
|
smoogipoo
|
c69d813745
|
Fix bindable potentially being set from background thread
|
2019-05-09 13:32:18 +09:00 |
|
David Zhao
|
d625f3c104
|
Private method
|
2019-05-09 13:21:01 +09:00 |
|
Dean Herbert
|
5b1ae1210a
|
Add more asserts to pause test in an attempt to track down intermittent test failures
|
2019-05-09 11:31:40 +09:00 |
|
Dean Herbert
|
869136b2fb
|
Fix possible cross-thread config cache access (#4730)
Fix possible cross-thread config cache access
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-09 11:16:48 +09:00 |
|
Dan Balasescu
|
086f7a7314
|
Merge pull request #4738 from peppy/fix-replay-inactive-pause
Fix game pausing when made inactive while watching a replay
|
2019-05-09 11:12:45 +09:00 |
|
Dean Herbert
|
9457a6128e
|
Fix game pausing when made inactive while watching a replay
|
2019-05-09 10:57:55 +09:00 |
|
Dean Herbert
|
a5b07347e9
|
Merge branch 'master' into fix-ruleset-crossthread
|
2019-05-09 10:49:26 +09:00 |
|
Dean Herbert
|
c34ba2690f
|
Adjust testcase to avoid random failures (#4735)
Adjust testcase to avoid random failures
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-09 10:49:07 +09:00 |
|
Dean Herbert
|
9b799d76a1
|
Merge remote-tracking branch 'upstream/master' into adjust-updateablebeatmap-testcase
|
2019-05-09 10:38:33 +09:00 |
|
Dean Herbert
|
5dbf57046e
|
Fix regression from removing unused variable
|
2019-05-09 10:38:22 +09:00 |
|
Dean Herbert
|
158fff7f58
|
Fix incorrect texture name usage for some rank icons (#4733)
Fix incorrect texture name usage for some rank icons
|
2019-05-09 10:25:46 +09:00 |
|
Dean Herbert
|
31c91746a5
|
Merge branch 'master' into fix-ruleset-crossthread
|
2019-05-09 10:13:25 +09:00 |
|
smoogipoo
|
9c01f6793e
|
Remove unused variable
|
2019-05-08 23:52:44 +09:00 |
|
smoogipoo
|
9b279f324f
|
Adjust testcase to avoid random failures
|
2019-05-08 23:40:01 +09:00 |
|
smoogipoo
|
5128dc32e4
|
Remove unnecessary fillmode
|
2019-05-08 23:13:21 +09:00 |
|
smoogipoo
|
17a9f191cd
|
Fix incorrect texture name usage for some rank icons
|
2019-05-08 23:08:08 +09:00 |
|
Dean Herbert
|
ffea0338fb
|
Update dependencies (#4731)
Update dependencies
|
2019-05-08 21:43:58 +09:00 |
|
Dean Herbert
|
83663467ce
|
Update dependencies
|
2019-05-08 21:08:46 +09:00 |
|
Dan Balasescu
|
255df3d329
|
Merge pull request #4616 from LeNitrous/refactor-select-footer
Refactor song select footer buttons
|
2019-05-08 19:57:51 +09:00 |
|
Dean Herbert
|
4f697e2bd5
|
Add licence header
|
2019-05-08 19:35:20 +09:00 |
|
Dean Herbert
|
6dea16f365
|
Move action and hotkey specification local
|
2019-05-08 19:29:43 +09:00 |
|
Dean Herbert
|
c91b9c6032
|
Add missing button
|
2019-05-08 19:27:53 +09:00 |
|
smoogipoo
|
39efa2d173
|
Fix possible cross-thread config cache access
|
2019-05-08 19:05:00 +09:00 |
|
Dean Herbert
|
772eb460fb
|
Move button definitions to their respective classes
|
2019-05-08 19:03:26 +09:00 |
|
Dean Herbert
|
0693290ad4
|
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
|
2019-05-08 18:43:21 +09:00 |
|
Dean Herbert
|
b33372ca62
|
Don't expand mods in button on hover
|
2019-05-08 18:43:15 +09:00 |
|
Dean Herbert
|
8906eb874a
|
Fix CI issues
|
2019-05-08 18:43:06 +09:00 |
|
Dean Herbert
|
9a9ac05cd9
|
Fix post-merge issues
|
2019-05-08 18:42:54 +09:00 |
|
Dean Herbert
|
bace829629
|
Add ability to avoid expand animation in ModDisplay
|
2019-05-08 18:42:26 +09:00 |
|
Dan Balasescu
|
6559869880
|
Merge pull request #4617 from nyquillerium/flashlight-dim
Implement dimming for sliding on sliders with flashlight mod
|
2019-05-08 13:51:47 +09:00 |
|
Dan Balasescu
|
6ab83f8825
|
Merge branch 'master' into flashlight-dim
|
2019-05-08 13:37:21 +09:00 |
|
David Zhao
|
ff3c226596
|
Give ZoomableScrollContainer an initial width
|
2019-05-08 13:37:03 +09:00 |
|
Dean Herbert
|
7b91439506
|
Fix disposed beatmap backgrounds being loaded (#4723)
Fix disposed beatmap backgrounds being loaded
|
2019-05-08 13:33:55 +09:00 |
|
smoogipoo
|
117f8bdd01
|
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
|
2019-05-08 13:25:01 +09:00 |
|