Commit Graph

16198 Commits

Author SHA1 Message Date
4a916b2dee replace license headers with new ones 2019-01-25 11:17:48 +01:00
8ddff673b7 revert previous rename and rename ruleset specific classes instead 2019-01-25 11:14:37 +01:00
5446c99f22 Merge branch 'master' into move-osu-settings 2019-01-25 10:57:04 +01:00
f89c57d1af Merge pull request #4149 from smoogipoo/crlf-licenseheader
Force crlf for osu.licenseheader
2019-01-25 16:53:18 +09:00
a0be223f16 Force crlf for osu.licenseheader 2019-01-25 16:22:20 +09:00
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
a25dce53cd Fix logical regression 2019-01-25 15:03:32 +09:00
e88d36ed38 Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-25 14:55:28 +09:00
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +09:00
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
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
67331039ef Don't use TransferValueOnCommit 2019-01-25 12:53:30 +09:00
0d814c5cdd Merge branch 'master' into mania-settings 2019-01-25 12:44:31 +09:00
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
2b250aa47b Merge branch 'master' into fix-tracked-config-disposal 2019-01-25 12:14:58 +09:00
01ab371c87 add "Scroll speed" to ManiaSettingsSubsection 2019-01-24 17:39:23 +01:00
f07ac8ebd8 remove osu! specific settings from global config again 2019-01-24 16:11:55 +01:00
2bbaa2ac60 silently return instead of throwing 2019-01-24 16:02:47 +01:00
4cae9bae83 Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
d2ee08ad7b Merge pull request #4140 from peppy/update-licence-header
Update licence header (and remove year)
2019-01-24 21:27:05 +09:00
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
9fcefa7d69 Typo fix 2019-01-24 18:18:32 +08:00
ee40ca85e1 Add dotsettings whitespace ban 2019-01-24 19:12:37 +09:00
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
398171afd8 Standardise remaining cases 2019-01-24 18:24:30 +09:00
a580c17949 Fix codefactor issue 2019-01-24 17:46:09 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
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
4d310c3226 fix missing dependency for slider test cases 2019-01-23 14:03:26 +01:00
33b46dc4e8 adjust year in license header to match CFS's expectations 2019-01-23 13:17:29 +01:00
cf147083cd move osu! settings into its ruleset 2019-01-23 13:17:29 +01:00
4a9bcf4937 rename OsuConfigManager to GameConfigManager
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
93c9037394 fix crash when config doesn't have tracked settings 2019-01-23 13:09:03 +01:00
d53386cf4b Merge pull request #4135 from peppy/expose-accuracy
Expose CalculateAccuracy for performance tools
2019-01-23 20:55:50 +09:00
484268f1f2 Expose CalculateAccuracy for performance tools 2019-01-23 20:30:32 +09:00
f6fbb77ecc Merge pull request #4130 from peppy/fix-key-counter
Fix key counter not counting
2019-01-23 18:38:02 +09:00
1730ad143f Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +09:00
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
067f290e6e Merge branch 'master' into fix-key-counter 2019-01-23 17:49:21 +09:00
512e75982f Merge branch 'master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:49:19 +01:00
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
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
03e3247baf replace FadeTo in PlayerLoader
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
1025c51e0d Allow filtering settings matching based on dropdown content 2019-01-23 17:30:05 +09:00
432bd3e0fc Merge branch 'master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:21:18 +01:00
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
4180ca75bc Fix typo in comment 2019-01-23 17:14:08 +09:00
bb56c4a1a7 use Color4.Black and White + using osuTK.Graphics 2019-01-23 09:08:34 +01:00
87d3466f51 Merge branch 'master' into diffcalc-fixes 2019-01-23 16:56:07 +09:00
5d2b2ecf06 Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 08:52:46 +01:00