Commit Graph

34 Commits

Author SHA1 Message Date
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