1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:22:59 +08:00
Commit Graph

31137 Commits

Author SHA1 Message Date
Dean Herbert
cf697cc276 Update framework again (fix audio component disposal issue) 2020-07-30 15:32:42 +09:00
Dean Herbert
5e8e9f1424 Merge branch 'master' into send-exe-hash 2020-07-30 15:32:10 +09:00
Dean Herbert
1dfd2112c6 Source hash from osu.Game.dll rather than executable 2020-07-30 15:32:08 +09:00
Andrei Zavatski
e1856503c2 Merge master with conflicts resolved 2020-07-30 08:41:45 +03:00
Dean Herbert
d8bb52800f Update framework again (github deploy failed) 2020-07-30 14:31:10 +09:00
Dean Herbert
7071f9a3af Update framework 2020-07-30 14:24:21 +09:00
Dean Herbert
3fcab661db
Merge pull request #9718 from EVAST9919/show-more-update 2020-07-30 14:16:07 +09:00
Dean Herbert
e5991d6e14 Change method structure for hover/unhover state setting (shouldn't be called "Fade") 2020-07-30 13:49:04 +09:00
Dean Herbert
ed699ae913
Merge branch 'master' into show-more-update 2020-07-30 13:46:55 +09:00
Dean Herbert
b72a33ed2f
Merge pull request #9711 from smoogipoo/mania-hitexplosion-pooling 2020-07-30 13:43:41 +09:00
Salman Ahmed
453e1dd48c Merge remote-tracking branch 'upstream/master' into merge-global-to-legacy 2020-07-30 07:10:49 +03:00
Salman Ahmed
6473bf503b Remove use of case when 2020-07-30 07:09:40 +03:00
Dean Herbert
ec0d7760af Move todo? 2020-07-30 13:07:11 +09:00
Dean Herbert
df69d4f72c
Merge branch 'master' into spinner-skinning 2020-07-30 13:01:46 +09:00
Dean Herbert
41c0f7557a Remove traceable spinner reference for now 2020-07-30 12:56:30 +09:00
Dean Herbert
c1085d49d3 Add more xmldoc 2020-07-30 12:55:34 +09:00
Dean Herbert
19fb350cd8 Move offset and scale to constant 2020-07-30 12:51:05 +09:00
Dean Herbert
743d165319 Add old style spin metre 2020-07-30 12:32:19 +09:00
Dean Herbert
d2b3fe1e7b Add scale to old legacy spinner 2020-07-30 12:08:04 +09:00
Dean Herbert
4d822742e8 Add scale and tint to new legacy style spinner 2020-07-30 12:05:19 +09:00
Dean Herbert
54fee7e716 Simplify and standardise scale for default display 2020-07-30 11:50:13 +09:00
Dean Herbert
64c7ae7686 Fix hit transforms not playing out correctly 2020-07-30 11:25:49 +09:00
Andrei Zavatski
45ddc7a2e9 Rename ShowMoreButton in comments namespace to ShowMoreRepliesButton 2020-07-30 05:02:01 +03:00
Andrei Zavatski
ffa98ddd00 Merge remote-tracking branch 'refs/remotes/ppy/master' into show-more-update 2020-07-30 04:51:11 +03:00
Andrei Zavatski
d4496eb982 Update ShowMoreButton in line with web 2020-07-30 04:51:09 +03:00
Dean Herbert
f139423786
Merge branch 'master' into mania-hitexplosion-pooling 2020-07-30 10:40:29 +09:00
Dean Herbert
ca21f038e0 Add xmldoc for legacy classes 2020-07-30 10:35:48 +09:00
Dean Herbert
87cf9ff896
Merge pull request #9701 from smoogipoo/fix-tracked-bindable-update-cancellation 2020-07-30 10:21:14 +09:00
Dean Herbert
73a0e58239
Merge pull request #9713 from smoogipoo/mania-judgement-pooling
Add pooling for mania judgements
2020-07-30 10:18:40 +09:00
Dean Herbert
2b71ffa2ed Add back legacy implementations 2020-07-29 22:32:21 +09:00
Dean Herbert
023feaf438 Refactor to centralise implementation into a single component
Turns out this is a better way forward.
2020-07-29 22:31:52 +09:00
Dean Herbert
2a5e9fed4d Move default background implementation out of DrawableSpinner 2020-07-29 18:15:19 +09:00
Dean Herbert
2cd6e89cb0 Move default centre implementation out of DrawableSpinner 2020-07-29 18:02:12 +09:00
Dean Herbert
1c00cf95d5 Add initial support for spinner middle skinning 2020-07-29 16:55:47 +09:00
smoogipoo
5df406a035 Add pooling for mania judgements 2020-07-29 16:41:10 +09:00
Dean Herbert
e98154b432 Add initial support for spinner background layer 2020-07-29 16:37:32 +09:00
Salman Ahmed
5439099b7c Merge GlobalSkinConfiguration settings into the LegacySetting enum 2020-07-29 10:35:51 +03:00
smoogipoo
e5ebd21156 Fix test scene and add pooling support 2020-07-29 16:25:17 +09:00
Dean Herbert
d01d1ce3f1 Add initial support for spinner disc skinning 2020-07-29 16:25:10 +09:00
smoogipoo
00821e7b65 Re-implement support for small ticks 2020-07-29 16:14:19 +09:00
smoogipoo
7f2e554ad4 Fix animations not being reset 2020-07-29 15:52:25 +09:00
smoogipoo
0f1f4b2b5c Add pooling for mania hit explosions 2020-07-29 15:36:42 +09:00
Dean Herbert
c3c60334ec Add skinning support to spinner test scene 2020-07-29 15:35:08 +09:00
Dan Balasescu
91ce06aaa7
Merge pull request #9710 from EVAST9919/comments-footer
Update comments container footer in line with web
2020-07-29 13:18:45 +09:00
Dean Herbert
9e6d562872 Send in initial score request instead 2020-07-29 13:18:40 +09:00
Dean Herbert
2ca3c8a0ff
Merge pull request #9700 from ynjoe/vertical-failing-layer 2020-07-29 12:50:36 +09:00
Andrei Zavatski
d7fab98af0 Update comments container footer in line with web 2020-07-29 06:39:23 +03:00
Dean Herbert
6c7e806eac Include executable hash when submitting multiplayer scores 2020-07-29 12:39:18 +09:00
smoogipoo
4648362214 Safeguard against potential finalise-before-initialised 2020-07-29 11:30:25 +09:00
smoogipoo
a57b6bdc18 Remove cancellation of linked tokens 2020-07-29 11:29:38 +09:00