1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 00:52:55 +08:00
Commit Graph

135 Commits

Author SHA1 Message Date
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
ab017ee648 Update framework 2019-11-26 15:37:13 +09:00
Bartłomiej Dach
8e25214eee Revert Android to using native network components
This reverts commit 9acfc2587a
("Switch android to using managed network components") due to it
causing crashes on every online call. The managed legacy TLS provider
is slated for removal in later mono releases as it stands anyway.
2019-11-25 21:21:56 +01:00
Dean Herbert
6469199f0d Update framework 2019-11-22 19:47:21 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
9acfc2587a Switch android to using managed network components 2019-11-21 15:59:59 +09:00
Dean Herbert
7637e680d7 Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping 2019-11-21 10:27:32 +09:00
Dean Herbert
76e63722cc Update framework 2019-11-21 10:26:10 +09:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
140278bf4c Bump Xamarin.Android version to 10.0 2019-11-18 18:35:58 +08:00
Huo Yaoyuan
2270f33c33 Enable C# 8. 2019-11-12 19:56:49 +08:00
Dean Herbert
46d02d9077 Update framework 2019-11-12 17:37:01 +09:00
Dean Herbert
45e1501c02
Merge branch 'master' into infrastructure 2019-11-09 16:23:58 +09:00
Dean Herbert
2dd514012a Update framework 2019-11-08 23:28:22 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +09:00
dependabot-preview[bot]
1d83f51a80
Bump ppy.osu.Framework.Android from 2019.1029.0 to 2019.1106.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.1029.0 to 2019.1106.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1029.0...2019.1106.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-06 03:05:05 +00:00
Huo Yaoyuan
9902278277 Merge props orthogonally. 2019-10-30 22:28:10 +08:00
Dean Herbert
97c1a6e86b Update framework 2019-10-29 18:05:32 +09:00
Dean Herbert
e836364add Update framework 2019-10-23 15:13:52 +09:00
Dean Herbert
c8f4e8b52c Update framework 2019-10-21 17:24:32 +09:00
dependabot-preview[bot]
9fb5c85a18
Bump ppy.osu.Game.Resources from 2019.913.0 to 2019.1010.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.913.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.913.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 05:15:14 +00:00
Dean Herbert
44853c262c Update framework 2019-10-11 13:55:58 +09:00
dependabot-preview[bot]
efa5cedf4f
Bump ppy.osu.Framework.Android from 2019.930.0 to 2019.1010.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-10 08:16:07 +00:00
Dean Herbert
351e89bf18 Update framework 2019-09-30 22:03:56 +09:00
Dean Herbert
1860c2f9ce Update framework 2019-09-24 16:22:30 +09:00
Dean Herbert
92f9cf3e06 Update framework 2019-09-21 02:08:19 +09:00
Dean Herbert
3710c7bdc4
Merge pull request #6041 from miterosan/removenotneededandroidnativelibraryitemgroup
Remove unnecessary AndroidNativeLibrary specification
2019-09-19 01:55:36 +09:00
dependabot-preview[bot]
646a64792a
Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:36:31 +00:00
dependabot-preview[bot]
d681f43e29
Bump ppy.osu.Game.Resources from 2019.904.0 to 2019.913.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.904.0 to 2019.913.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.904.0...2019.913.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-13 08:38:02 +00:00
Dean Herbert
039b5ec958 Update framework 2019-09-11 18:47:25 +09:00
Dean Herbert
2d636ce147 Update framework 2019-09-09 17:54:53 +09:00
miterosan
9951011e6c Remove not needed androidnativelibrary itemgroup 2019-09-08 16:27:25 +02:00
miterosan
8862cdab9c Also set the default for Platform 2019-09-08 15:33:51 +02:00
miterosan
d790656b7e Revert shortening the condition 2019-09-08 15:33:16 +02:00
miterosan
6581e51d6a Add a default for the configuration into the android props.
This allows building even if no configuration is specified.
2019-09-07 18:03:33 +02:00
miterosan
c397ab6282 Fix Android Builds. 2019-09-07 17:04:13 +02:00
Dean Herbert
55c6feab64 Update framework 2019-09-05 16:33:14 +09:00
dependabot-preview[bot]
9edfe6800f
Bump ppy.osu.Game.Resources from 2019.903.1 to 2019.904.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.1 to 2019.904.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.1...2019.904.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-04 04:20:46 +00:00
dependabot-preview[bot]
352fd3efda
Bump ppy.osu.Game.Resources from 2019.903.0 to 2019.903.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.0 to 2019.903.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.0...2019.903.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 09:18:24 +00:00
Dean Herbert
444419b2e6 Update resources 2019-09-03 12:04:49 +09:00
dependabot-preview[bot]
815220de03
Bump ppy.osu.Framework.Android from 2019.830.0 to 2019.830.1
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.830.0 to 2019.830.1.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.830.0...2019.830.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 10:01:35 +00:00
Dean Herbert
9c622680e3 Update framework 2019-08-30 12:35:53 +09:00
Dean Herbert
8fe37d0c43 Update resources 2019-08-30 12:35:44 +09:00
Dean Herbert
70da25cfca Update framework 2019-08-28 17:03:54 +09:00
Dean Herbert
0f4d79b5d9
Merge branch 'master' into dependabot/nuget/ppy.osu.Game.Resources-2019.823.0 2019-08-23 19:24:58 +09:00
dependabot-preview[bot]
c836ef5721
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.809.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.809.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 10:04:00 +00:00
dependabot-preview[bot]
cb54fbee87
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 09:29:35 +00:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dean Herbert
536e7d8757 Update framework 2019-08-16 19:32:17 +09:00
dependabot-preview[bot]
e36e2a899a
Bump ppy.osu.Framework.Android from 2019.813.0 to 2019.814.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 12:16:53 +00:00
Dean Herbert
766396a433
Merge branch 'master' into mobile-ffmpeg 2019-08-13 18:39:07 +09:00
dependabot-preview[bot]
91068dc570
Bump ppy.osu.Framework.Android from 2019.809.0 to 2019.813.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-13 09:01:00 +00:00
Shane Woolcock
99d9b797cc
Merge branch 'master' into mobile-ffmpeg 2019-08-13 15:03:24 +09:30
dependabot-preview[bot]
1bbd0ca54e
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.731.1 to 2019.809.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.731.1...2019.809.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 08:30:26 +00:00
Shane Woolcock
fd7df7b05a Merge branch 'master' into mobile-ffmpeg 2019-08-10 10:28:18 +09:30
Dean Herbert
caf13ae52d Update framework 2019-08-09 23:29:32 +09:00
Shane Woolcock
7dd62ae6f3 Remove Android BASS libraries 2019-08-09 20:48:08 +09:30
dependabot-preview[bot]
ca33efead4
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.702.0 to 2019.731.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.702.0...2019.731.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00:00
Dean Herbert
2ab2889027 Update framework 2019-08-07 19:56:17 +09:00
Dean Herbert
e849e68e99 Update framework 2019-07-30 22:24:03 +09:00
Dean Herbert
b4bcdb1c70 Update framework 2019-07-29 19:44:58 +09:00
Dean Herbert
699e366306 Update framework 2019-07-26 20:29:57 +09:00
Dean Herbert
5317a8fa0f Update framework again 2019-07-26 17:50:49 +09:00
Dean Herbert
9d080ec249 Update framework 2019-07-26 17:18:56 +09:00
Dean Herbert
2610ee2abb Update framework 2019-07-23 21:39:10 +09:00
Dean Herbert
eebfdd8865 Update framework 2019-07-19 23:43:25 +09:00
Dean Herbert
cc3492f8f2 Update framework 2019-07-18 00:01:38 +09:00
Dean Herbert
42b1e1772f Update framework 2019-07-17 22:07:11 +09:00
Dean Herbert
b6e15fb791 Update framework 2019-07-11 22:33:51 +09:00
Morilli
4758914f7f Bump android TargetFrameworkVersion 2019-07-04 15:14:15 +02:00
Dean Herbert
fe919f1c78
Remove unused bass.dll from android project (#5230)
Remove unused bass.dll from android project
2019-07-04 01:41:59 +09:00
Dean Herbert
1824d29996 Update framework 2019-07-04 00:34:39 +09:00
miterosan
0acaf53c9b Revert everything except removall of the bass.dll 2019-07-03 17:25:42 +02:00
miterosan
66eb979fff Massivly deduplicate properties. Removed bass.dll. is it unused (and not included in the apk) 2019-07-03 15:51:20 +02:00
Dean Herbert
0740fff0c9 Update android package dependencies 2019-07-03 19:53:25 +09:00
Dean Herbert
7dbba87e4c Update dependencies
oops
2019-07-02 19:55:32 +09:00
Dan Silk
35ad9d5240 Update Android Framework reference to 2019.615.0
# Conflicts:
#	osu.Android.props
2019-06-18 20:06:33 +09:30
tangalbert919
d4f3c60dd4 Update resources and framework for Android 2019-05-28 11:22:52 -05:00
tangalbert919
edfc0368ac Update Android framework 2019-03-20 11:34:12 -05:00
tangalbert919
c6c98257f2 Add internet permission, update Android framework 2019-03-17 09:45:01 -05:00
Albert Tang
c93adb220e
Use official NuGet osu-framework build for Android 2019-03-07 10:14:19 -06:00
tangalbert919
999b947153 Update Android csproj files 2019-03-05 17:55:18 -06:00
tangalbert919
8c94ea3c35 Update NuGet packages 2019-01-08 18:14:34 -06:00
tangalbert919
e5dd95198a Cleanup project files with common props 2019-01-05 23:17:55 -06:00