|
|
3f020a2802
|
Merge branch 'master' into multiplayer-match
|
2018-06-20 14:49:32 +09:00 |
|
|
|
ee0950a845
|
Merge branch 'master' into select_resolution_in_fullscreen_mode
|
2018-06-20 13:19:39 +09:00 |
|
|
|
b95042e370
|
Fix background screens not supporting early-exit condition
Closes #2681.
|
2018-06-20 12:43:48 +09:00 |
|
|
|
a01a0b7d52
|
Merge pull request #2831 from ThePyrotechnic/ShowMorePadding
Add padding to "show more" button
|
2018-06-20 12:27:47 +09:00 |
|
|
|
3eb0a17978
|
Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
|
2018-06-20 10:45:43 +09:00 |
|
|
|
d7f65d62e0
|
Use vertical/horizontal pair instead
|
2018-06-20 10:45:35 +09:00 |
|
|
|
03db19eb9c
|
Merge pull request #2838 from tom-arrow/ruleset-container
RulesetContainer<TObject> cannot be derived
|
2018-06-20 10:36:31 +09:00 |
|
|
|
d753df65a5
|
Remove default bindings for right actions
|
2018-06-19 18:04:53 +02:00 |
|
|
|
77e03a59a9
|
Merge branch 'master' into ruleset-container
|
2018-06-19 21:47:10 +09:00 |
|
|
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
|
|
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 |
|
|
|
e17d60db8a
|
Merge branch 'master' into improve-editor-scrolling
|
2018-06-19 20:23:41 +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 |
|
|
|
b8f9caf418
|
Merge branch 'master' into multiplayer-match
|
2018-06-19 17:18:33 +09:00 |
|
|
|
6cd9a22e26
|
Update testcase
|
2018-06-19 13:52:24 +09:00 |
|
|
|
a623155b9f
|
Fix missing using
|
2018-06-19 13:51:53 +09:00 |
|
|
|
a0f1143287
|
Add padding to 'show more' button
|
2018-06-18 19:14:44 -04:00 |
|
|
|
4aa89de2d7
|
Fix reverse arrow displayed with incorrect angle
|
2018-06-18 17:22:01 +02:00 |
|
|
|
f090e82b63
|
Fix inverted conditional
|
2018-06-18 21:06:09 +09:00 |
|
|
|
0625bfda30
|
Don't split single hitobject into multiple patterns
|
2018-06-18 20:17:49 +09:00 |
|
|
|
8529cece4a
|
Fix precision error
|
2018-06-18 20:17:19 +09:00 |
|
|
|
8c671f93fc
|
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-18 19:32:04 +09:00 |
|
|
|
54e60d8bc2
|
Fix test appveyor tests failing due to lack of audio manager
|
2018-06-18 19:27:22 +09:00 |
|
|
|
6d318d35ee
|
Fix not being able to seek by other means during flick-scroll
|
2018-06-18 18:56:54 +09:00 |
|
|
|
dbc50e35d5
|
Fix the timeline and editor fighting over track seeking
|
2018-06-18 18:02:26 +09:00 |
|
|
|
01b909eaa7
|
Add testfixture annotation
|
2018-06-18 17:06:21 +09:00 |
|
|
|
ffc5d7bd43
|
Fix some incorrect test case values
|
2018-06-18 17:05:04 +09:00 |
|
|
|
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 |
|
|
|
1f04dd9ada
|
Cache the dependencies using the static method of the class Dependencies.
|
2018-06-17 15:08:13 +02:00 |
|
