TocoToucan
0e69ab1615
Introduce ScreenshotManager class
2018-03-14 00:17:12 +03:00
Dan Balasescu
fce61943bd
Merge branch 'master' into smoother-parallax-scale
2018-03-12 12:12:01 +09:00
smoogipoo
86d93ffe3c
Fix tooltip not working due to not handling input
2018-03-12 10:49:50 +09:00
Dean Herbert
6ad962fc8b
Interpolate ParallaxContainer's scale
...
Things were a bit jumpy when a screen was adjusting `ParallaxAmount`. This smoothes the applied scale changes to look great again.
Most noticeable when hitting the retry hotkey (`~`) from gameplay.
2018-03-09 14:35:53 +09:00
Dean Herbert
3b56999118
Add drawable to display (and update) relative dates
2018-03-08 12:58:16 +09:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent
2018-03-07 19:41:52 +09:00
Dan Balasescu
5fda7881c3
Merge branch 'master' into fix-textbox-arrows
2018-03-07 16:01:44 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control
2018-03-07 14:03:09 +09:00
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09:00
smoogipoo
148551afa2
osu!-side changes in-line with framework layout changes
2018-03-06 14:12:37 +09:00
Dean Herbert
90828cca8f
Fix left and right arrows keys in chat overlay not working
...
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
jorolf
3a420ba826
add the volume overlay
2018-03-03 19:08:35 +01:00
Dean Herbert
26e50043b7
Fix parallax container during rewinds
2018-03-04 00:52:00 +09:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent
2018-02-28 23:49:33 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax
2018-02-28 23:15:25 +09:00
naoey
2e535afb84
Remove redundant subsection title.
...
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
Dean Herbert
dd6cf1379e
Reduce parallax effect during gameplay
...
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
0cd049c6b0
Rely less on zero-duration transform helpers
...
They have huge overheads.
See ppy/osu-framework#1411 .
2018-02-28 11:00:54 +09:00
naoey
5724618b2a
Add license headers and sanitise open profile argument.
2018-02-26 09:58:11 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
...
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
Dean Herbert
96c23d2a62
Add override to fix left/right arrow control
2018-02-15 19:41:15 +09:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
Dean Herbert
cafa605b90
Fix visual settings checkboxes playing sounds in bindable binding
...
Move sound binding to much later in the process to avoid programmatic checkbox changes triggering interaction sounds
2018-02-08 14:43:47 +09:00
smoogipoo
ee93c0bc19
Use an endian-independent method to find precision
2018-02-07 20:03:37 +09:00
smoogipoo
23d4c20726
Apply suggestions to normalisation function
2018-02-07 17:31:18 +09:00
smoogipoo
406ec6e92d
Make OsuSliderBar always use number of digits from precision
2018-02-07 13:26:17 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support
2018-02-01 16:13:32 +09:00
Dean Herbert
47b92f3d1d
Fix mute button not prolonging volume control display
2018-01-31 18:00:44 +09:00
Dean Herbert
93ffa1f8a2
Fix button alignment and animation
2018-01-31 17:36:53 +09:00
Dean Herbert
97ae44f23c
Remove outwards exposure of mute property
2018-01-31 16:56:26 +09:00
Dean Herbert
b47061f43d
Merge remote-tracking branch 'upstream/master' into mute-toggle
2018-01-31 14:20:15 +09:00
Dean Herbert
53129e5235
Fix text getting truncated after last link in chat line
2018-01-30 17:47:22 +09:00
Dean Herbert
a5b0d51205
Merge remote-tracking branch 'upstream/master' into url-parsing-support
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
Dean Herbert
060d80efbe
Continue showing progress bar on direct panels when importing
...
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
2018-01-22 13:05:07 +09:00
aQaTL
c4feb67bce
Using field properties to set mute / unmute instead of separate methods
2018-01-20 11:45:04 +01:00
aQaTL
4a85266fca
Using BindableBool to mute the volume when it's value changes
2018-01-18 17:23:02 +01:00
aQaTL
9c09b33e4e
Removed no longer used "lastVolume" field
2018-01-17 23:17:59 +01:00
aQaTL
18ff57fdf9
Inline changing mute icon properties with object creation
2018-01-17 21:09:46 +01:00
aQaTL
a8fb732256
Added muted/unmuted icon
2018-01-17 20:43:08 +01:00
aQaTL
1440edbf8b
Use AudioManager adjustments to mute volume
2018-01-17 17:15:13 +01:00
aQaTL
ac41cb59ea
Typo fix, removed unnecessary braces
2018-01-17 14:36:33 +01:00
Dean Herbert
38c5434b82
Remove placeholder methods in OsuGame
...
Let's add these when they can actually be implemented.
2018-01-17 20:32:20 +09:00
Dean Herbert
b27577e242
Add temporary browser handling of beatmap difficulty loading
...
until we have an api method to support this.
2018-01-17 19:37:20 +09:00
Dean Herbert
783ca40c64
Update with upstream changes
2018-01-17 16:51:47 +09:00
Dean Herbert
54b0f4b912
Merge branch 'master' into url-parsing-support
2018-01-17 16:16:55 +09:00
aQaTL
0340e4f8dc
Option in settings to toggle mute/unmute when losing/gaining window focus
2018-01-16 20:33:30 +01:00
aQaTL
9277586907
Toggle mute/unmute keyboard shortcut
2018-01-16 17:46:54 +01:00
Dean Herbert
5212194e3f
Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding
2018-01-17 00:44:42 +09:00
Dean Herbert
5e1cd8ddc4
Apply conditionals directly rather than using an in-between property
2018-01-16 20:34:40 +09:00
smoogipoo
02564db43f
Merge remote-tracking branch 'origin/master' into fix-cursor-hiding
2018-01-16 20:20:47 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
smoogipoo
0459f0a069
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
2018-01-16 13:40:02 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
smoogipoo
7c41925144
ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc
2018-01-15 14:07:09 +09:00
smoogipoo
43f8a8e8c5
Rename OsuCursorVisualiser -> CursorOverrideContainer
2018-01-15 14:00:13 +09:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
smoogipoo
78441c05cb
OsuCursorContainer -> OsuCursorVisualiser
2018-01-12 19:45:09 +09:00
smoogipoo
34aee4fea0
Improve comments
2018-01-12 19:39:35 +09:00
smoogipoo
16d739580b
IProvideLocalCursor -> IProvideCursor
2018-01-12 19:37:03 +09:00
smoogipoo
620e125fad
Fix cursor being displayed on intro/disclaimer
2018-01-12 19:34:55 +09:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support
2018-01-12 19:34:44 +09:00
smoogipoo
5952f1e7f1
Adjust transforms for cursor transitions
2018-01-12 19:34:14 +09:00
Dean Herbert
188b26472c
Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision
2018-01-12 18:54:36 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
FreezyLemon
2c67ff75ed
added custom hoverclicksounds so links make sounds on hover&click
2018-01-11 18:52:50 +01:00
smoogipoo
5cfb2c2ffe
Make VolumeControlReceptor handle global input
...
Fixes volume not being able to be changed in dead areas of OverlayContainers.
2018-01-11 19:03:31 +09:00
smoogipoo
c5c33e20bf
OverlayContainer changes in-line with framework
2018-01-11 19:03:01 +09:00
smoogipoo
d147683361
Cleanup
2018-01-10 17:39:15 +09:00
smoogipoo
c010b48b29
Remove number format specified from OsuSliderBar, override ToolTipText
...
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca
More osu!-side bindable fixes
2018-01-10 15:41:13 +09:00
FreezyLemon
3bf9901dd2
Fixed bugs and added tests
2018-01-09 16:11:45 +01:00
Dean Herbert
72624aea18
Use a better method of link compilation
...
Adds word wrap back, simplifies a lot.
2018-01-09 20:33:20 +09:00
Dean Herbert
1be0569743
Update licence headers
2018-01-09 14:34:52 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support
2018-01-09 14:28:20 +09:00
TocoToucan
ae032cbf23
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
2018-01-07 23:40:00 +03:00
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision
2018-01-05 20:48:30 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
cbf4852438
Expose a NumberFormatInfo for more extensibility
2018-01-05 14:26:10 +09:00
smoogipoo
b84f83cf16
Trigger a value changed event when the number of digits changes
2018-01-05 14:26:10 +09:00
smoogipoo
eaa2a007e7
Cleanup
2018-01-05 14:26:10 +09:00
smoogipoo
08af3e6303
Make OsuSliderBar formatting support variable number of digits
2018-01-05 14:26:10 +09:00
smoogipoo
ddc9edab54
Make OsuSliderBar support both float and double values
2018-01-05 14:26:10 +09:00
smoogipoo
af86220dcc
Merge remote-tracking branch 'origin/master' into update-branch
2018-01-05 12:08:50 +09:00
smoogipoo
5eb2dc3d64
Cleanup some possible CI errors
...
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
Dan Balasescu
d167663340
Merge branch 'master' into large-texture-store
2018-01-03 13:50:49 +09:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support
2018-01-02 17:51:50 +09:00
FreezyLemon
e7721d71f3
Changed chat link implementation according to review
2017-12-31 00:51:47 +01:00
Dean Herbert
f2d302f8dc
Create a LargeTextureStore for cached (but not atlased) global textures
...
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Dean Herbert
e332683d18
Fix music controller draggability
2017-12-30 21:10:40 +09:00
Dean Herbert
442a649c63
Make all FocusedOverlays hide on clicks outside of themselves
...
Also allows wheel events to pass through around them.
2017-12-30 20:45:41 +09:00
FreezyLemon
ae79be7b51
small style fixes plus new assert in test
2017-12-28 21:45:58 +01:00
FreezyLemon
7454633f63
Refactor and general tidying up
2017-12-28 20:11:21 +01:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
FreezyLemon
cbfef7052e
further CI adjustments
2017-12-25 21:02:48 +01:00
FreezyLemon
962e4d7c8a
Removed LinkId and word wrapping (for now).
...
Also reimplemented the OsuHoverContainer properly
2017-12-25 20:46:04 +01:00
FreezyLemon
a30448095e
Merge branch 'master' into url-parsing-support
2017-12-25 19:12:23 +01:00
Dean Herbert
1a318c5c2b
Improve LineGraph invalidation logic
2017-12-22 18:58:35 +09:00
Dean Herbert
fc0b97065c
Move hover sound/container to base implementation
2017-12-20 15:54:13 +09:00
Dean Herbert
a6496e35ec
Merge branch 'master' into url-parsing-support
2017-12-20 14:41:12 +09:00
FreezyLemon
270d81f816
Made the Link's OnClick() Method return true
2017-12-19 19:37:43 +01:00
smoogipoo
cf640d084e
Use using
2017-12-18 16:38:15 +09:00
smoogipoo
846750a190
Remove unnecessary flag
2017-12-18 16:36:11 +09:00
smoogipoo
8fdaf6f8f4
Restructure DialogButton to support selection
2017-12-18 14:47:17 +09:00
Dean Herbert
fd9d900ae0
Simplify StarCounter and SpriteIcon
2017-12-15 18:40:03 +09:00
FreezyLemon
d0b7c92b46
Removed unnecessary usings.
2017-12-11 13:46:23 +01:00
FreezyLemon
bb0a32b555
Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization.
2017-12-11 11:28:16 +01:00
FreezyLemon
4d475f1c1b
Changed it so ChatLinks handle hover and click sounds themselves
2017-12-11 11:05:32 +01:00
FreezyLemon
13bc50ad56
Removed ICanDisableHoverSounds interface
2017-12-11 10:42:36 +01:00
FreezyLemon
5546b8c316
Trimmed whitespace (CI)
2017-12-07 19:55:29 +01:00
FreezyLemon
68255095a6
Renamed the IHasHoverSounds interface to ICanDisableHoverSounds and made it so that if the interface is not implemented, it is just ignored (samples will always be played). If it is implemented, the ShouldPlayHoverSound bool is decisive of whether sounds are played or not
2017-12-07 19:52:40 +01:00
FreezyLemon
e05618a415
Removed unnecessary "using" directives
2017-12-07 19:36:56 +01:00
FreezyLemon
2ceb073b5d
Renamed OnClick to OnLinkClicked to (what should be) obvious reasons
2017-12-07 16:30:15 +01:00
FreezyLemon
2129d6cede
Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.
...
Also fixed the tooltip text up
2017-12-07 16:23:43 +01:00
FreezyLemon
ca40db2b97
Fixed a bug where the hover wouldn't work correctly due to OsuLinkSpriteText assigning Action to a private property.
2017-12-07 13:57:29 +01:00
FreezyLemon
a8599a1b75
Implemented new interface which allows parent containers to decide on whether a "OnHover" sound should be played.
2017-12-07 13:12:36 +01:00
FreezyLemon
ec8b5c2465
Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions
2017-12-07 10:31:02 +01:00
FreezyLemon
94eb853d3d
Added centralised handling for some chat links
2017-12-06 16:41:57 +01:00
FreezyLemon
b04ddba2a0
Added basic "on click" actions to the in-chat links
2017-12-06 10:27:30 +01:00
FreezyLemon
bb138ccaf7
Added licence header and removed unnecessary whitespace
2017-12-04 13:55:57 +01:00
FreezyLemon
9b866d2248
Made it so the link ID is always added before loading the SpriteTexts (fixed weird bug where some sprites would be white instead of blue). Also improved XML doc on TextColour
2017-12-04 13:46:07 +01:00
FreezyLemon
cf96323980
Added new OsuLinkSpriteText.TextColour property that sets the internal content (OsuHoverContainer)'s colour instead of the whole container, so that text colour is always changed through that (e.g. link colouring, link hover fade).
...
Implemented it to be used when adding text to an OsuLinkTextFlowContainer.
2017-12-04 13:33:42 +01:00
FreezyLemon
319f43e209
Added "getIdFromUrl" call back to content.action because performance impact is small and no unnecessary id calculations are done
2017-12-04 13:29:56 +01:00
FreezyLemon
bf97f8b1b1
Added osu.ppy.sh/ss (screenshot) URL handling and calculate ID at assignment so it's not on click anymore
2017-12-03 23:55:34 +01:00
FreezyLemon
a839d0e91d
LoadComponent before assigning URL to ensure dependency loading
2017-12-03 23:55:00 +01:00
FreezyLemon
3f336b8e61
Made the style a bit better, fixed a bug or two
2017-12-03 21:02:05 +01:00
FreezyLemon
2d270a1cfe
Added ability to open other channels from chat links.
2017-12-03 20:45:30 +01:00
FreezyLemon
735dbddd17
Changed URL detection to be more reliable and generally work better
2017-12-03 06:52:57 +01:00
FreezyLemon
6d9dcc6691
Added all files to the .csproj and also introduced basic action filtering when you set the URL on an OsuLinkSpriteText object
2017-12-02 09:48:55 +01:00
FreezyLemon
86302716a6
Also moved LinkText to its own file so the chat could reuse it (ProfileHeader's private class ProfileLink also still inherits from this, though)
2017-12-01 20:32:08 +01:00
FreezyLemon
1f1c7dd70f
Moved LinkFlowContainer out of ProfileHeader to make it available for other uses too (e.g. chat) and renamed it to LinkTextFlowContainer bc it can contain both links and text, not only one
2017-12-01 20:26:51 +01:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
Dean Herbert
bf5ea027ef
Add xmldoc to TriangleButton
2017-11-27 18:26:20 +09:00
Dean Herbert
51372d7cda
Remove HandleInput override from TriangleButton
2017-11-27 18:19:06 +09:00
Dean Herbert
760f7d02d9
Remove AlwaysPresent (not actually required)
2017-11-27 18:12:52 +09:00
Dean Herbert
7877f42763
Merge remote-tracking branch 'upstream/master' into new-sounds-and-more
2017-11-27 17:59:24 +09:00
Dean Herbert
671b3d01ff
Fix OsuClickableContainer's local content geting overwritten
2017-11-26 17:21:23 +09:00
Dean Herbert
880418fd0d
Split out click and hover sound layers
2017-11-26 17:21:22 +09:00
Dean Herbert
0c6a125777
Remove custom colour handling
2017-11-26 17:21:21 +09:00
Dean Herbert
ac7e373f40
Add hover/click sound effects to more stuff everywhere
2017-11-26 17:21:21 +09:00
Dean Herbert
8f57bf2498
Add choices of hover sample sets
2017-11-26 17:17:50 +09:00
Dean Herbert
af499df6dd
Make a base OsuButton class to handle default samples
2017-11-26 17:17:48 +09:00
Dean Herbert
07d6a70028
New sound effects with better names
2017-11-26 17:17:46 +09:00
Dean Herbert
7ff39d62a1
Fix SpriteIcon potentially not updating texture during a load race condition
...
Better fix for #1577 .
2017-11-24 12:48:02 +09:00
Dean Herbert
d93911ae97
Improve user ratings calculations to make more sense
...
Closes #1552 .
2017-11-23 18:10:08 +09:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
bd616c1307
Simplify some property access
2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
Dean Herbert
6df18ffb7a
FocusedTextBox should not handle repeated escapes
2017-11-20 18:14:58 +09:00
smoogipoo
dacabd4a90
Merge branch 'master' into lazy-working-beatmap
2017-11-17 21:46:19 +09:00
Dean Herbert
b3aae2340b
Avoid accessing beatmaps from BeatSyncedContainer until they are loaded
2017-11-17 18:38:11 +09:00
Dean Herbert
6c40cf08cc
Optimise leaderboard display
...
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
af03d883f1
Ensure overlay containers scroll to top when new information is presented
2017-11-15 19:01:30 +09:00
Dean Herbert
e006090c5b
Fix SpriteIcon loading textures on the update thread
2017-11-13 13:13:43 +09:00
smoogipoo
edd0d166b1
Add text transforms to OsuSpriteText
2017-11-04 00:42:36 +09:00
Dean Herbert
ed89f03900
Make ParallaxContainer public
2017-11-01 17:10:59 +09:00
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