Salman Ahmed
c4f7b45768
Revert "Add support for custom hyper-dash fruit colouring"
...
This reverts commit 6f2cc5471a
2020-04-05 00:07:25 +03:00
Salman Ahmed
f67a62699b
Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring
2020-04-03 19:57:52 +03:00
Salman Ahmed
dd684b68d9
Make parameters required
2020-04-03 19:53:38 +03:00
Salman Ahmed
0340b6db51
Describe step names more
2020-04-03 19:50:32 +03:00
Salman Ahmed
7e82f5740b
Add a skin extension for simplifying falling back on hyper-dash colours
2020-04-03 19:35:50 +03:00
Dean Herbert
e012af6616
Merge pull request #8597 from smoogipoo/better-mania-scrollspeed
...
Implement more familiar scroll speed options in mania
2020-04-04 00:09:04 +09:00
Dean Herbert
7b2144a1a7
Fix merge mishap
2020-04-03 23:31:46 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed
2020-04-03 23:25:14 +09:00
Dean Herbert
96bd5a4b09
Merge pull request #8589 from smoogipoo/fix-convert-scroll-speed
...
Fix mania scrolling at incorrect speeds
2020-04-03 23:11:00 +09:00
Dean Herbert
eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed
2020-04-03 22:47:53 +09:00
Dean Herbert
d108d5f04c
Merge pull request #8586 from smoogipoo/mania-config-lookup-refactor
...
Rework mania skin lookups to not require total playfield columns
2020-04-03 22:45:13 +09:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor
2020-04-03 22:22:59 +09:00
Dean Herbert
9c688a5b83
Merge pull request #8592 from peppy/update-animation-usage
...
Update usages of Animation and Video in line with framework changes
2020-04-03 22:22:31 +09:00
Dean Herbert
258dcceffc
Merge branch 'master' into update-animation-usage
2020-04-03 21:54:11 +09:00
Dean Herbert
f59479fa07
Update framework
2020-04-03 21:09:33 +09:00
Dan Balasescu
05e2ca0b68
Merge pull request #8590 from peppy/fix-intro-test-scene
...
Fix dynamic recompilation in intro test scenes
2020-04-03 19:40:46 +09:00
Dan Balasescu
16c200ce99
Merge pull request #8598 from peppy/taiko-skinning-input-drum
...
Add osu!taiko drum skinning support
2020-04-03 19:30:23 +09:00
Dean Herbert
d896d5a231
Rename filename to match class
2020-04-03 18:51:34 +09:00
smoogipoo
23b7cde941
Add milliseconds value alongside
2020-04-03 18:38:04 +09:00
smoogipoo
d90db5649d
Improve comment slightly
2020-04-03 18:32:07 +09:00
Dean Herbert
fd9d4a8d32
Update resources
2020-04-03 18:29:32 +09:00
smoogipoo
1ff2cc31d1
Implement more familiar scroll speed options in mania
2020-04-03 18:25:01 +09:00
Dean Herbert
0a7d9b930c
Add osu!taiko legacy drum skinning support
2020-04-03 18:23:03 +09:00
smoogipoo
b1268a73f1
Add keybinding repeat extension method
2020-04-03 18:15:24 +09:00
Dean Herbert
51db361c32
Update usages of Animation and Video in line with framework changes
2020-04-03 16:00:06 +09:00
Dean Herbert
8cb0eb9b12
Fix dynamic recompilation in intro test scenes
2020-04-03 15:08:06 +09:00
smoogipoo
b42d1104b7
Fix mania converts scrolling at incorrect speeds
2020-04-03 13:16:01 +09:00
Dan Balasescu
4e061ceabc
Merge pull request #8584 from ThereGoesMySanity/getdecoder-fix
...
Fix GetDecoder getting fallback decoder too often
2020-04-03 12:36:44 +09:00
smoogipoo
571748d105
Add some xmldocs + nullable parameter
2020-04-03 12:31:05 +09:00
smoogipoo
1f797207f7
Rework lookups to not require total playfield columns
2020-04-03 12:31:05 +09:00
Will Kennedy
877bd7837a
Changed variable names
2020-04-02 22:02:57 -04:00
Will Kennedy
57944bd335
fix(?) InspectCode warnings
2020-04-02 21:36:31 -04:00
Will Kennedy
c042e709a5
Fix GetDecoder getting fallback decoder too often
2020-04-02 20:43:54 -04:00
Dean Herbert
aa74b3193e
Merge pull request #8556 from smoogipoo/mania-hitexplosion-skinning
...
Implement mania normal-note hit-explosion skinning
2020-04-03 00:27:28 +09:00
smoogipoo
24a7b5f0d6
Fix missing comma
2020-04-02 23:59:53 +09:00
Dean Herbert
f919a2f267
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 23:57:03 +09:00
Dean Herbert
d7f14733f1
Merge pull request #8565 from smoogipoo/mania-column-line-colour
...
Add skinning support for column line colour
2020-04-02 23:53:02 +09:00
Dan Balasescu
0f5fd8051c
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 23:08:31 +09:00
Dean Herbert
c35dd0153d
Merge branch 'master' into mania-column-line-colour
2020-04-02 23:03:22 +09:00
Dean Herbert
bff58f36e5
Merge pull request #8563 from smoogipoo/expand-mania-vertically
...
Expand mania to fit vertical screen bounds
2020-04-02 23:01:56 +09:00
smoogipoo
47e2ff5ce6
Fix incorrect frame length for hit explosions
2020-04-02 22:56:30 +09:00
smoogipoo
2a6c0de225
Add frameLength parameter to GetAnimation
2020-04-02 22:56:30 +09:00
Dean Herbert
e1a9a76e01
Merge pull request #8564 from smoogipoo/fix-holdnote-texturing
...
Fix hold note animation not being reset
2020-04-02 22:42:47 +09:00
Dean Herbert
23b53bee56
Update resources
2020-04-02 22:05:32 +09:00
Dean Herbert
8f2a3578bd
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 21:59:01 +09:00
Dean Herbert
1a97260c95
Merge pull request #8570 from peppy/update-framework
...
Update framework
2020-04-02 21:50:30 +09:00
Dean Herbert
a6d6bab0cc
Update framework
2020-04-02 21:21:29 +09:00
Dan Balasescu
ca0c8b3760
Merge pull request #8568 from peppy/fix-slider-ball-sizing
...
Fix weird slider ball sizing
2020-04-02 20:18:40 +09:00
Dean Herbert
a3d4212462
Fix weird slider ball sizing
2020-04-02 19:56:33 +09:00
Dean Herbert
e7b79a12b1
Merge pull request #8566 from peppy/fix-deserialization-order-dependence
...
Fix crash caused by user json order changing
2020-04-02 19:22:07 +09:00
