|
|
e7cb579ec4
|
Merge branch 'master' into take_screenshot
|
2018-03-22 21:34:53 +09:00 |
|
|
|
5b73f49fd4
|
Merge pull request #2280 from peppy/notification-visibility
Restore old auto-popout notification overlay behaviour
|
2018-03-22 21:22:36 +09:00 |
|
|
|
9d3529ce7b
|
Merge branch 'master' into cursor-skinning
|
2018-03-22 21:07:16 +09:00 |
|
|
|
14a653aa28
|
Restore old auto-popout notification overlay behaviour
|
2018-03-22 20:55:00 +09:00 |
|
|
|
74191e1b73
|
Merge remote-tracking branch 'upstream/master' into take_screenshot
|
2018-03-22 20:49:17 +09:00 |
|
|
|
e41993ac44
|
Don't bother with an exception that will never happen
Wasn't being caught anyways
|
2018-03-22 20:45:26 +09:00 |
|
|
|
94847e4a23
|
Allow clicking notification to open screenshot folder
|
2018-03-22 20:44:00 +09:00 |
|
|
|
9e080028ff
|
Add shutter sound
|
2018-03-22 20:42:55 +09:00 |
|
|
|
bedb427ceb
|
Merge pull request #2247 from smoogipoo/beat-snap-divisor
Implement the editor's beat snap divisor
|
2018-03-22 20:39:12 +09:00 |
|
|
|
4883e2fd5b
|
Merge branch 'master' into beat-snap-divisor
|
2018-03-22 20:24:10 +09:00 |
|
|
|
8b7640f137
|
Merge pull request #2256 from peppy/skin-scaling
Add scale adjusts to bring legacy skins in-line with lazer sizing
|
2018-03-22 20:23:58 +09:00 |
|
|
|
92d8781bf0
|
Merge branch 'master' into beat-snap-divisor
|
2018-03-22 20:14:50 +09:00 |
|
|
|
2b7d22c4ea
|
Very slightly reduce size of slider bar to increase bottom padding
|
2018-03-22 20:11:55 +09:00 |
|
|
|
4e2c6ccedc
|
Merge branch 'master' into skin-scaling
|
2018-03-22 20:11:30 +09:00 |
|
|
|
ff41ad976b
|
Merge pull request #2270 from peppy/fix-player-loader
Fix retry not allowing continuing beyond PlayerLoader
|
2018-03-22 20:09:57 +09:00 |
|
|
|
88ad3db022
|
Update framework
|
2018-03-22 20:00:57 +09:00 |
|
|
|
090c78bf10
|
Merge remote-tracking branch 'origin/master' into fix-player-loader
|
2018-03-22 20:00:21 +09:00 |
|
|
|
a6bcb0bbd1
|
Merge pull request #2279 from peppy/fix-settings-notification-verlay
Only allow settings or notifications to be visible at once
|
2018-03-22 19:59:31 +09:00 |
|
|
|
e5f83530b8
|
Only allow settings or notifications to be visible at once
Resolves #2273.
|
2018-03-22 19:49:31 +09:00 |
|
|
|
ee12d75b30
|
Merge branch 'master' into skin-scaling
|
2018-03-22 19:30:17 +09:00 |
|
|
|
61ef635743
|
Merge pull request #2254 from peppy/skin--completion
Add skin/beatmap lookup hierarchy
|
2018-03-22 19:28:35 +09:00 |
|
|
|
2d08cee3b4
|
Merge branch 'master' into skin--completion
|
2018-03-22 19:04:22 +09:00 |
|
|
|
242ee8f6f1
|
Merge pull request #2278 from peppy/focused-textbox-fix
Fix FocusedTextBox in line with framework changes
|
2018-03-22 19:01:37 +09:00 |
|
|
|
af65f2dd48
|
Move AccentColour changes local to rulesets which rely on it
|
2018-03-22 18:53:16 +09:00 |
|
|
|
f87c376547
|
Update framework
|
2018-03-22 18:52:32 +09:00 |
|
|
|
fc85bf919e
|
Merge remote-tracking branch 'origin/master' into focused-textbox-fix
|
2018-03-22 18:52:06 +09:00 |
|
|
|
9f220b3b9b
|
Add explanatory comment
|
2018-03-22 18:51:03 +09:00 |
|
|
|
366b7fca65
|
Remove GetColour method
|
2018-03-22 18:50:19 +09:00 |
|
|
|
425d4aa766
|
Add ability to lookup arbitrary SkinConfiguration values
|
2018-03-22 18:10:28 +09:00 |
|
|
|
c4fe6a04c5
|
Use string lookups for combo colours
|
2018-03-22 17:32:05 +09:00 |
|
|
|
ab9505652b
|
Merge branch 'master' into skin--completion
|
2018-03-22 16:44:00 +09:00 |
|
|
|
75ca10af75
|
Merge pull request #2253 from peppy/beatmap-as-a-skin
Make Beatmaps decodable as Skins
|
2018-03-22 16:35:43 +09:00 |
|
|
|
b8022070e8
|
Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin
|
2018-03-22 16:24:56 +09:00 |
|
|
|
894575e3f5
|
Merge pull request #2252 from peppy/accent-colour-properties
Remove ComboColour from HitObjects
|
2018-03-22 16:19:42 +09:00 |
|
|
|
dade52d15d
|
Fix vertical padding
|
2018-03-22 16:15:14 +09:00 |
|
|
|
1b116dd04e
|
Adjust testcase sizing to match editor
|
2018-03-22 16:11:56 +09:00 |
|
|
|
f872402fc4
|
Merge branch 'master' into accent-colour-properties
|
2018-03-22 16:10:52 +09:00 |
|
|
|
a4804f47a9
|
Merge branch 'master' into beat-snap-divisor
|
2018-03-22 16:06:26 +09:00 |
|
|
|
6e379f0646
|
Fix FocusedTextBox in line with framework changes
|
2018-03-22 15:54:16 +09:00 |
|
|
|
4ccaf143b5
|
Give sliders a default accent colour
|
2018-03-22 15:50:19 +09:00 |
|
|
|
5f1bb8d753
|
Merge branch 'master' into fix-player-loader
|
2018-03-22 15:46:37 +09:00 |
|
|
|
db9cfa574f
|
Merge pull request #2258 from peppy/update-nuspec
Update nuspec to include humanizer localisations
|
2018-03-22 15:46:14 +09:00 |
|
|
|
524326fabc
|
Merge branch 'master' into update-nuspec
|
2018-03-22 15:37:57 +09:00 |
|
|
|
3e9acc3a46
|
Merge pull request #2262 from peppy/fix-dummy-ruleset
Fix DummyRuleset getting selected after non-matching filter
|
2018-03-22 15:37:36 +09:00 |
|
|
|
13a3c728dc
|
Merge branch 'master' into fix-dummy-ruleset
|
2018-03-22 15:29:43 +09:00 |
|
|
|
110eca1aca
|
Merge pull request #2277 from smoogipoo/batch-action-caching
Use cached VertexBuffer add delegate
|
2018-03-22 15:29:30 +09:00 |
|
|
|
799b7caf7e
|
Update framework
|
2018-03-22 15:20:58 +09:00 |
|
|
|
3f3f57e51e
|
Use cached vertexbatch add delegate
|
2018-03-22 15:13:38 +09:00 |
|
|
|
1a86a057bc
|
Merge pull request #2245 from peppy/better-import-notice
Make import notifications fail when any imports fail
|
2018-03-22 15:11:33 +09:00 |
|
|
|
7bdca0ff39
|
Merge remote-tracking branch 'upstream/master' into accent-colour-properties
|
2018-03-22 15:07:28 +09:00 |
|
