19539 Commits

This Branch

This Branch

All Branches

• replace license headers with new ones
  Unknown · 2019-01-25 11:17:48 +01:00
  4a916b2dee
• revert previous rename and rename ruleset specific classes instead
  Unknown · 2019-01-25 11:14:37 +01:00
  8ddff673b7
• Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios

  # Conflicts:
  #	osu.Game/Beatmaps/BeatmapManager.cs

  Dean Herbert · 2019-01-25 18:59:22 +09:00
  9e8347413b
• Merge branch 'master' into move-osu-settings
  Unknown · 2019-01-25 10:57:04 +01:00
  5446c99f22
• Update licence headers
  Dean Herbert · 2019-01-25 18:55:05 +09:00
  33faa6cbcf
• Update framework version
  Dean Herbert · 2019-01-25 18:53:36 +09:00
  241ce31cee
• Merge branch 'update-framework' into samah-ios
  Dean Herbert · 2019-01-25 18:52:17 +09:00
  159ac7359e
• Update framework
  Dean Herbert · 2019-01-25 18:51:29 +09:00
  144533706e
• Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios
  Dean Herbert · 2019-01-25 18:49:41 +09:00
  e3fde56780
• Merge branch 'master' into samah-ios
  Dean Herbert · 2019-01-25 18:49:08 +09:00
  f4729d41f3
• Fix screen titles
  smoogipoo · 2019-01-25 18:38:48 +09:00
  da135346b2
• Remove MultiplayerSubScreen and fix multiplayer crashes
  smoogipoo · 2019-01-25 18:26:04 +09:00
  15100632f1
• Add a test for catch slider conversion
  ekrctb · 2019-01-25 18:13:14 +09:00
  aaba377e11
• Fix juice stream generates tiny droplet at tick time
  ekrctb · 2019-01-25 18:11:27 +09:00
  3375096f1d
• Merge branch 'master' into fix-idle-weirdness
  Dean Herbert · 2019-01-25 17:52:59 +09:00
  4a59ccb81d
• Fix cursor sensitivity tooltip not updating instantly
  Dean Herbert · 2019-01-25 17:30:35 +09:00
  a5f1aa644b
• Merge pull request #4149 from smoogipoo/crlf-licenseheader

  Force crlf for osu.licenseheader

  Dean Herbert · 2019-01-25 16:53:18 +09:00
  f89c57d1af
• Force crlf for osu.licenseheader
  smoogipoo · 2019-01-25 16:22:20 +09:00
  a0be223f16
• Merge pull request #4142 from ProgrammaticNajel/fix-multiplayer-parallax-overflow

  Fix multiplayer screen "pushed" by notifications overlay parallax

  Dean Herbert · 2019-01-25 15:54:33 +09:00
  6b9841c0fa
• Create a custom background stack to fix various background issues
  smoogipoo · 2019-01-25 15:36:22 +09:00
  f0e0088f43
• Fix logical regression
  Dean Herbert · 2019-01-25 15:03:32 +09:00
  a25dce53cd
• Merge branch 'master' into fix-multiplayer-parallax-overflow
  Dean Herbert · 2019-01-25 14:55:28 +09:00
  e88d36ed38
• Make InternalPadding a bit simpler
  Dean Herbert · 2019-01-25 14:46:45 +09:00
  7ed215c521
• Combine constant
  Dean Herbert · 2019-01-25 14:10:59 +09:00
  787d4da153
• Merge pull request #4144 from Aergwyn/mania-settings

  Add "Scroll speed" to osu!mania settings subsection

  Dean Herbert · 2019-01-25 13:10:05 +09:00
  1500fe74ae
• Don't use TransferValueOnCommit
  Dean Herbert · 2019-01-25 12:53:30 +09:00
  67331039ef
• Merge branch 'master' into mania-settings
  Dean Herbert · 2019-01-25 12:44:31 +09:00
  0d814c5cdd
• Merge branch 'master' into fix-texture-loader-stores
  Dean Herbert · 2019-01-25 12:39:02 +09:00
  99d349c865
• Merge pull request #4136 from Aergwyn/fix-tracked-config-disposal

  Fix crash when config doesn't have track-able settings

  Dean Herbert · 2019-01-25 12:38:50 +09:00
  7f8da819a0
• Merge branch 'master' into fix-tracked-config-disposal
  Dean Herbert · 2019-01-25 12:14:58 +09:00
  2b250aa47b
• ALlow null host
  Dean Herbert · 2019-01-25 12:08:31 +09:00
  c3b73d2d53
• Merge remote-tracking branch 'origin/master' into samah-ios
  Dean Herbert · 2019-01-25 11:51:44 +09:00
  014ea972d9
• Readonly variable
  Dean Herbert · 2019-01-25 11:50:52 +09:00
  bda5a90252
• Fix remaining cases of not using host-created TextureLoaderStore
  Dean Herbert · 2019-01-25 11:48:28 +09:00
  6b3d53750c
• add "Scroll speed" to ManiaSettingsSubsection
  Unknown · 2019-01-24 17:39:23 +01:00
  01ab371c87
• remove osu! specific settings from global config again
  Unknown · 2019-01-24 16:11:55 +01:00
  f07ac8ebd8
• silently return instead of throwing
  Unknown · 2019-01-24 16:02:47 +01:00
  2bbaa2ac60
• Merge branch 'master' into fix-multiplayer-parallax-overflow
  ProgrammaticNajel · 2019-01-24 20:41:10 +08:00
  4cae9bae83
• Merge pull request #4140 from peppy/update-licence-header

  Update licence header (and remove year)

  Dan Balasescu · 2019-01-24 21:27:05 +09:00
  d2ee08ad7b
• Add overflow padding in other multiplayer screen components

  Added padding to Room Creation and Beatmap Selection in Multiplayer.

  ProgrammaticNajel · 2019-01-24 19:42:35 +08:00
  593e0b36f5
• Fix game exiting instantly on pressing close button
  smoogipoo · 2019-01-24 20:13:29 +09:00
  a7e281469b
• Fix game not exiting
  smoogipoo · 2019-01-24 20:13:19 +09:00
  50a384e19c
• Fix player never completing load
  smoogipoo · 2019-01-24 19:55:42 +09:00
  28f5c950ec
• Convert everything to use IScreen
  smoogipoo · 2019-01-24 19:47:44 +09:00
  8ea7ec6445
• Typo fix
  ProgrammaticNajel · 2019-01-24 18:18:32 +08:00
  9fcefa7d69
• Add dotsettings whitespace ban
  Dean Herbert · 2019-01-24 19:12:37 +09:00
  ee40ca85e1
• Add overflow padding in other multiplayer screen components

  Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)

  ProgrammaticNajel · 2019-01-24 17:40:48 +08:00
  e4084b7d5d
• Standardise remaining cases
  Dean Herbert · 2019-01-24 18:24:30 +09:00
  398171afd8
• Fix codefactor issue
  Dean Herbert · 2019-01-24 17:46:09 +09:00
  a580c17949
• Update licence header (and remove year)
  Dean Herbert · 2019-01-24 17:43:03 +09:00
  8617aaa2a7