1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 12:17:46 +08:00
Commit Graph

7650 Commits

Author SHA1 Message Date
smoogipoo
b97c4e8b44 Fix all possible cases of crossthread import data races 2018-04-09 12:45:44 +09:00
Dean Herbert
421e9e0641 Add xmldoc to some high-level classes to explain their separation 2018-04-08 12:58:34 +09:00
TocoToucan
640be621ac Handle multiple song previews playing in different beatmap categories on profile 2018-04-07 13:29:46 +03:00
Dean Herbert
c2a2457160
Merge branch 'master' into manual-input-test-case 2018-04-06 20:42:08 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update 2018-04-06 20:16:13 +09:00
Dean Herbert
6bc319caae
Merge branch 'master' into manual-input-test-case 2018-04-06 20:07:07 +09:00
Dean Herbert
cd48cb1887 Add comment 2018-04-06 19:53:23 +09:00
smoogipoo
070e68f235 Give the test case clock an accurate IsRunning value 2018-04-06 19:14:04 +09:00
smoogipoo
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect 2018-04-06 12:37:16 +03:00
smoogipoo
b238130fe4 DI beat divisors to test cases with editor clocks 2018-04-06 18:23:22 +09:00
smoogipoo
9e8490735f Fix Compose not binding to the editor's beat divisor 2018-04-06 18:22:24 +09:00
smoogipoo
248be8e35f HitObjectComposer no longer needs a beat divisor 2018-04-06 18:21:45 +09:00
smoogipoo
fdb3227fd7 Fix + cleanup testcases 2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383 Create ManualInputManagerTestCase
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
acbdbcc3df Update AssemblyInfo in line with framework changes 2018-04-06 13:17:26 +09:00
Dean Herbert
5426432e46 Fix drag select crashing 2018-04-06 11:47:21 +09:00
Dean Herbert
32e8d93596 Fix selection changing when clicking overlapping hitobjects 2018-04-06 11:22:36 +09:00
Dean Herbert
24b9a8c983 Allow HitObjectMasks to handle drag events directly 2018-04-06 10:29:34 +09:00
Dean Herbert
5749e71560 Apply review fixes 2018-04-05 21:06:48 +09:00
Dean Herbert
345cfb077d No need to sort list any more 2018-04-05 21:03:39 +09:00
Dean Herbert
1a6dfcbc1c Merge branch 'master' into selectionlayer-rewrite 2018-04-05 21:03:29 +09:00
Dean Herbert
37fb207abd Remove TestTestCase
No longer necessary as we have restructured tests considerably.
2018-04-05 16:01:33 +09:00
Dean Herbert
0ad4b8a6f8 Remove TestTestCase
No longer necessary as we have restructured tests considerably.
2018-04-05 15:55:47 +09:00
naoey
ca4299c6fe
Remove unused using and fix possible nullref. 2018-04-04 22:07:24 +05:30
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay.
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
2018-04-04 21:46:31 +05:30
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite 2018-04-04 20:47:36 +09:00
Dean Herbert
216c4629e0 Fix dragging backwards not deselecting pending selection 2018-04-04 20:44:22 +09:00
Dean Herbert
b7325d73e8 Don't inherit VisbilityContainer 2018-04-04 20:44:11 +09:00
Dean Herbert
94c3f38541 Pass down input state instead of parent lookup 2018-04-04 20:06:45 +09:00
Dean Herbert
2b15555ede Remove MaskContainer dependency in MaskSelection 2018-04-04 20:05:01 +09:00
Dean Herbert
5c036b966b Formatting fixes 2018-04-04 20:04:54 +09:00
Dean Herbert
a997ec6139 Fix ShouldBeAlive state 2018-04-04 19:51:56 +09:00
Dean Herbert
31a7db0a35 Fix drag mishaps 2018-04-04 19:42:59 +09:00
Dean Herbert
bce114a37b Make AliveMasks private 2018-04-04 18:55:17 +09:00
Dean Herbert
4d71f2084c Move individual mask selection logic out of MaskSelection 2018-04-04 18:29:53 +09:00
Dean Herbert
b6b8c51657 Remove DragLayer dependency on MaskContainer 2018-04-04 18:20:32 +09:00
Dean Herbert
c2d371797e Fix unbind failure 2018-04-04 17:38:34 +09:00
Dean Herbert
c712b29b5b Rename dragBox to dragLayer 2018-04-04 16:24:27 +09:00
Dean Herbert
4196bb8c24 Move selection logic to MaskContainer 2018-04-04 16:24:13 +09:00
Dean Herbert
d453c2589a Add an explanatory comment for weird override 2018-04-04 16:02:20 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite 2018-04-04 15:38:27 +09:00
Dan Balasescu
d418a4803f
Merge branch 'master' into colours-for-judgements 2018-04-04 15:13:52 +09:00
Dan Balasescu
bed46b1f7e
Split local variable assignment from construction of children 2018-04-04 15:13:42 +09:00
Dan Balasescu
9df525a38d
Remove extra whitespace
In general we don't really do this elsewhere in the codebase.
2018-04-04 15:11:16 +09:00
DrabWeb
65f0e91734 Use Interpolation function directly for resizing tab strips. 2018-04-04 03:04:26 -03:00
Dan Balasescu
b5d7a5df00
Merge branch 'master' into colours-for-judgements 2018-04-04 15:02:03 +09:00
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip 2018-04-04 14:20:06 +09:00
smoogipoo
4f19059e55 DragBox -> DragLayer 2018-04-03 21:29:49 +09:00
Dean Herbert
ddba7254ca Merge remote-tracking branch 'upstream/master' into linq 2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite 2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix 2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite 2018-04-03 03:05:42 +09:00
smoogipoo
fd9480cfb6 Handle timingpoint FormatException 2018-04-02 20:08:40 +09:00
smoogipoo
d24d81d8a9 De-pluralize some methods 2018-04-02 20:07:18 +09:00
smoogipoo
69e2d4fd22 Make CarouselRoot a nested class 2018-04-02 15:24:08 +09:00
Dan Balasescu
6f88a80bde
Merge branch 'master' into alt-eagerselect 2018-04-02 15:18:22 +09:00
smoogipoo
82a847b820 Extract random selection logic into CarouselRoot 2018-04-02 15:16:10 +09:00
Dan Balasescu
83dcff2907
Merge branch 'master' into fix-songselect-exit-notimplemented 2018-04-02 13:54:06 +09:00
Dan Balasescu
32832304a7
Merge branch 'master' into fix-songselect-exit-notimplemented 2018-04-02 13:53:41 +09:00
Dan Balasescu
323534c721
Merge branch 'master' into fix-file-extension-matching 2018-04-02 13:27:14 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
smoogipoo
551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +09:00
Ali Rizvi
7fed8d64de Implement Judgement Colours 2018-03-31 04:59:08 +09:00
Dean Herbert
cf3cafd9a9
Merge branch 'master' into beatmap-set-status 2018-03-30 20:55:36 +09:00
Dean Herbert
c39f056b3b Fix skin path being ignored in extension agnostic lookups
Closes #2295.
2018-03-30 18:06:18 +09:00
Endrik Tombak
7e30375443 Use selectNextRandom instead 2018-03-30 10:46:46 +03:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked 2018-03-30 16:35:00 +09:00
smoogipoo
f1f7d978ec Add some comments 2018-03-30 16:28:59 +09:00
smoogipoo
69a7ddbf1e Fix ordering of display/input of HitObjectMasks 2018-03-30 16:28:49 +09:00
smoogipoo
53541a5c8d Add license header 2018-03-30 15:53:31 +09:00
smoogipoo
5d0a636cc4 Rename SelectionBox -> Selection 2018-03-30 15:51:38 +09:00
smoogipoo
1dca1663c3 Handle all selection events within SelectionBox (incl. single-mask) 2018-03-30 15:50:55 +09:00
smoogipoo
082e5e4949 Reduce iterations of DragBox 2018-03-30 15:06:52 +09:00
Dean Herbert
31ade986a7 Scren async changes in line with framework changes
Makes editor not stutter on load, amongst other screens.
2018-03-30 14:58:11 +09:00
Joseph Madamba
0887dafa2c Revert changes on hard rock mod 2018-03-29 20:36:52 -07:00
Dean Herbert
e1123c5a95
Merge branch 'master' into selectionlayer-rewrite 2018-03-30 12:29:58 +09:00
Endrik Tombak
3f65e3a7e3 Make selection at random when last was null 2018-03-30 00:15:32 +03:00
DrabWeb
e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
DrabWeb
3d05798d80 Change SearchableListOverlay to use OsuTabControl strip. 2018-03-29 15:34:53 -03:00
DrabWeb
f43b009b96 Add optional strip to OsuTabControl. 2018-03-29 15:29:45 -03:00
smoogipoo
6b2ca36657 Add license header 2018-03-29 22:52:42 +09:00
smoogipoo
6767dd3d4a Fix hitobject masks dying with no recovery 2018-03-29 22:42:42 +09:00
smoogipoo
d9c5a0c6d1 Fix position editing not working 2018-03-29 22:38:44 +09:00
smoogipoo
4446aeaa0d Commenting + cleanup of HitObjectMask/HitObjectMaskLayer 2018-03-29 22:38:28 +09:00
smoogipoo
d8f26f2260 Make HitObjectMaskLayer not iterate through all masks when deselecting 2018-03-29 22:22:42 +09:00
smoogipoo
1018711cc9 Cleanup SelectionBox 2018-03-29 22:20:56 +09:00
smoogipoo
346de77776 Cleanup DragBox 2018-03-29 22:13:28 +09:00
smoogipoo
04874bcda4 "overlay" -> "mask" 2018-03-29 22:09:22 +09:00
smoogipoo
6d4f94756e Rewrite the way drag + click selections happen
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).

I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.

1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
smoogipoo
57e4281601 Make HitObjectMasks VisibilityContainers 2018-03-29 18:44:15 +09:00
smoogipoo
6314694557 Make HitObjectMaskLayer always create masks for all objects 2018-03-29 17:13:45 +09:00
smoogipoo
187a025d36 Make hitobjects sorted by their start times 2018-03-29 16:07:31 +09:00
Dean Herbert
9aae568bbe Tidy up csproj further 2018-03-28 15:19:56 +09:00
Dean Herbert
94b1d3e4af Make VisualTests/nUnit work again 2018-03-28 12:33:01 +09:00
DrabWeb
84bb96740f Fix merge error. 2018-03-27 18:27:30 -03:00
DrabWeb
19bc6b9168 Merge https://github.com/ppy/osu into beatmap-set-status 2018-03-27 18:13:58 -03:00
DrabWeb
506e27a30e Cleanup. 2018-03-27 17:59:58 -03:00
TocoToucan
458594d24d Qualifier 'this.' is redundant 2018-03-27 18:03:57 +03:00
Dean Herbert
1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
Dean Herbert
988141408f Update copyright year 2018-03-27 15:26:15 +09:00
Dean Herbert
b290d2d039 Move NUnit includes to individual projects 2018-03-27 15:07:09 +09:00
DrabWeb
eb374c5774 Add beatmap set online status and display it in direct panels and the beatmap set overlay. 2018-03-26 21:04:45 -03:00
smoogipoo
dd5bbbbd9f Define testable projects 2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6 Only compile with net461 in visual studio 2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498 Add msbuild/dotnet build + launch targets 2018-03-26 10:52:54 +09:00
FreezyLemon
46d859a660 exit player earlier if a dummy map is loaded 2018-03-25 13:25:48 +02:00
smoogipoo
4dc317d4df Fix msbuild warnings 2018-03-25 03:38:52 +09:00
smoogipoo
097ab66182 Fix resharper error 2018-03-25 01:54:25 +09:00
smoogipoo
d28de89e50 Add net461 target to test projects for nunit discovery
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).
2018-03-25 01:35:50 +09:00
TocoToucan
e91d24f31a Use ScreenshotCaptureMenuCursor in ScreenshotManager 2018-03-24 12:53:01 +03:00
Dean Herbert
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
smoogipoo
ffa712dccb Fix post-merge issues 2018-03-24 15:19:45 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
76886c8e3f
Merge branch 'master' into performance-logging-toggle 2018-03-24 13:32:49 +09:00
Dean Herbert
1996698817 Fix @1x skin elements not being used 2018-03-24 11:40:45 +09:00
Dean Herbert
923f96d940
Merge branch 'master' into performance-logging-toggle 2018-03-24 11:36:20 +09:00
Dean Herbert
3844e95656 Fix one more instance of the same thing happening 2018-03-24 05:55:56 +09:00
Dean Herbert
256baf6d60 Move binding to LoadComplete
Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.
2018-03-24 05:40:51 +09:00
Dean Herbert
b593c47809 Add setting to toggle performance logging 2018-03-24 05:07:48 +09:00
TocoToucan
dd5cc59250 Introduce 'Capture menu cursor' setting 2018-03-23 22:53:06 +03:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade 2018-03-24 03:40:13 +09:00
Dean Herbert
0976e83b33
Merge branch 'master' into fix-api-abort 2018-03-24 03:13:28 +09:00
Dan Balasescu
1576b31a48
Merge branch 'master' into add-perfect-mod-icon 2018-03-23 21:32:15 +09:00
Dan Balasescu
676feb3658
Merge branch 'master' into fix-mod-button-sounds 2018-03-23 21:03:42 +09:00
smoogipoo
f0c0a51108 Convert APIAccess to use cancellation tokens 2018-03-23 20:57:04 +09:00
Dan Balasescu
9ab3610b95
Merge branch 'master' into fix-player-disposal 2018-03-23 20:45:42 +09:00
smoogipoo
afdab7895a Fix beatmap background fade not being updated on retry
Fixes #2287
2018-03-23 20:41:38 +09:00
Dean Herbert
b4eaaa4fd1
Merge branch 'master' into fix-circularprogress-glow 2018-03-23 19:01:28 +09:00
smoogipoo
52fa837447 Fix volume glow being cut off
Fixes #2285.
2018-03-23 18:17:23 +09:00
Dean Herbert
6c4e719e0f Fix API never stopping its thread 2018-03-23 15:46:55 +09:00
Dean Herbert
eb751fa607 Fix event unbind not being unbound correctly 2018-03-23 15:05:28 +09:00
Dean Herbert
b56eee1927 Fix background loaded player never being disposed if early exit occurs 2018-03-23 15:04:40 +09:00
Joseph Madamba
f77dad2809
Add perfect mod icon 2018-03-22 22:49:14 -07:00
Dean Herbert
d4aeb3d00b Fix BeatmapCarousel's flush not correctly applying selection changes
They may have been delayed until the next Update, which is too late in this case.
2018-03-23 12:10:13 +09:00
FreezyLemon
a3d8048aca abort loading and exit player for dummy maps 2018-03-22 21:46:35 +01:00
Dean Herbert
fd124d2ee6
Merge branch 'master' into fix-mod-button-sounds 2018-03-22 21:55:15 +09:00
Dean Herbert
1d3c9098b8 Load component asynchronously 2018-03-22 21:42:57 +09:00
Dean Herbert
e7cb579ec4
Merge branch 'master' into take_screenshot 2018-03-22 21:34:53 +09:00
Dean Herbert
14a653aa28 Restore old auto-popout notification overlay behaviour 2018-03-22 20:55:00 +09:00
Dean Herbert
74191e1b73 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-22 20:49:17 +09:00
Dean Herbert
e41993ac44 Don't bother with an exception that will never happen
Wasn't being caught anyways
2018-03-22 20:45:26 +09:00
Dean Herbert
94847e4a23 Allow clicking notification to open screenshot folder 2018-03-22 20:44:00 +09:00
Dean Herbert
9e080028ff Add shutter sound 2018-03-22 20:42:55 +09:00
Dean Herbert
4883e2fd5b
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:24:10 +09:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:14:50 +09:00
smoogipoo
2b7d22c4ea Very slightly reduce size of slider bar to increase bottom padding 2018-03-22 20:11:55 +09:00
Dan Balasescu
4e2c6ccedc
Merge branch 'master' into skin-scaling 2018-03-22 20:11:30 +09:00
smoogipoo
090c78bf10 Merge remote-tracking branch 'origin/master' into fix-player-loader 2018-03-22 20:00:21 +09:00
Dean Herbert
e5f83530b8 Only allow settings or notifications to be visible at once
Resolves #2273.
2018-03-22 19:49:31 +09:00
Dean Herbert
ee12d75b30
Merge branch 'master' into skin-scaling 2018-03-22 19:30:17 +09:00
Dean Herbert
2d08cee3b4
Merge branch 'master' into skin--completion 2018-03-22 19:04:22 +09:00
Dean Herbert
af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +09:00
smoogipoo
fc85bf919e Merge remote-tracking branch 'origin/master' into focused-textbox-fix 2018-03-22 18:52:06 +09:00
smoogipoo
9f220b3b9b Add explanatory comment 2018-03-22 18:51:03 +09:00
Dean Herbert
366b7fca65 Remove GetColour method 2018-03-22 18:50:19 +09:00
Dean Herbert
425d4aa766 Add ability to lookup arbitrary SkinConfiguration values 2018-03-22 18:10:28 +09:00
Dean Herbert
c4fe6a04c5 Use string lookups for combo colours 2018-03-22 17:32:05 +09:00
Dan Balasescu
ab9505652b Merge branch 'master' into skin--completion 2018-03-22 16:44:00 +09:00
Dean Herbert
b8022070e8 Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin 2018-03-22 16:24:56 +09:00
Dean Herbert
dade52d15d Fix vertical padding 2018-03-22 16:15:14 +09:00
Dan Balasescu
f872402fc4
Merge branch 'master' into accent-colour-properties 2018-03-22 16:10:52 +09:00
Dean Herbert
a4804f47a9 Merge branch 'master' into beat-snap-divisor 2018-03-22 16:06:26 +09:00
Dean Herbert
6e379f0646 Fix FocusedTextBox in line with framework changes 2018-03-22 15:54:16 +09:00
Dean Herbert
5f1bb8d753
Merge branch 'master' into fix-player-loader 2018-03-22 15:46:37 +09:00
Dan Balasescu
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset 2018-03-22 15:29:43 +09:00
smoogipoo
3f3f57e51e Use cached vertexbatch add delegate 2018-03-22 15:13:38 +09:00
Dean Herbert
7bdca0ff39 Merge remote-tracking branch 'upstream/master' into accent-colour-properties 2018-03-22 15:07:28 +09:00
Dean Herbert
9a20839b74
Merge branch 'master' into better-import-notice 2018-03-22 14:57:04 +09:00
Dan Balasescu
dd99a210e2
Merge branch 'master' into ignore-unknown-sections 2018-03-22 14:48:06 +09:00
smoogipoo
dc9fb84e25 Update progress with the current item, not the next item
In the case where there is no next item, the progress will not get updated, so we'll essentially skip one element from filling the progress bar further. In the future we may/will want to not hide the notification upon completion, so this will look better in such scenarios.
2018-03-22 14:46:25 +09:00
Dean Herbert
5104ba8118
Merge branch 'master' into beatmap-as-a-skin 2018-03-22 13:45:30 +09:00
Dean Herbert
917334a39a Move cancel code to exit paths for screen 2018-03-22 13:01:40 +09:00
Dean Herbert
e39b7b8d35 Don't hard-crash when an unknown section is encountered in a legacy file 2018-03-22 12:58:02 +09:00
Dean Herbert
504c3ff0ba BeatmapSkin -> LegacyBeatmapSkin 2018-03-22 12:50:48 +09:00
Dan Balasescu
976702aef9
Merge branch 'master' into fix-osu-logo-sounds 2018-03-22 12:50:45 +09:00
Dean Herbert
c5eecae32f Improve shared code paths in legacy skins 2018-03-22 12:50:23 +09:00
Dean Herbert
78a8f60b39 IHasComboIndex -> IHasComboInformation 2018-03-22 12:35:17 +09:00
Dean Herbert
1a782a840c Fix xmldoc 2018-03-22 12:34:29 +09:00
Dan Balasescu
77ebd94804
Merge branch 'master' into beatmap-as-a-skin 2018-03-22 11:33:27 +09:00
Dan Balasescu
552e7e314d
Merge branch 'master' into bail-on-invalid-archive 2018-03-22 11:32:38 +09:00
Dean Herbert
101caf3064 Apply same logic fixes to delete/restore all notifications 2018-03-22 11:28:40 +09:00
Dean Herbert
e0b74a357a Fix osu! logo making hover beat sounds when not visible 2018-03-22 03:31:14 +09:00
Dean Herbert
8f71d53c17 Fix retry not allowing continuing beyond PlayerLoader
Resolves #2265.
2018-03-22 02:10:31 +09:00
TocoToucan
4991f2ad2e Change filename format 2018-03-21 18:27:08 +03:00
Dean Herbert
62229300c4 Fix DummyRuleset getting selected
Resolves #2261.
2018-03-22 00:26:48 +09:00
Dean Herbert
4a93abcc36 Add scale adjusts to bring legacy skins in-line with lazer sizing 2018-03-21 20:07:58 +09:00
Dean Herbert
65b6a2faad Fix mod button sounds playing when mod overlay is not visible
Resolves #2240.
2018-03-21 18:41:21 +09:00
Dean Herbert
271c082606 Adjust colour assignment 2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea Adjust text size to match design 2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a Apply minor fixes 2018-03-21 15:40:43 +09:00
Dean Herbert
f944c29505 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-21 12:32:27 +09:00
Dean Herbert
ccdd11d7b2 Add missing licence header 2018-03-21 12:29:44 +09:00
Dean Herbert
8ac660b0c6 Fixes for keyboard handling and general code quality 2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c Adjust colours and spacing 2018-03-20 21:59:56 +09:00
Dean Herbert
dac1ba21db Make keyboard control work 2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe Adjust styling and colours 2018-03-20 21:31:17 +09:00