為什麼
|
ec38669145
|
Merge branch 'master' into master
|
2018-01-07 13:58:26 +09:00 |
|
為什麼
|
0acceba2fe
|
Merge branch 'master' into master
|
2018-01-07 13:57:51 +09:00 |
|
Dean Herbert
|
8a4ab6c03d
|
Merge pull request #1862 from FreezyLemon/fix-mania-hitobject-test
Fix TestCaseManiaHitObjects exception on load
|
2018-01-07 11:37:45 +09:00 |
|
FreezyLemon
|
47f5b23dcf
|
fix child size == 0 exception
|
2018-01-07 00:53:44 +01:00 |
|
ANDY840119-PC\andy840119
|
6437efb54f
|
update framework again....
|
2018-01-06 11:38:22 +09:00 |
|
ANDY840119-PC\andy840119
|
6585610dfe
|
update resource branch
|
2018-01-06 11:28:57 +09:00 |
|
ANDY840119-PC\andy840119
|
ca7cd40fba
|
1. update from ppy master
2. update header
|
2018-01-06 11:21:10 +09:00 |
|
為什麼
|
98929952e3
|
Merge branch 'master' into master
|
2018-01-06 11:17:15 +09:00 |
|
ANDY840119-PC\andy840119
|
50aaf571fb
|
miss
|
2018-01-06 11:08:49 +09:00 |
|
ANDY840119-PC\andy840119
|
a55ac899a8
|
fix Empty argument list is redundant
|
2018-01-06 11:08:04 +09:00 |
|
ANDY840119-PC\andy840119
|
232381533c
|
update framework again
|
2018-01-06 10:43:22 +09:00 |
|
ANDY840119-PC\andy840119
|
065ebe896b
|
Merge branch 'master' of https://github.com/andy840119/osu
|
2018-01-06 10:35:21 +09:00 |
|
ANDY840119-PC\andy840119
|
eb37c361d8
|
fix framework branch
|
2018-01-06 10:34:45 +09:00 |
|
ANDY840119-PC\andy840119
|
356c7ad528
|
Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu into mania_fix
# Conflicts:
# osu-framework
|
2018-01-05 23:29:33 +09:00 |
|
Dean Herbert
|
35297f000c
|
Merge pull request #1857 from peppy/udpate-licence-header
Update licence headers
|
2018-01-05 20:46:55 +09:00 |
|
Dean Herbert
|
d1f03ebf0c
|
Update in line with framework
|
2018-01-05 20:29:14 +09:00 |
|
Dean Herbert
|
fd60485dd2
|
Update submodules
|
2018-01-05 20:28:38 +09:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dean Herbert
|
33eaf96bcb
|
Merge pull request #1847 from ppy/osu/mania-keymods
Implement osu!mania key mods
|
2018-01-05 14:11:00 +09:00 |
|
Dean Herbert
|
b2e723d288
|
Merge branch 'master' into mania-keymods
|
2018-01-05 13:55:20 +09:00 |
|
Dean Herbert
|
8f06f7d72e
|
Merge pull request #1845 from smoogipoo/mania-rc-cleanup
Cleanup osu!mania's RulesetContainer and Beatmap conversion process
|
2018-01-05 13:55:05 +09:00 |
|
Dean Herbert
|
01038bd9bb
|
Merge branch 'master' into mania-rc-cleanup
|
2018-01-05 10:18:15 +09:00 |
|
Dean Herbert
|
c26db17e0b
|
Merge pull request #1855 from smoogipoo/ci-cleaunps
Cleanup some possible CI errors
|
2018-01-05 10:00:24 +09:00 |
|
smoogipoo
|
5eb2dc3d64
|
Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
|
2018-01-05 01:20:24 +09:00 |
|
Dean Herbert
|
8c2cc4c85b
|
Merge pull request #1840 from Aergwyn/fix-slider-follow-circle
Fix slider follow circle instantly disappearing on slider ends
|
2018-01-04 21:03:14 +09:00 |
|
Dean Herbert
|
0cc8516aa3
|
Remove empty cases, add initial ball scale adjust.
|
2018-01-04 20:53:33 +09:00 |
|
Dean Herbert
|
717b263b77
|
Comment and better stacking of FadeOuts
|
2018-01-04 20:47:42 +09:00 |
|
Dean Herbert
|
1f62fe19d5
|
Make animation a bit more subtle
|
2018-01-04 20:43:42 +09:00 |
|
Dean Herbert
|
155e84d2b7
|
Update framework
|
2018-01-04 20:24:59 +09:00 |
|
Dean Herbert
|
ffc7f7ecf4
|
Add a better slider "hit" state fade out animation
|
2018-01-04 20:16:10 +09:00 |
|
Dean Herbert
|
bde957940d
|
Disallow SliderBall from contracting after EndTime
|
2018-01-04 20:09:58 +09:00 |
|
smoogipoo
|
f569d54958
|
Local circlesize/od variables
|
2018-01-04 19:52:29 +09:00 |
|
Dean Herbert
|
5310db7990
|
Merge branch 'master' into fix-slider-follow-circle
|
2018-01-04 15:42:51 +09:00 |
|
Dean Herbert
|
6e8e82e264
|
Merge pull request #1813 from ColdVolcano/wedge-unicode
Permit BeatmapInfoWedge to display Unicode artist and title
|
2018-01-04 15:17:35 +09:00 |
|
Dean Herbert
|
9bce322682
|
Merge branch 'master' into wedge-unicode
|
2018-01-04 15:09:31 +09:00 |
|
ANDY840119-PC\andy840119
|
409664e4dc
|
White space needs to be trimmed
|
2018-01-03 23:50:52 +09:00 |
|
ANDY840119-PC\andy840119
|
aadafae8cb
|
1. fix TestCaseManiaHitObjects broken
2. add (4+4) (2+4+2) (1+8+1) column stages step in TestCaseManiaPlayfield
|
2018-01-03 23:47:05 +09:00 |
|
ANDY840119-PC\andy840119
|
a855a21ccb
|
group -> stage
|
2018-01-03 23:04:51 +09:00 |
|
ANDY840119-PC\andy840119
|
5326f71ed9
|
fix some error that smoogipoo says
|
2018-01-03 22:58:08 +09:00 |
|
Dan Balasescu
|
227cae3ff8
|
Merge pull request #1844 from james58899/fix-storyboard-path
Fix storyboard file paths on Linux/macOS using incorrect path separators
|
2018-01-03 22:34:19 +09:00 |
|
ANDY840119-PC\andy840119
|
edb1401f00
|
Merge branch 'master' of https://github.com/andy840119/osu
|
2018-01-03 22:07:06 +09:00 |
|
smoogipoo
|
823a430d30
|
Nothing to see here, move along
|
2018-01-03 22:02:54 +09:00 |
|
ANDY840119-PC\andy840119
|
ee13df94fc
|
Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
|
2018-01-03 22:02:50 +09:00 |
|
Aergwyn
|
1ce6219293
|
remove unnecessary override
|
2018-01-03 13:55:24 +01:00 |
|
為什麼
|
9ecbb5d604
|
Merge branch 'master' into master
|
2018-01-03 21:55:23 +09:00 |
|
smoogipoo
|
da5bc959ad
|
Fix testcase
|
2018-01-03 21:46:39 +09:00 |
|
smoogipoo
|
333e1867ab
|
Implement osu!mania keymods
ScoreMultiplier not currently working - that's a more involved change that requires the aforementioned "BeatmapAttributes" changes.
|
2018-01-03 21:27:32 +09:00 |
|
smoogipoo
|
a4d05e5102
|
Implement interface on ManiaKeyMod for now
|
2018-01-03 21:26:36 +09:00 |
|
smoogipoo
|
b68daaeb4b
|
Group -> Stage
|
2018-01-03 19:13:42 +09:00 |
|
smoogipoo
|
6d253fd33c
|
Add a way to adjust the conversion process with mods
|
2018-01-03 19:06:20 +09:00 |
|