0d154621b6
Cleanup testcase
2018-06-18 16:09:38 +09:00
c74c059044
Merge branch 'master' into multiple_previews_different_overlays
2018-06-18 05:05:27 +09:00
1d9d240454
Merge branch 'master' into mania-playfield-inversions
2018-06-18 04:41:17 +09:00
ec81ed1c8d
Merge pull request #2631 from smoogipoo/compose-timeline-colours
...
Colourise the editor waveform
2018-06-18 04:39:49 +09:00
b1d059a67d
Add some colours to the compose-mode timeline
2018-06-18 04:31:47 +09:00
60d1295bc6
Merge pull request #2780 from smoogipoo/timeline-markers
...
Add centre marker to the editor timeline
2018-06-18 03:42:04 +09:00
bec6e3083e
Remove scrollbar depth change as scrollbar is hidden now
2018-06-18 03:19:21 +09:00
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
e89155f87c
Merge pull request #2783 from smoogipoo/timeline-input-adjustment
...
Make the editor timeline zoom on mouse scroll
2018-06-18 03:11:17 +09:00
31f9d0161d
Add a comment about precision scroll behaviour
2018-06-18 03:03:09 +09:00
ae160baa6e
Merge branch 'master' into timeline-input-adjustment
2018-06-18 02:54:25 +09:00
48613ea1f6
Merge branch 'master' into timeline-markers
2018-06-18 02:09:20 +09:00
62a2a5fbb4
Merge pull request #2804 from smoogipoo/mania-keymod-optimisation
...
Don't compute keymod difficulties for mania-specific beatmap
2018-06-18 02:07:02 +09:00
6fa72c510f
Avoid listing the base mods twice
2018-06-18 00:48:35 +09:00
bf958d736b
Merge branch 'master' into mania-keymod-optimisation
2018-06-18 00:42:26 +09:00
c09b3f2a02
Merge pull request #2777 from smoogipoo/fix-taiko-proxies
...
Make taiko hitobjects properly unproxy when rewound
2018-06-18 00:41:08 +09:00
5b344525e1
Move proxy state check to base class
2018-06-18 00:27:18 +09: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
