1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Commit Graph

9611 Commits

Author SHA1 Message Date
Dean Herbert
0bd1b75d0b Fix test case 2017-12-30 15:38:10 +09:00
Dean Herbert
7f54778fed
Merge branch 'master' into hitobject-constructor-safety 2017-12-30 15:32:36 +09:00
Dean Herbert
845c1946db
Merge pull request #1782 from Aergwyn/standard-hd-support
Implement osu! hidden
2017-12-30 15:31:05 +09:00
Dean Herbert
a2840d2519 Fix FadeInDuration not being passed down to sliders' InitialCircle 2017-12-30 15:21:25 +09:00
Dean Herbert
f73f43fdad Merge remote-tracking branch 'upstream/master' into standard-hd-support 2017-12-30 14:48:19 +09:00
Dean Herbert
a0966305d4 Remove unnecessary new event 2017-12-30 14:46:44 +09:00
smoogipoo
b99e0a0439 Fix DrawableHitCircle accepting a base OsuHitObject parameter
Fixes #1778.
2017-12-30 14:15:42 +09:00
Dan Balasescu
db46683ba8
Merge pull request #1784 from kiroma/comguide
Create a compilation guide
2017-12-30 14:04:42 +09:00
Dan Balasescu
a9f8eb2815
Merge branch 'master' into comguide 2017-12-30 13:56:31 +09:00
Dan Balasescu
7b5f3e70af
Merge pull request #1797 from jai-sharma/supporter-tooltip
Add tooltip text to supporter icon
2017-12-30 13:55:48 +09:00
Dan Balasescu
2c4b4d19e0
Merge branch 'master' into supporter-tooltip 2017-12-30 13:44:59 +09:00
Dan Balasescu
982d2fe7d6
Merge pull request #1789 from peppy/fix-import-dialog-icon
Use a more suiting (?) icon for import dialog
2017-12-30 13:23:26 +09:00
Dan Balasescu
a7135e2688
Merge branch 'master' into fix-import-dialog-icon 2017-12-30 13:15:33 +09:00
jai_
9660e0885b
correctly name tooltip interface 2017-12-29 19:20:37 +00:00
jai_
6de41ba172
Trim whitespace 2017-12-29 19:16:43 +00:00
jai_
b1dd64983d
Add tooltip text to supporter icon 2017-12-29 19:05:50 +00:00
Aergwyn
52dd5ddba6 fix repeat points not scaling properly 2017-12-29 20:03:43 +01:00
Aergwyn
0a2e41884e add more required types for test slider 2017-12-29 20:01:26 +01:00
Aergwyn
5e887240ae actually use option to override values... 2017-12-29 18:04:40 +01:00
Aergwyn
6c6fa08a06 added some colour to testsliders
gray just wasn't sticking out well
2017-12-29 17:56:48 +01:00
Aergwyn
07040f9fd1 rename field 2017-12-29 17:52:28 +01:00
Aergwyn
5c3b67bcef remove unnecessary values 2017-12-29 17:51:59 +01:00
Aergwyn
f547c7986d created option to override values before UpdateState is called 2017-12-29 17:50:55 +01:00
Aergwyn
a58b5ff5f2 simplify sequence 2017-12-29 17:46:22 +01:00
Aergwyn
ca9f014714 add required types to testclasses 2017-12-29 17:44:38 +01:00
Aergwyn
b200134a18 fix spinner easing with hidden 2017-12-29 17:44:10 +01:00
Dean Herbert
db8228f69d Don't think we need this expire call 2017-12-29 18:57:38 +09:00
Dean Herbert
a4f941cdf1 Move lifetime adjustment to DrawableHitCircle 2017-12-29 18:51:14 +09:00
Dean Herbert
dd2ae3f701 SImplify everything 2017-12-29 18:48:10 +09:00
Dean Herbert
0ae00cbd17 Rename one more variable 2017-12-29 18:28:16 +09:00
Dean Herbert
ced2d9749d Adjust presets and rename more 2017-12-29 18:25:33 +09:00
Dean Herbert
c9d4da65d2 Simplify and rename time variables 2017-12-29 18:06:41 +09:00
Dean Herbert
27cb445c24 Always recrusively apply custom sequence to nested hitobjects 2017-12-29 17:48:05 +09:00
Dean Herbert
2c61ebbcd9 Remove unnecessary local derived classes 2017-12-29 17:10:33 +09:00
Dean Herbert
b74248a705 Rename application method 2017-12-29 16:22:06 +09:00
Dean Herbert
3f8f778004
Merge branch 'master' into standard-hd-support 2017-12-29 15:56:38 +09:00
Dean Herbert
936a3f52c8
Merge pull request #1793 from peppy/use-ppy-opentk
Use a non-broken opentk library
2017-12-29 15:54:14 +09:00
Dean Herbert
16c1bc9880 Update framework 2017-12-29 15:43:38 +09:00
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
Aergwyn
b029f019b2 Merge branch 'master' into expand-social-tab 2017-12-28 19:36:22 +01:00
Aergwyn
7ecc693e34 Updated submodule osu-framework 2017-12-28 19:35:29 +01:00
Aergwyn
53cd47a192 Updated submodule osu-resources 2017-12-28 19:34:49 +01:00
Aergwyn
66f076815f query friends endpoint to fetch friendlist 2017-12-28 19:32:06 +01:00
Aergwyn
ca650e8d48 extend TestCaseSpinner with new steps
- Hidden, Size and Scale
2017-12-28 18:21:08 +01:00
Aergwyn
8d5f4d4f19 extend TestCaseSlider with new steps
- Hidden, Size and Scale
- made Repeats an SliderStep instead
2017-12-28 18:09:35 +01:00
Aergwyn
cd237da6d3 extend TestCaseHitCircle with new steps
- Hidden, Size and Scale
- also fix Auto still missing because no judgement was created
2017-12-28 17:06:15 +01:00
Aergwyn
0b23ceb781 fix slider fade out to be eased
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
kiroma
b3d1fc096e
Merge branch 'master' into comguide 2017-12-28 15:27:21 +01:00
kiroma
2669974bff
Update COMPILING.md
NuGet - 10/10 would use again
2017-12-28 15:25:54 +01:00
Dean Herbert
379d488160 Update framework 2017-12-28 21:54:34 +09:00