Commit Graph

16246 Commits

Author SHA1 Message Date
6fddc36843 Move iOS package references to shared props 2019-01-25 22:18:29 +10:30
49051a359f Merge branch 'dont-always-focus-textboxes' into samah-ios 2019-01-25 19:22:26 +09:00
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
82d944dc89 Fix textbox colours not always being set corrrectly 2019-01-25 19:20:29 +09:00
9e8347413b Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios
# Conflicts:
#	osu.Game/Beatmaps/BeatmapManager.cs
2019-01-25 18:59:22 +09:00
33faa6cbcf Update licence headers 2019-01-25 18:55:05 +09:00
241ce31cee Update framework version 2019-01-25 18:53:36 +09:00
159ac7359e Merge branch 'update-framework' into samah-ios 2019-01-25 18:52:17 +09:00
144533706e Update framework 2019-01-25 18:51:29 +09:00
e3fde56780 Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios 2019-01-25 18:49:41 +09:00
f4729d41f3 Merge branch 'master' into samah-ios 2019-01-25 18:49:08 +09:00
4a59ccb81d Merge branch 'master' into fix-idle-weirdness 2019-01-25 17:52:59 +09: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
99d349c865 Merge branch 'master' into fix-texture-loader-stores 2019-01-25 12:39:02 +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
c3b73d2d53 ALlow null host 2019-01-25 12:08:31 +09:00
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
bda5a90252 Readonly variable 2019-01-25 11:50:52 +09:00
6b3d53750c Fix remaining cases of not using host-created TextureLoaderStore 2019-01-25 11:48:28 +09:00
01ab371c87 add "Scroll speed" to ManiaSettingsSubsection 2019-01-24 17:39:23 +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
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
728c744e4d Merge branch 'master' into samah-ios 2019-01-23 22:19:49 +10:30
7415a6e764 Cache input manager 2019-01-23 20:37:56 +09:00
484268f1f2 Expose CalculateAccuracy for performance tools 2019-01-23 20:30:32 +09:00
4c8e7a26dc Merge branch 'master' into fix-idle-weirdness 2019-01-23 18:53:52 +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