HoLLy
|
be6b5419c4
|
Remove uncommented line
Didn't mean to push this
|
2019-01-31 18:10:44 +01:00 |
|
HoLLy
|
30292f44da
|
Fix Catch diffcalc being off
|
2019-01-31 17:57:59 +01:00 |
|
Dean Herbert
|
67bb7b4db7
|
Merge pull request #4188 from peppy/fix-osu-logo
Fix osu! logo potentially appearing during game load in a weird place
|
2019-01-31 21:17:12 +09:00 |
|
Dean Herbert
|
7ce9a915b7
|
Merge branch 'master' into fix-osu-logo
|
2019-01-31 21:08:49 +09:00 |
|
Dean Herbert
|
011d8606c0
|
Merge pull request #4179 from peppy/reg-screen-focus-fix
Allow deselection of textboxes on registration screen on mobile devices
|
2019-01-31 21:08:34 +09:00 |
|
Dan Balasescu
|
e59abac347
|
Merge branch 'master' into fix-osu-logo
|
2019-01-31 21:08:27 +09:00 |
|
Dan Balasescu
|
b85e119bae
|
Merge branch 'master' into reg-screen-focus-fix
|
2019-01-31 21:08:12 +09:00 |
|
Dean Herbert
|
94b505fd7d
|
Merge pull request #4106 from ekrctb/catch-slider-conversion-tweak
Fix catch slider conversion for last droplets
|
2019-01-31 19:40:26 +09:00 |
|
Dean Herbert
|
981564d425
|
Merge branch 'master' into catch-slider-conversion-tweak
|
2019-01-31 19:40:16 +09:00 |
|
Dean Herbert
|
a5c1ef03f9
|
Merge branch 'master' into catch-slider-conversion-tweak
|
2019-01-31 19:27:08 +09:00 |
|
Dean Herbert
|
d1c8ee65a5
|
Fix osu! logo potentially appearing during game load in a weird place
|
2019-01-31 19:22:29 +09:00 |
|
Dean Herbert
|
7860b2c3dc
|
Merge pull request #4173 from peppy/resources-via-nuget
Move osu-resources to nuget
|
2019-01-31 19:16:30 +09:00 |
|
Dean Herbert
|
09056fd0d8
|
Merge branch 'master' into resources-via-nuget
|
2019-01-31 18:40:45 +09:00 |
|
Dean Herbert
|
9b12803e96
|
Merge pull request #4181 from smoogipoo/iscreen
Make everything use the IScreen interface
|
2019-01-31 18:39:44 +09:00 |
|
Dean Herbert
|
ba6176fd03
|
Fix major regression in scaling behaviour
|
2019-01-31 18:28:46 +09:00 |
|
Dean Herbert
|
668a39ac6d
|
Merge branch 'master' into iscreen
|
2019-01-31 18:19:50 +09:00 |
|
Dean Herbert
|
f85518b175
|
Don't expose padding
|
2019-01-31 18:16:28 +09:00 |
|
Dean Herbert
|
b48bb5b792
|
Move parallax logic out of BackgroundScreenStack
|
2019-01-31 18:10:33 +09:00 |
|
smoogipoo
|
bdaff27575
|
Fix nullref due to screens now being removed from parent
|
2019-01-31 15:02:07 +09:00 |
|
smoogipoo
|
b90207fa54
|
Give ScreenTestCase a background stack
|
2019-01-31 14:55:48 +09:00 |
|
Dean Herbert
|
7d8c274bae
|
Merge pull request #4185 from smoogipoo/add-touchdevice-mod
Add touchdevice mod for pp calculation
|
2019-01-31 14:14:57 +09:00 |
|
Dean Herbert
|
1be8a75193
|
Merge branch 'master' into add-touchdevice-mod
|
2019-01-31 14:05:55 +09:00 |
|
Dean Herbert
|
1dffd1d3b0
|
Merge branch 'master' into add-touchdevice-mod
|
2019-01-31 14:05:48 +09:00 |
|
smoogipoo
|
255b4a30e0
|
Allow logo to be null
|
2019-01-31 13:50:37 +09:00 |
|
smoogipoo
|
58d744e5dc
|
Remove manual overlay/toolbar logic from multiplayer
|
2019-01-31 13:38:21 +09:00 |
|
Dean Herbert
|
aac921c298
|
Update framework again
|
2019-01-31 13:33:21 +09:00 |
|
smoogipoo
|
581544e1d6
|
Fix TD mod not being ranked
|
2019-01-31 11:59:36 +09:00 |
|
smoogipoo
|
e9ddf232f0
|
Add touchdevice mod to performance calculation
|
2019-01-31 11:51:40 +09:00 |
|
Dean Herbert
|
e8c39b9c37
|
Fix test screen loading
|
2019-01-31 11:00:44 +09:00 |
|
Dean Herbert
|
beab367e6d
|
Add null checks/allowances
|
2019-01-31 11:00:33 +09:00 |
|
Dean Herbert
|
d34aa50613
|
Merge branch 'master' into iscreen
|
2019-01-31 01:08:06 +09:00 |
|
Dean Herbert
|
d9cb0358ed
|
Merge pull request #4183 from smoogipoo/revert-carousel-depth
Revert carousel depth change
|
2019-01-31 00:14:19 +09:00 |
|
smoogipoo
|
ac0bc53c4b
|
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
|
2019-01-31 00:02:05 +09:00 |
|
Dan Balasescu
|
b91281a814
|
Merge pull request #4180 from peppy/fix-download-memory-usage
Fix beatmap downloads using too much memory
|
2019-01-30 23:58:09 +09:00 |
|
smoogipoo
|
a8a34f8f20
|
Update framework
|
2019-01-30 23:56:14 +09:00 |
|
smoogipoo
|
5e78f51e24
|
Fix multiplayer crashing when exiting from lounge
|
2019-01-30 23:56:03 +09:00 |
|
Dan Balasescu
|
e4cbe31ba0
|
Merge branch 'master' into resources-via-nuget
|
2019-01-30 13:59:40 +09:00 |
|
Joseph Madamba
|
3a2919780e
|
Fix markdown error in readme change
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-01-30 11:37:11 +09:00 |
|
Aergwyn
|
c2297b0c3b
|
Fix incorrect param doc
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-01-29 23:04:48 +09:00 |
|
smoogipoo
|
82dc7f39a3
|
Update licenses
|
2019-01-29 21:48:35 +09:00 |
|
smoogipoo
|
b5d187c4af
|
Fix post-merge errors
|
2019-01-29 21:27:32 +09:00 |
|
smoogipoo
|
91302ea0bc
|
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
|
2019-01-29 21:21:36 +09:00 |
|
Dean Herbert
|
baea9691cc
|
Fix baetmap downloads using too much memory
|
2019-01-29 18:34:10 +09:00 |
|
Dean Herbert
|
23d0399e51
|
Allow deselection of textboxes on registration screen on mobile devices
|
2019-01-29 17:23:23 +09:00 |
|
Dean Herbert
|
432bc60db6
|
Merge pull request #3839 from smoogipoo/xexxar-angles
Implement xexxar’s aim assessment
|
2019-01-29 16:43:15 +09:00 |
|
Dean Herbert
|
8d4232af45
|
Formatting and minor optimisations
|
2019-01-29 16:35:20 +09:00 |
|
Dean Herbert
|
18512458e8
|
Merge branch 'master' into xexxar-angles
|
2019-01-29 15:59:04 +09:00 |
|
Dean Herbert
|
910528b4cb
|
Update iOS project in line with changes
|
2019-01-29 13:09:50 +09:00 |
|
Dean Herbert
|
bbbedd2c36
|
Remove iOS build configurations from main sln
|
2019-01-29 12:20:16 +09:00 |
|
Dean Herbert
|
bbc24bbfdd
|
Merge remote-tracking branch 'upstream/master' into resources-via-nuget
# Conflicts:
# osu-resources
# osu.sln
|
2019-01-29 12:19:35 +09:00 |
|