Dean Herbert
f89c57d1af
Merge pull request #4149 from smoogipoo/crlf-licenseheader
...
Force crlf for osu.licenseheader
2019-01-25 16:53:18 +09:00
smoogipoo
a0be223f16
Force crlf for osu.licenseheader
2019-01-25 16:22:20 +09:00
Dean Herbert
6b9841c0fa
Merge pull request #4142 from ProgrammaticNajel/fix-multiplayer-parallax-overflow
...
Fix multiplayer screen "pushed" by notifications overlay parallax
2019-01-25 15:54:33 +09:00
Dean Herbert
a25dce53cd
Fix logical regression
2019-01-25 15:03:32 +09:00
Dean Herbert
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-25 14:55:28 +09:00
Dean Herbert
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153
Combine constant
2019-01-25 14:10:59 +09:00
Dean Herbert
1500fe74ae
Merge pull request #4144 from Aergwyn/mania-settings
...
Add "Scroll speed" to osu!mania settings subsection
2019-01-25 13:10:05 +09:00
Dean Herbert
67331039ef
Don't use TransferValueOnCommit
2019-01-25 12:53:30 +09:00
Dean Herbert
0d814c5cdd
Merge branch 'master' into mania-settings
2019-01-25 12:44:31 +09:00
Dean Herbert
7f8da819a0
Merge pull request #4136 from Aergwyn/fix-tracked-config-disposal
...
Fix crash when config doesn't have track-able settings
2019-01-25 12:38:50 +09:00
Dean Herbert
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal
2019-01-25 12:14:58 +09:00
Unknown
01ab371c87
add "Scroll speed" to ManiaSettingsSubsection
2019-01-24 17:39:23 +01:00
Unknown
2bbaa2ac60
silently return instead of throwing
2019-01-24 16:02:47 +01:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-24 20:41:10 +08:00
Dan Balasescu
d2ee08ad7b
Merge pull request #4140 from peppy/update-licence-header
...
Update licence header (and remove year)
2019-01-24 21:27:05 +09:00
ProgrammaticNajel
593e0b36f5
Add overflow padding in other multiplayer screen components
...
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
ProgrammaticNajel
9fcefa7d69
Typo fix
2019-01-24 18:18:32 +08:00
Dean Herbert
ee40ca85e1
Add dotsettings whitespace ban
2019-01-24 19:12:37 +09:00
ProgrammaticNajel
e4084b7d5d
Add overflow padding in other multiplayer screen components
...
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
398171afd8
Standardise remaining cases
2019-01-24 18:24:30 +09:00
Dean Herbert
a580c17949
Fix codefactor issue
2019-01-24 17:46:09 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545
Add overflow padding to account for parallax shifting
...
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Unknown
93c9037394
fix crash when config doesn't have tracked settings
2019-01-23 13:09:03 +01:00
Dan Balasescu
d53386cf4b
Merge pull request #4135 from peppy/expose-accuracy
...
Expose CalculateAccuracy for performance tools
2019-01-23 20:55:50 +09:00
Dean Herbert
484268f1f2
Expose CalculateAccuracy for performance tools
2019-01-23 20:30:32 +09:00
Dean Herbert
f6fbb77ecc
Merge pull request #4130 from peppy/fix-key-counter
...
Fix key counter not counting
2019-01-23 18:38:02 +09:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter
2019-01-23 18:22:08 +09:00
Dean Herbert
d86f2e04b4
Merge pull request #4131 from chrisny286/fix-transparent-background-on-screen-scale-modes
...
Fix transparent background in some screen scaling modes
2019-01-23 18:21:48 +09:00
Dan Balasescu
067f290e6e
Merge branch 'master' into fix-key-counter
2019-01-23 17:49:21 +09:00
Christian Kamphausen
512e75982f
Merge branch 'master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:49:19 +01:00
ekrctb
7441121b5d
Merge pull request #4132 from peppy/search-settings-dropdowns
...
Allow filtering settings matching based on dropdown content
2019-01-23 17:48:13 +09:00
chrisny286
76700ad20f
Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf
replace FadeTo in PlayerLoader
...
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
1025c51e0d
Allow filtering settings matching based on dropdown content
2019-01-23 17:30:05 +09:00
Christian Kamphausen
432bd3e0fc
Merge branch 'master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:21:18 +01:00
Dean Herbert
cbbcaf6821
Merge pull request #4099 from smoogipoo/diffcalc-fixes
...
Apply various fixes to bring diffcalc in-line with stable
2019-01-23 17:17:37 +09:00
Dean Herbert
4180ca75bc
Fix typo in comment
2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7
use Color4.Black and White + using osuTK.Graphics
2019-01-23 09:08:34 +01:00
Dean Herbert
87d3466f51
Merge branch 'master' into diffcalc-fixes
2019-01-23 16:56:07 +09:00
chrisny286
5d2b2ecf06
Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a
Fix backgrounds being transparent in some scaling modes
...
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a
Formatting fixes
2019-01-23 14:51:25 +09:00
Dean Herbert
49633b3394
Fix key counter receptor getting overwritten by async load drawables
2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4
Add tests for key counter inside player heirarchy
2019-01-23 14:51:25 +09:00
Dean Herbert
e614cf0ed2
Merge pull request #4121 from chrisny286/Fix-OsuSliderBar-tooltip-not-updating-in-special-case
...
Fix Tooltip not updating in special case
2019-01-23 12:39:34 +09:00
Christian Kamphausen
5e31db275d
Merge branch 'master' into Fix-OsuSliderBar-tooltip-not-updating-in-special-case
2019-01-23 04:14:59 +01:00
chrisny286
260011fc13
remove manual update
...
misunderstood that earlier
2019-01-23 04:05:03 +01:00
chrisny286
fe5d34a657
replace as requested
2019-01-23 03:25:56 +01:00