Dean Herbert
|
bf9b210a44
|
Merge pull request #2708 from DrabWeb/multiplayer-match
Multiplayer match screen
|
2018-06-21 10:33:37 +09:00 |
|
Dean Herbert
|
2a42418dbf
|
Tidy up ReadyButton
|
2018-06-21 10:21:54 +09:00 |
|
Dean Herbert
|
4c068097c8
|
Change required child to use same structure as other use cases
|
2018-06-21 10:12:12 +09:00 |
|
Dean Herbert
|
2697579448
|
Give TestLounge a background to make transitions work correctly
|
2018-06-21 09:54:13 +09:00 |
|
Dean Herbert
|
96100a2200
|
Remove schedule logic (seems unnecessary)
|
2018-06-20 17:41:48 +09:00 |
|
Dean Herbert
|
39649747aa
|
Simplify and synchronise multiplayer screen transitions
|
2018-06-20 17:25:22 +09:00 |
|
Dean Herbert
|
f0c72438a3
|
Group ValueChanged attachment with bindings
|
2018-06-20 17:06:02 +09:00 |
|
Dean Herbert
|
3f020a2802
|
Merge branch 'master' into multiplayer-match
|
2018-06-20 14:49:32 +09:00 |
|
Dean Herbert
|
a01a0b7d52
|
Merge pull request #2831 from ThePyrotechnic/ShowMorePadding
Add padding to "show more" button
|
2018-06-20 12:27:47 +09:00 |
|
Dean Herbert
|
3eb0a17978
|
Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
|
2018-06-20 10:45:43 +09:00 |
|
Dean Herbert
|
d7f65d62e0
|
Use vertical/horizontal pair instead
|
2018-06-20 10:45:35 +09:00 |
|
Dean Herbert
|
03db19eb9c
|
Merge pull request #2838 from tom-arrow/ruleset-container
RulesetContainer<TObject> cannot be derived
|
2018-06-20 10:36:31 +09:00 |
|
Dan Balasescu
|
77e03a59a9
|
Merge branch 'master' into ruleset-container
|
2018-06-19 21:47:10 +09:00 |
|
Tom Arrow
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
Dean Herbert
|
58b551b98e
|
Merge pull request #2836 from peppy/update-framework
Update framework
|
2018-06-19 21:12:16 +09:00 |
|
Dan Balasescu
|
0b1b3319aa
|
Merge branch 'master' into update-framework
|
2018-06-19 20:57:19 +09:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
cb24957c62
|
Merge branch 'master' into reverse-arrow-fix
|
2018-06-19 20:06:37 +09:00 |
|
Dan Balasescu
|
c1c95dfe84
|
Merge pull request #2833 from peppy/update-configuration-names
Update rider configuration names
|
2018-06-19 18:42:41 +09:00 |
|
Dean Herbert
|
15f3a05c83
|
Update rider configuration names
|
2018-06-19 18:09:02 +09:00 |
|
Dean Herbert
|
b8f9caf418
|
Merge branch 'master' into multiplayer-match
|
2018-06-19 17:18:33 +09:00 |
|
Michael Manis
|
a0f1143287
|
Add padding to 'show more' button
|
2018-06-18 19:14:44 -04:00 |
|
Tom Arrow
|
4aa89de2d7
|
Fix reverse arrow displayed with incorrect angle
|
2018-06-18 17:22:01 +02:00 |
|
Dean Herbert
|
ec81ed1c8d
|
Merge pull request #2631 from smoogipoo/compose-timeline-colours
Colourise the editor waveform
|
2018-06-18 04:39:49 +09:00 |
|
Dean Herbert
|
b1d059a67d
|
Add some colours to the compose-mode timeline
|
2018-06-18 04:31:47 +09:00 |
|
Dean Herbert
|
60d1295bc6
|
Merge pull request #2780 from smoogipoo/timeline-markers
Add centre marker to the editor timeline
|
2018-06-18 03:42:04 +09:00 |
|
Dean Herbert
|
bec6e3083e
|
Remove scrollbar depth change as scrollbar is hidden now
|
2018-06-18 03:19:21 +09:00 |
|
Dean Herbert
|
d58ef96a23
|
Merge branch 'master' into timeline-markers
|
2018-06-18 03:14:04 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
31f9d0161d
|
Add a comment about precision scroll behaviour
|
2018-06-18 03:03:09 +09:00 |
|
Dean Herbert
|
ae160baa6e
|
Merge branch 'master' into timeline-input-adjustment
|
2018-06-18 02:54:25 +09:00 |
|
Dean Herbert
|
48613ea1f6
|
Merge branch 'master' into timeline-markers
|
2018-06-18 02:09:20 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
6fa72c510f
|
Avoid listing the base mods twice
|
2018-06-18 00:48:35 +09:00 |
|
Dean Herbert
|
bf958d736b
|
Merge branch 'master' into mania-keymod-optimisation
|
2018-06-18 00:42:26 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
5b344525e1
|
Move proxy state check to base class
|
2018-06-18 00:27:18 +09:00 |
|
Dean Herbert
|
479eac8aa8
|
Merge branch 'master' into fix-taiko-proxies
|
2018-06-17 19:38:52 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
a20ec0d4cc
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:21 +09:00 |
|
smoogipoo
|
08f172ba98
|
Make testcase work on appveyor (no BASS)
|
2018-06-17 19:01:18 +09:00 |
|
Dean Herbert
|
e0ee5e2085
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:16 +09:00 |
|
smoogipoo
|
0695615c6a
|
Remove MusicController from compose timeline testcase
|
2018-06-17 19:01:14 +09:00 |
|
smoogipoo
|
6c100caba7
|
Use existing instance of beatmap rather than adding more resources
|
2018-06-17 19:00:58 +09:00 |
|
smoogipoo
|
0a99d21938
|
Use the passed-in ruleset
|
2018-06-17 18:01:28 +09:00 |
|
smoogipoo
|
4575319102
|
Privatise the proxied content
|
2018-06-17 17:56:46 +09:00 |
|
smoogipoo
|
99ef44eca2
|
Merge remote-tracking branch 'origin/master' into fix-taiko-proxies
|
2018-06-17 17:54:50 +09:00 |
|
Dean Herbert
|
719056ca4a
|
Merge branch 'master' into mania-keymod-optimisation
|
2018-06-15 18:29:27 +09:00 |
|
Dean Herbert
|
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 |
|