1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 21:27:51 +08:00
Commit Graph

841 Commits

Author SHA1 Message Date
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
d98f1a2bb7 Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline 2017-10-12 21:48:08 +09:00
smoogipoo
a5817e6e75 Add a way to change the IconButton icon colour 2017-10-12 18:17:23 +09:00
Thomas Müller
78f2037d84 Remove now obsolete RatioAdjust 2017-10-12 09:42:06 +02:00
smoogipoo
071b1b049c Fix properties not being set leading to colours not being set 2017-10-10 18:31:56 +09:00
smoogipoo
44141a38b8 Make it possible to change colours before load() 2017-10-10 18:04:41 +09:00
smoogipoo
bbd1a7059e xmldoc + hook up IconColour 2017-10-10 17:25:39 +09:00
smoogipoo
d7fb59ee0e Expose colours of IconButton 2017-10-10 17:20:23 +09:00
smoogipoo
9cb9151811 Move origin + anchor outside of ctor 2017-10-10 16:00:11 +09:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
gabixdev
8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
gabixdev
3c00a7cc51 Reformat again... 2017-09-17 01:44:49 +02:00
gabixdev
a33dfbba25 Code reformat 2017-09-17 01:40:38 +02:00
gabixdev
48008cd7e6 ... 2017-09-17 01:34:56 +02:00
gabixdev
a8ada75633 CODE STYLE XD 2017-09-17 01:28:02 +02:00
gabixdev
846838c621 Move to MenuCursor 2017-09-17 01:14:33 +02:00
gabixdev
bfe1febef2 Fix field access + remove unneeded this 2017-09-17 01:00:44 +02:00
gabixdev
e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +02:00
Dean Herbert
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
Dean Herbert
7c7849f189 Fix icon states being updated incorrectly when being set too early 2017-09-11 21:40:58 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
Dean Herbert
f33bd700c5 Fix individual volume controls not being adjustable via wheel
They were blocking each others' input unnecessarily.
2017-09-11 08:27:29 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
ea35b69f2f Merge branch 'master' into fix-mono-crash 2017-09-10 11:49:20 +09:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert
41398f57d6 Changes in line with framework 2017-09-07 20:36:32 +09:00
Dean Herbert
5822a6cc96 Merge branch 'master' into ranks-section 2017-09-07 15:11:07 +09:00
naoey
69ff4bfa46
Fix startup crash on mono. 2017-09-06 20:04:21 +05:30
smoogipooo
06fac913bf Re-implement EditorMenuBar. 2017-09-06 21:14:29 +09:00
smoogipooo
df79d8918d Merge branch 'master' into menu-bar 2017-09-06 18:26:18 +09:00
smoogipooo
2a64bcda85 Fix resizing bug(?). 2017-09-04 09:32:44 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
d7d0e96e6b Merge branch 'master' into ranks-section 2017-09-01 18:46:53 +09:00
Dan Balasescu
cabf671811 Merge branch 'master' into menu-bar 2017-08-30 12:31:12 +09:00
Dean Herbert
dba3c9a0e2 Merge branch 'master' into menu-mvvm 2017-08-29 18:37:21 +09:00
Dean Herbert
24a2dc3d1e Don't use child 2017-08-29 18:31:51 +09:00
smoogipooo
2535313f4f Use using. 2017-08-29 18:18:36 +09:00
Dean Herbert
39b5b04700 Don't use Bindable for AccentColour
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Dean Herbert
85f876a934 Remove unused using statement 2017-08-29 15:23:32 +09:00
smoogipooo
b17d9ac06e Move EditorMenuBar into the Edit namespace, and fix a minor styling issue. 2017-08-28 17:55:50 +09:00
smoogipooo
83fe8514a4 Remove unnecessary exception, replace with default value. 2017-08-28 15:44:05 +09:00
smoogipooo
7bf6d4aa65 Rename DrawableOsuContextMenuItem -> DrawableOsuMenuItem, and move to OsuMenu. 2017-08-28 15:33:24 +09:00
smoogipooo
fc6c682d88 Update in-line with framework changes. 2017-08-28 14:42:52 +09:00
smoogipooo
66db3389f6 Update in line with framework changes. 2017-08-28 12:49:33 +09:00
smoogipooo
b5c1c05af5 Remove poop. 2017-08-28 11:03:51 +09:00
smoogipooo
4385edeb45 Update usages of Menu to reflect ValueChanged events. 2017-08-28 11:01:53 +09:00
Jorolf
9374bf925e only show warning when focused 2017-08-25 16:39:49 +02:00