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

27921 Commits

Author SHA1 Message Date
Dean Herbert
f59479fa07 Update framework 2020-04-03 21:09:33 +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
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
Dean Herbert
c18248c827 Fix crash caused by user json order changing 2020-04-02 18:46:09 +09:00
smoogipoo
62f1bc276d Add skinning support for column line colour 2020-04-02 18:10:17 +09:00
smoogipoo
a77933f5e0 Add support for parsing mania skin colours 2020-04-02 17:56:12 +09:00
smoogipoo
9552319732 Fix hold note animation not being reset 2020-04-02 17:09:08 +09:00
Dan Balasescu
7c428011a2
Merge pull request #8562 from mcendu/mania-fallback-to-head
Allow hold note tail to fallback to normal note image
2020-04-02 16:37:45 +09:00
smoogipoo
63708532a1 Remove frozen clock from test scenes 2020-04-02 16:36:57 +09:00
smoogipoo
5aa4c4f3cb Remove corner radius 2020-04-02 16:10:09 +09:00
smoogipoo
7ba533b7a4 Expand mania to fit vertical screen bounds 2020-04-02 16:04:09 +09:00
mcendu
dae738d6a4
add todo entries 2020-04-02 14:58:31 +08:00
smoogipoo
62f6683a20 Remove unnecessary generic 2020-04-02 15:57:50 +09:00
smoogipoo
c8d161e03a Fix explosion expiry 2020-04-02 15:57:02 +09:00
mcendu
f3b96f8f50
add fallback to normal note image 2020-04-02 14:29:30 +08:00
smoogipoo
de7ee57100 Fix adding null hit explosions 2020-04-02 15:27:31 +09:00
Dean Herbert
366dc7085d
Merge pull request #8555 from smoogipoo/legacy-skin-start-at-current-time
Add startAtCurrentTime parameter to GetAnimation()
2020-04-02 14:57:41 +09:00
smoogipoo
fa3a449c3b Implement legacy normal hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo
b375a02cff Cleanup positioning factor definition 2020-04-02 14:37:29 +09:00
smoogipoo
09eb9facdd Add column to test scene 2020-04-02 14:37:29 +09:00
smoogipoo
c8eee8d204 Add structure for legacy hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo
94031b57ea Split hit explosion positioning from column 2020-04-02 14:37:29 +09:00
smoogipoo
beb1f037e9 Add startAtCurrentTime parameter to GetAnimation() 2020-04-02 14:33:15 +09:00
Dean Herbert
e862ca23ad
Merge pull request #8535 from mcendu/mania-existence-check
Add check to detect whether mania is skinned
2020-04-02 00:09:17 +09:00
Dean Herbert
a76428f965 Move lookup to own function 2020-04-01 23:46:50 +09:00
Dean Herbert
c2c7ff7334 Add temporary logic to LegacySkin 2020-04-01 23:32:48 +09:00
Dean Herbert
1446b0782b
Merge branch 'master' into mania-existence-check 2020-04-01 23:11:09 +09:00
Dean Herbert
312f94d810
Merge pull request #8541 from smoogipoo/fix-default-explosion-position
Fix incorrect explosion position on default skin
2020-04-01 21:46:58 +09:00
Dean Herbert
892d2b3092
Merge pull request #8544 from peppy/update-framework
Update framework
2020-04-01 21:46:47 +09:00
Dean Herbert
4d8b6c47cc Update framework 2020-04-01 21:23:43 +09:00
Dean Herbert
6d88ac2c1c
Merge pull request #8537 from smoogipoo/fix-column-light-position
Fix column lights positioned incorrectly
2020-04-01 20:11:22 +09:00
Dan Balasescu
33119d38ad
Merge branch 'master' into fix-default-explosion-position 2020-04-01 20:03:23 +09:00
smoogipoo
f4d8defa48 Fix incorrect explosion position on default skin 2020-04-01 20:01:35 +09:00
Dean Herbert
aac7915eab
Merge branch 'master' into fix-column-light-position 2020-04-01 19:46:33 +09:00