24822 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into resources-via-nuget
  Dean Herbert · 2019-01-31 18:40:45 +09:00
  09056fd0d8
• Merge pull request #4181 from smoogipoo/iscreen

  Make everything use the IScreen interface

  Dean Herbert · 2019-01-31 18:39:44 +09:00
  9b12803e96
• Fix major regression in scaling behaviour
  Dean Herbert · 2019-01-31 18:28:46 +09:00
  ba6176fd03
• Merge branch 'master' into iscreen
  Dean Herbert · 2019-01-31 18:19:50 +09:00
  668a39ac6d
• Don't expose padding
  Dean Herbert · 2019-01-31 18:16:28 +09:00
  f85518b175
• Move parallax logic out of BackgroundScreenStack
  Dean Herbert · 2019-01-31 18:10:33 +09:00
  b48bb5b792
• remove unused using
  LeNitrous · 2019-01-31 17:05:50 +08:00
  a8d30f6aee
• add grow mod
  LeNitrous · 2019-01-31 17:03:43 +08:00
  902be0d059
• Fix nullref due to screens now being removed from parent
  smoogipoo · 2019-01-31 15:02:07 +09:00
  bdaff27575
• Give ScreenTestCase a background stack
  smoogipoo · 2019-01-31 14:55:48 +09:00
  b90207fa54
• Merge pull request #4185 from smoogipoo/add-touchdevice-mod

  Add touchdevice mod for pp calculation

  Dean Herbert · 2019-01-31 14:14:57 +09:00
  7d8c274bae
• Merge branch 'master' into add-touchdevice-mod
  Dean Herbert · 2019-01-31 14:05:55 +09:00
  1be8a75193
• Merge branch 'master' into add-touchdevice-mod
  Dean Herbert · 2019-01-31 14:05:48 +09:00
  1dffd1d3b0
• Allow logo to be null
  smoogipoo · 2019-01-31 13:50:37 +09:00
  255b4a30e0
• Remove manual overlay/toolbar logic from multiplayer
  smoogipoo · 2019-01-31 13:38:21 +09:00
  58d744e5dc
• Update framework again
  Dean Herbert · 2019-01-31 13:33:21 +09:00
  aac921c298
• Fix TD mod not being ranked
  smoogipoo · 2019-01-31 11:59:36 +09:00
  581544e1d6
• Add touchdevice mod to performance calculation
  smoogipoo · 2019-01-31 11:51:40 +09:00
  e9ddf232f0
• Fix test screen loading
  Dean Herbert · 2019-01-31 11:00:44 +09:00
  e8c39b9c37
• Add null checks/allowances
  Dean Herbert · 2019-01-31 11:00:33 +09:00
  beab367e6d
• Update license header
  tangalbert919 · 2019-01-30 18:07:32 -06:00
  c62848df5a
• Merge branch 'android' of https://github.com/tangalbert919/osu into android
  tangalbert919 · 2019-01-30 17:59:01 -06:00
  84affa7643
• Merge branch 'master' into android
  Albert Tang · 2019-01-30 17:58:38 -06:00
  6c3bdc4bab
• Merge remote-tracking branch 'upstream/master' into android
  tangalbert919 · 2019-01-30 17:06:31 -06:00
  a39d15c23e
• Merge branch 'master' into iscreen
  Dean Herbert · 2019-01-31 01:08:06 +09:00
  d34aa50613
• Merge pull request #4183 from smoogipoo/revert-carousel-depth

  Revert carousel depth change

  Dean Herbert · 2019-01-31 00:14:19 +09:00
  d9cb0358ed
• Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"

  This reverts commit cc8793a45e, reversing
  changes made to 94276c8abb.

  smoogipoo · 2019-01-31 00:02:05 +09:00
  ac0bc53c4b
• Merge pull request #4180 from peppy/fix-download-memory-usage

  Fix beatmap downloads using too much memory

  Dan Balasescu · 2019-01-30 23:58:09 +09:00
  b91281a814
• Update framework
  smoogipoo · 2019-01-30 23:56:14 +09:00
  a8a34f8f20
• Fix multiplayer crashing when exiting from lounge
  smoogipoo · 2019-01-30 23:56:03 +09:00
  5e78f51e24
• Merge branch 'master' into resources-via-nuget
  Dan Balasescu · 2019-01-30 13:59:40 +09:00
  e4cbe31ba0
• Fix markdown error in readme change

  Co-Authored-By: peppy <pe@ppy.sh>

  Joseph Madamba · 2019-01-30 11:37:11 +09:00
  3a2919780e
• Merge remote-tracking branch 'upstream/master' into android
  tangalbert919 · 2019-01-29 18:13:43 -06:00
  80006109a2
• Fix incorrect param doc

  Co-Authored-By: peppy <pe@ppy.sh>

  Aergwyn · 2019-01-29 23:04:48 +09:00
  c2297b0c3b
• Update licenses
  smoogipoo · 2019-01-29 21:48:35 +09:00
  82dc7f39a3
• Fix post-merge errors
  smoogipoo · 2019-01-29 21:27:32 +09:00
  b5d187c4af
• Merge remote-tracking branch 'origin/master' into iscreen

  # Conflicts:
  #	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
  #	osu.Game/Screens/Multi/Multiplayer.cs
  #	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
  #	osu.Game/Screens/OsuScreen.cs
  #	osu.Game/osu.Game.csproj
  #	osu.sln

  smoogipoo · 2019-01-29 21:21:36 +09:00
  91302ea0bc
• Fix baetmap downloads using too much memory
  Dean Herbert · 2019-01-29 18:34:10 +09:00
  baea9691cc
• Allow deselection of textboxes on registration screen on mobile devices
  Dean Herbert · 2019-01-29 17:23:23 +09:00
  23d0399e51
• Merge pull request #3839 from smoogipoo/xexxar-angles

  Implement xexxar’s aim assessment

  Dean Herbert · 2019-01-29 16:43:15 +09:00
  432bc60db6
• Formatting and minor optimisations
  Dean Herbert · 2019-01-29 16:35:20 +09:00
  8d4232af45
• Merge branch 'master' into xexxar-angles
  Dean Herbert · 2019-01-29 15:59:04 +09:00
  18512458e8
• Update hit object result when lifetime is end
  ekrctb · 2019-01-29 15:25:27 +09:00
  8955d5de04
• Update iOS project in line with changes
  Dean Herbert · 2019-01-29 13:09:50 +09:00
  910528b4cb
• Remove iOS build configurations from main sln
  Dean Herbert · 2019-01-29 12:20:16 +09:00
  bbbedd2c36
• Merge remote-tracking branch 'upstream/master' into resources-via-nuget

  # Conflicts:
  #	osu-resources
  #	osu.sln

  Dean Herbert · 2019-01-29 12:19:35 +09:00
  bbc24bbfdd
• Merge branch 'master' into use-lifetime-optimization
  ekrctb · 2019-01-29 12:15:02 +09:00
  504e79b968
• Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
  jorolf · 2019-01-28 21:52:13 +01:00
  a0b91ecb22
• Merge pull request #2102 from swoolcock/samah-ios

  iOS Compatibility

  Dean Herbert · 2019-01-28 20:48:16 +09:00
  2025ed70d4
• Use project-wide *.cs linked include for tests rather than specifying subdirectories
  Shane Woolcock · 2019-01-28 22:04:11 +10:30
  6413e61647