1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-11 07:13:00 +08:00
Commit Graph

8615 Commits

Author SHA1 Message Date
Huo Yaoyuan
cf7f3411fc Ignore filename case in BeatmapManager. Fixes #1295. 2017-10-11 15:01:02 +08:00
Dean Herbert
bf6ab77b0e Always use live queries to ensure waiting asserts actually get dynamic data 2017-10-11 13:37:24 +09:00
Dean Herbert
c55ae5049f Merge branch 'master' into import-test-fix 2017-10-11 13:11:55 +09:00
Dean Herbert
6542079385 Merge pull request #1342 from smoogipoo/fix-storyboard-exception
Fix trimming too early in OsuLegacyDecoder crashing storyboards
2017-10-11 13:04:41 +09:00
Dean Herbert
b6cfc49b06 Improve resilience of beatmap import test
Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests
2017-10-11 12:41:43 +09:00
Dean Herbert
71fc5c4da2 Merge branch 'master' into fix-storyboard-exception 2017-10-11 12:26:34 +09:00
Dean Herbert
4c8fe5f678 Merge pull request #1348 from smoogipoo/iconbutton-refactor
Refactor + improve IconButton
2017-10-11 12:14:59 +09:00
Dean Herbert
6de100d446 Merge branch 'master' into iconbutton-refactor 2017-10-11 12:05:38 +09:00
Dean Herbert
bb2b5fa86d Merge pull request #1329 from huoyaoyuan/spm-counter
Implement SPM counter on osu! spinners
2017-10-11 11:39:36 +09:00
Dean Herbert
2b309be3c2 Merge remote-tracking branch 'upstream/master' into spm-counter 2017-10-11 11:23:09 +09:00
Dean Herbert
e76961a932 Remove unnecessary bool 2017-10-11 11:23:02 +09:00
Dean Herbert
1fc16693d6 Formatting 2017-10-11 11:20:44 +09:00
TocoToucan
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00
EVAST9919
28a594179f CI fixes 2017-10-10 21:03:35 +03:00
EVAST9919
15160f5116 Simplify the code by using more delayed sequences 2017-10-10 20:43:07 +03:00
EVAST9919
d3a62082b4 Final adjustments 2017-10-10 20:20:49 +03:00
EVAST9919
57a4a1d8d4 Framework update 2017-10-10 20:07:12 +03:00
EVAST9919
a58e828f54 Timing adjustments 2017-10-10 20:06:18 +03:00
EVAST9919
10a3f7c1d0 Use constants instead of magic numbers 2017-10-10 18:30:46 +03:00
EVAST9919
c34b9aef98 No need to put a lot of stuff inside the big circular container 2017-10-10 15:29:29 +03:00
EVAST9919
67a6da44f9 Rings timing adjustment 2017-10-10 15:02:43 +03:00
EVAST9919
ac7cabf5e6 Framework update 2017-10-10 14:26:54 +03:00
EVAST9919
b7b517f4e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-10 14:25:53 +03:00
Dean Herbert
e4f915e5af Fix scoring simulation not supporting juice 2017-10-10 20:22:57 +09:00
Dean Herbert
03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
Dan Balasescu
78c160af87 Merge pull request #1343 from peppy/hidden-judgements
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
2017-10-10 19:25:29 +09:00
smoogipoo
b8d2a04fe1 Only split beatmap lines twice 2017-10-10 19:24:24 +09:00
smoogipoo
ad344eb719 Use IsNullOrWhiteSpace instead of trimming 2017-10-10 19:21:38 +09:00
smoogipoo
8cea875f5f Remove unused using 2017-10-10 18:35:30 +09:00
smoogipoo
c2f3c0e6df Add TestCaseIconButton to demonstrate IconButton usages 2017-10-10 18:32:09 +09:00
smoogipoo
071b1b049c Fix properties not being set leading to colours not being set 2017-10-10 18:31:56 +09:00
smoogipoo
44141a38b8 Make it possible to change colours before load() 2017-10-10 18:04:41 +09:00
Dan Balasescu
d8b7f4efa7 Merge branch 'master' into hidden-judgements 2017-10-10 17:59:34 +09:00
Dan Balasescu
cd870b5acd Merge pull request #1347 from peppy/fix-tests-namespace
Move mania tests to correct namespace
2017-10-10 17:58:36 +09:00
smoogipoo
bbd1a7059e xmldoc + hook up IconColour 2017-10-10 17:25:39 +09:00
smoogipoo
d7fb59ee0e Expose colours of IconButton 2017-10-10 17:20:23 +09:00
Dean Herbert
b306eaca6e Move mania tests to correct namespace 2017-10-10 16:50:46 +09:00
smoogipoo
9cb9151811 Move origin + anchor outside of ctor 2017-10-10 16:00:11 +09:00
smoogipoo
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
smoogipoo
166194e6b6 Further logic simplification 2017-10-10 15:09:26 +09:00
EVAST9919
9cad0ce2e9 Group transforms using delayed sequence
And some timing adjustments
2017-10-10 07:07:09 +03:00
smoogipoo
074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
EVAST9919
6fb8755a95 Use less masking for the ring 2017-10-10 06:06:09 +03:00
EVAST9919
19723b82f7 Remove ring's background field and adjust some timings 2017-10-10 04:12:01 +03:00
EVAST9919
e2d6659d48 Change Ring type, use RelativeSizeAxes for Background/Foreground 2017-10-10 03:57:15 +03:00
EVAST9919
59a0343c01 CI fixes 2017-10-10 01:36:40 +03:00
EVAST9919
0baceaaf0d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-10 00:56:54 +03:00
TocoToucan
cbae19b604 Fix BeatmapMetadata removing 2017-10-10 00:17:12 +03:00
TocoToucan
ef417c6388 Small DB-related refactoring 2017-10-09 23:30:32 +03:00