1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-13 09:57:20 +08:00

10887 Commits

Author SHA1 Message Date
Dean Herbert
f4729d41f3 Merge branch 'master' into samah-ios 2019-01-25 18:49:08 +09:00
smoogipoo
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +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
smoogipoo
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +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
99d349c865
Merge branch 'master' into fix-texture-loader-stores 2019-01-25 12:39:02 +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
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +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
f07ac8ebd8 remove osu! specific settings from global config again 2019-01-24 16:11:55 +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
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
smoogipoo
a7e281469b Fix game exiting instantly on pressing close button 2019-01-24 20:13:29 +09:00
smoogipoo
50a384e19c Fix game not exiting 2019-01-24 20:13:19 +09:00
smoogipoo
28f5c950ec Fix player never completing load 2019-01-24 19:55:42 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
ProgrammaticNajel
9fcefa7d69 Typo fix 2019-01-24 18:18:32 +08: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
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
tangalbert919
e3ce203c68 Merge remote-tracking branch 'upstream/master' into android 2019-01-23 17:45:46 -06:00
Unknown
4a9bcf4937 rename OsuConfigManager to GameConfigManager
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
Unknown
93c9037394 fix crash when config doesn't have tracked settings 2019-01-23 13:09:03 +01:00
Shane Woolcock
728c744e4d Merge branch 'master' into samah-ios 2019-01-23 22:19:49 +10:30
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
1730ad143f
Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +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
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
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
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
Christian Kamphausen
5e31db275d
Merge branch 'master' into Fix-OsuSliderBar-tooltip-not-updating-in-special-case 2019-01-23 04:14:59 +01:00