1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 06:07:25 +08:00
Commit Graph

16214 Commits

Author SHA1 Message Date
Jack Scotson
6a2100ddba
Merge branch 'master' into menu-globalaction-select 2019-01-27 19:13:34 +00:00
Scotsoo
c00636d328 Removing whitespace 2019-01-27 19:09:30 +00:00
Scotsoo
29c02fbaa7 Remove redundant space 2019-01-27 18:27:11 +00:00
Scotsoo
07bb278ec0 Considering GlobalActions in GameplatMenuOverlay 2019-01-27 18:19:20 +00:00
Dean Herbert
718136a892
Merge pull request #4147 from peppy/fix-texture-loader-stores
Fix remaining cases of not using host-created TextureLoaderStore
2019-01-25 20:48:32 +09:00
Dean Herbert
2e36d13aba Merge remote-tracking branch 'origin/fix-texture-loader-stores' into fix-texture-loader-stores 2019-01-25 20:24:52 +09:00
Dean Herbert
28f529ca19 Rename to host 2019-01-25 20:24:32 +09:00
Dean Herbert
0b587baab8 Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores 2019-01-25 20:23:51 +09:00
Dean Herbert
4d032af26d
Merge pull request #3919 from peppy/fix-idle-weirdness
Fix global idle state being entered when overlays are visible
2019-01-25 20:18:33 +09:00
Dean Herbert
a110569f56
Merge pull request #4151 from peppy/fix-sensitivity-tooltip
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 20:17:56 +09:00
Dean Herbert
4d982adf69
Merge branch 'master' into fix-idle-weirdness 2019-01-25 19:48:52 +09:00
Dan Balasescu
81e2e73589
Merge branch 'master' into fix-texture-loader-stores 2019-01-25 19:40:49 +09:00
Dan Balasescu
9ae9302391
Merge pull request #4152 from peppy/update-framework
Update framework
2019-01-25 19:35:50 +09:00
Dean Herbert
144533706e Update framework 2019-01-25 18:51:29 +09:00
Dean Herbert
4a59ccb81d
Merge branch 'master' into fix-idle-weirdness 2019-01-25 17:52:59 +09:00
Dean Herbert
a5f1aa644b Fix cursor sensitivity tooltip not updating instantly 2019-01-25 17:30:35 +09:00
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
99d349c865
Merge branch 'master' into fix-texture-loader-stores 2019-01-25 12:39:02 +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
Dean Herbert
c3b73d2d53 ALlow null host 2019-01-25 12:08:31 +09:00
Dean Herbert
bda5a90252 Readonly variable 2019-01-25 11:50:52 +09:00
Dean Herbert
6b3d53750c Fix remaining cases of not using host-created TextureLoaderStore 2019-01-25 11:48:28 +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
7415a6e764 Cache input manager 2019-01-23 20:37:56 +09:00
Dean Herbert
484268f1f2 Expose CalculateAccuracy for performance tools 2019-01-23 20:30:32 +09:00
Dean Herbert
4c8e7a26dc
Merge branch 'master' into fix-idle-weirdness 2019-01-23 18:53:52 +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