Commit Graph

10399 Commits

Author SHA1 Message Date
23d0399e51 Allow deselection of textboxes on registration screen on mobile devices 2019-01-29 17:23:23 +09:00
bbc24bbfdd Merge remote-tracking branch 'upstream/master' into resources-via-nuget
# Conflicts:
#	osu-resources
#	osu.sln
2019-01-29 12:19:35 +09:00
628b3e1119 Move osu-resources to nuget 2019-01-28 18:33:39 +09:00
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
354a99f5e1 Merge branch 'master' into samah-ios 2019-01-28 15:34:46 +09:00
47f35c423b Merge branch 'master' into carousel-wedge-level 2019-01-28 13:49:12 +09:00
610c2df2d4 Merge branch 'master' into dont-always-focus-textboxes 2019-01-28 13:40:08 +09:00
a208874e74 Fix incorrect handling of download failures 2019-01-28 11:59:25 +09:00
a14ad4f53f Merge branch 'master' into samah-ios 2019-01-25 22:43:21 +10:30
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
60cc2314ef Fix ruleset + beatmap being changeable in match 2019-01-25 21:02:30 +09:00
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11:00
b3403c78da Fix a few potential crashes 2019-01-25 20:47:37 +09:00
e2891ab1e9 Fix anchors + origins 2019-01-25 20:47:31 +09:00
95e6785968 Make Multiplayer not an OsuScreen 2019-01-25 20:25:55 +09:00
28f529ca19 Rename to host 2019-01-25 20:24:32 +09:00
0b587baab8 Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores 2019-01-25 20:23:51 +09:00
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
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
4d982adf69 Merge branch 'master' into fix-idle-weirdness 2019-01-25 19:48:52 +09:00
c8c375636f Use lambda
Co-Authored-By: peppy <pe@ppy.sh>
2019-01-25 19:34:25 +09:00
e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
3fb17ead06 Fix breadcrumbs crash when last screen exits 2019-01-25 19:31:58 +09:00
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
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
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +09:00
4a59ccb81d Merge branch 'master' into fix-idle-weirdness 2019-01-25 17:52:59 +09:00
a5f1aa644b Fix cursor sensitivity tooltip not updating instantly 2019-01-25 17:30:35 +09:00
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +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
99d349c865 Merge branch 'master' into fix-texture-loader-stores 2019-01-25 12:39:02 +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
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
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
a7e281469b Fix game exiting instantly on pressing close button 2019-01-24 20:13:29 +09:00