e201f9fd72
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
2018-06-17 14:17:06 +02:00
cd0fe6a09e
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
2018-06-17 14:15:14 +02:00
479eac8aa8
Merge branch 'master' into fix-taiko-proxies
2018-06-17 19:38:52 +09:00
3c26556a23
Merge pull request #2617 from smoogipoo/timeline-audio-scrolling
...
Couple the editor waveform timeline to the audio
2018-06-17 19:33:05 +09:00
a20ec0d4cc
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:21 +09:00
08f172ba98
Make testcase work on appveyor (no BASS)
2018-06-17 19:01:18 +09:00
e0ee5e2085
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:16 +09:00
0695615c6a
Remove MusicController from compose timeline testcase
2018-06-17 19:01:14 +09:00
6c100caba7
Use existing instance of beatmap rather than adding more resources
2018-06-17 19:00:58 +09:00
0a99d21938
Use the passed-in ruleset
2018-06-17 18:01:28 +09:00
4575319102
Privatise the proxied content
2018-06-17 17:56:46 +09:00
99ef44eca2
Merge remote-tracking branch 'origin/master' into fix-taiko-proxies
2018-06-17 17:54:50 +09:00
4eda017fa5
Fix CI error
2018-06-17 17:54:05 +09:00
55f0b3c42c
Distance object generator should output a secondary pattern
...
In osu!stable, only the hitobjects which ended at the distance object's EndTime would be considered for further pattern generation.
Previously this generator was group _all_ objects including those that don't end at the object's EndTime, resulting in incorrect hitobject count for further pattern generation.
2018-06-15 22:10:57 +09:00
2d59ae9354
Commit forgotten variable
2018-06-15 22:08:24 +09:00
faff7feef1
Remove unnecessary white space change
2018-06-15 15:03:09 +02:00
6938adc148
Unify join time text's visual format with the web
2018-06-15 15:00:41 +02:00
38feb7651c
Set text at updateTime
2018-06-15 14:34:01 +02:00
d122547c1e
DrawableJoinDate handles "Here since the beginning" text
2018-06-15 14:28:49 +02:00
f0fbc04d92
Adjust formats to be EN-UK
2018-06-15 14:11:21 +02:00
53a6d01304
Fix stair type not being flipped correctly
2018-06-15 21:06:54 +09:00
5f5d797c1e
Remove unused field
2018-06-15 21:06:35 +09:00
e51f96e181
Fix some notes not being recorded
2018-06-15 20:53:18 +09:00
c1f7db80f1
Forgot to commit random change
2018-06-15 20:52:09 +09:00
fe9aaf000c
Fix missing conditional
2018-06-15 20:50:36 +09:00
481546ec7a
Fix drain time not being rounded to the second
2018-06-15 20:49:11 +09:00
afbf35b814
Add rng components to mania conversion tests
2018-06-15 20:48:48 +09:00
47ae962099
Output only one mapping failure per mapping
2018-06-15 18:36:22 +09:00
57011ff13b
Merge branch 'master' into mania-playfield-inversions
2018-06-15 18:33:40 +09:00
719056ca4a
Merge branch 'master' into mania-keymod-optimisation
2018-06-15 18:29:27 +09:00
f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes
2018-06-15 18:29:20 +09:00
cdc88a6c48
Merge pull request #2802 from smoogipoo/diffcalc-rework
...
Rework difficulty calculators to better support mods and attributes
2018-06-15 18:22:43 +09:00
a6437c005c
Merge branch 'master' into diffcalc-rework
2018-06-15 18:02:18 +09:00
9374415307
Merge pull request #2775 from smoogipoo/fix-taiko-hitexplosions
...
Make sure taiko hitexplosions expire and get removed
2018-06-15 18:00:47 +09:00
e945186978
Expose the beatmap converter
2018-06-15 17:59:52 +09:00
30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions
2018-06-15 17:52:53 +09:00
eac5db5dbc
Merge pull request #2812 from peppy/droplets-should-bounce
...
Fix droplets not bouncing off catcher's plate immediately
2018-06-15 17:52:28 +09:00
99e28b6efa
No reason for beatmap conversion tests to be internal
2018-06-15 17:39:33 +09:00
0ba80fad60
Merge branch 'master' into droplets-should-bounce
2018-06-15 17:34:54 +09:00
d7353135de
Merge pull request #2810 from peppy/remove-migrate-exception
...
Remove custom migration exception
2018-06-15 17:34:46 +09:00
5d105cd08d
Avoid errors being logged when importing beatmaps while logged out
2018-06-15 17:23:03 +09:00
234ed04cdd
Merge branch 'master' into remove-migrate-exception
2018-06-15 17:22:34 +09:00
ee88444be5
Merge pull request #2813 from peppy/fix-music-controller-drag
...
Fix music controller draggability
2018-06-15 17:22:29 +09:00
db9141a6cf
Merge branch 'master' into fix-music-controller-drag
2018-06-15 17:08:01 +09:00
87d69b93a6
Merge pull request #2792 from peppy/fix-volume-pixellation
...
Fix pixellation of volume meter progress bars
2018-06-15 17:07:50 +09:00
40daa87f22
Merge branch 'master' into fix-music-controller-drag
2018-06-15 17:07:25 +09:00
aaf3ef240e
Remove easily-confused comment
2018-06-15 17:07:07 +09:00
8b5a9c3236
Merge branch 'master' into fix-volume-pixellation
2018-06-15 16:45:15 +09:00
e8fcc01ca4
Merge pull request #2807 from smoogipoo/mania-conversion-fixes
...
Fix a few osu!mania beatmap conversion edge cases
2018-06-15 16:45:10 +09:00
f7b2da852f
Merge branch 'master' into mania-conversion-fixes
2018-06-15 16:33:46 +09:00
