|
|
58b551b98e
|
Merge pull request #2836 from peppy/update-framework
Update framework
|
2018-06-19 21:12:16 +09:00 |
|
|
|
0b1b3319aa
|
Merge branch 'master' into update-framework
|
2018-06-19 20:57:19 +09:00 |
|
|
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
|
|
b9d63ee7b1
|
Merge pull request #2829 from tom-arrow/reverse-arrow-fix
Fix reverse arrow displayed with incorrect angle
|
2018-06-19 20:17:16 +09:00 |
|
|
|
cb24957c62
|
Merge branch 'master' into reverse-arrow-fix
|
2018-06-19 20:06:37 +09:00 |
|
|
|
c1c95dfe84
|
Merge pull request #2833 from peppy/update-configuration-names
Update rider configuration names
|
2018-06-19 18:42:41 +09:00 |
|
|
|
15f3a05c83
|
Update rider configuration names
|
2018-06-19 18:09:02 +09:00 |
|
|
|
4aa89de2d7
|
Fix reverse arrow displayed with incorrect angle
|
2018-06-18 17:22:01 +02: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 |
|
|
|
719056ca4a
|
Merge branch 'master' into mania-keymod-optimisation
|
2018-06-15 18:29:27 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a2950b1d80
|
Fix incorrect comment
|
2018-06-15 16:12:18 +09:00 |
|
