1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 18:42:54 +08:00
Commit Graph

7496 Commits

Author SHA1 Message Date
Dan Balasescu
7345ad40db Merge branch 'master' into timingchange-improvements 2017-08-09 10:53:25 +09:00
Dean Herbert
06e5f7de09 Make pulp size private 2017-08-09 10:16:31 +09:00
Dean Herbert
41fa961571 Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-09 09:30:47 +09:00
Dean Herbert
da5f2fc6af Merge remote-tracking branch 'origin/catch-catcher' into catch 2017-08-09 09:28:50 +09:00
Dean Herbert
d9f5035d44 Merge branch 'master' into catch-catcher 2017-08-09 09:03:07 +09:00
Dean Herbert
66ef6eb026 Merge pull request #1092 from jorolf/fix-test-argument
fix "--tests" argument for visual tests
2017-08-09 09:02:49 +09:00
Dean Herbert
1c7fe02d1b Update framework 2017-08-09 08:56:45 +09:00
Dean Herbert
482626adc2 Don't crash on spinners 2017-08-09 08:54:19 +09:00
Dean Herbert
881bf48c6e Merge branch 'master' into fix-test-argument 2017-08-09 08:52:56 +09:00
Jorolf
56caa6ef10 fix tests argument 2017-08-09 01:49:50 +02:00
Dean Herbert
ae4460e680 Merge pull request #1091 from ppy/smoogipooo-patch-1
Remove incorrect duplicate code in mania pattern generation.
2017-08-09 07:52:35 +09:00
Dan Balasescu
21d44b1e99 Remove correct duplicate code.
Already present on line 51.
2017-08-09 06:24:08 +09:00
Dan Balasescu
98c652c0f9 Merge pull request #1089 from johnneijzen/Small-Mistakes-Fix
Update HitObjectPatternGenerator.cs
2017-08-09 06:13:16 +09:00
tgi74000
3d4db427ff Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility 2017-08-08 17:17:53 +02:00
John Neijzen
9e17549d7f Update HitObjectPatternGenerator.cs 2017-08-08 22:56:27 +08:00
smoogipooo
cae21869d0 Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍. 2017-08-08 17:37:11 +09:00
smoogipooo
a95ee7494f Initial conversion of taiko to use ScrollingPlayfield. 2017-08-08 16:01:18 +09:00
smoogipooo
8585561557 Merge branch 'timingchange-improvements' into taiko-timingchanges-2 2017-08-08 14:38:42 +09:00
smoogipooo
9e01b47a09 Convert to local object. 2017-08-08 14:15:08 +09:00
smoogipooo
25202b522d Fix not setting Origin + Anchors properly when reversing. 2017-08-08 14:10:26 +09:00
Dean Herbert
2203d55d64 fixes 2017-08-08 13:31:55 +09:00
Dean Herbert
e00ea2db04 Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-08 13:24:43 +09:00
smoogipooo
80c95d5b26 Update framework. 2017-08-08 13:24:15 +09:00
smoogipooo
e54abe8d0a Fix not removing queued hit objects. 2017-08-08 13:23:46 +09:00
Dean Herbert
ca2da5ac9b Don't crash on spinners 2017-08-08 13:03:34 +09:00
Dean Herbert
a95aa90adc Allow DrawableHitObjects to be removed from a Playfield
(cherry picked from commit 3926238be9)
2017-08-08 13:02:51 +09:00
Dean Herbert
ee7bb1b4f5 Don't set RelativePositionAxes when setting ScrollingAxes
(cherry picked from commit debe13629f)
2017-08-08 13:02:23 +09:00
smoogipooo
c5ce86b9f3 Add reversing capability to ScrollingPlayfield. 2017-08-08 12:59:50 +09:00
Dean Herbert
5704e9ee65 Fix failing at beginning of map 2017-08-08 12:58:43 +09:00
Dean Herbert
ff490cf44c Add catching support 2017-08-08 12:58:43 +09:00
Dean Herbert
99a00ed319 Make fruit look a bit better (and buffer them to a texture) 2017-08-08 12:58:43 +09:00
Dean Herbert
3926238be9 Allow DrawableHitObjects to be removed from a Playfield 2017-08-08 10:53:59 +09:00
Dean Herbert
4bdaa8ae68 Add basic miss support 2017-08-08 10:36:05 +09:00
Dean Herbert
e67379b6de Use ScrollingHitRenderer 2017-08-08 10:35:56 +09:00
Dean Herbert
debe13629f Don't set RelativePositionAxes when setting ScrollingAxes 2017-08-08 09:20:54 +09:00
Dean Herbert
bb63d99fb8 Merge branch 'catch-catcher' into catch 2017-08-08 07:48:38 +09:00
Dean Herbert
70585a279d Comment out unused variables for now 2017-08-08 07:48:03 +09:00
Dean Herbert
bbeb14f99d Merge remote-tracking branch 'smoogipooo/timingchange-improvements' into catch 2017-08-08 07:37:31 +09:00
Dean Herbert
4d1dd70cfb Licence headers 2017-08-08 07:32:23 +09:00
Dean Herbert
825e854aff Merge branch 'master' into catch-catcher 2017-08-08 07:28:55 +09:00
Dean Herbert
fe625f711a Update framework 2017-08-08 07:22:03 +09:00
Dean Herbert
fc30c471ed Update resources 2017-08-08 07:18:31 +09:00
smoogipooo
bcd1b61529 Use OsuTestCase. 2017-08-07 18:11:45 +09:00
smoogipooo
bd2ef4dc6b Line endings + license headers. 2017-08-07 18:03:44 +09:00
smoogipooo
12f9793fec Fix mania bar lines not working. 2017-08-07 17:46:22 +09:00
smoogipooo
62ee613da3 Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-07 17:35:53 +09:00
smoogipooo
f3c05fe232 CI fixes. 2017-08-07 17:34:57 +09:00
smoogipooo
9c0a0b1e2c Rewrite/add comments. 2017-08-07 17:27:50 +09:00
smoogipooo
933740664c SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming. 2017-08-07 16:43:54 +09:00
smoogipooo
0d3797b497 Remove TestCaseScrollingHitObjects, replace with TestCaseScrollingPlayfield. 2017-08-07 16:25:19 +09:00