Commit Graph

20033 Commits

Author SHA1 Message Date
f4dcbbbfef Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-05 11:29:29 +09:00
e575c05e93 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 11:29:13 +09:00
0ec01f7b0f Bump android TargetFrameworkVersion (#5249)
Bump android TargetFrameworkVersion
2019-07-05 10:49:19 +09:00
637466b2ab Merge branch 'master' into fix-android-targetversion 2019-07-05 10:32:00 +09:00
91d461eba7 Merge pull request #5251 from Joehuu/remove-edit-song-select-file
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
308eceb474 Fix initial colour of leaderboard mod filter (#5256)
Fix initial colour of leaderboard mod filter

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 10:29:53 +09:00
38dceddc27 Fix file ordering 2019-07-05 10:07:45 +09:00
037ea7b708 Merge branch 'master' into fix-colour-mod-filter 2019-07-05 10:04:31 +09:00
f3c01ddb4a Fix beatmap leaderboards requiring supporter when signed out (#5255)
Fix beatmap leaderboards requiring supporter when signed out
2019-07-05 10:03:35 +09:00
ae7da2557e Fix initial colour of leaderboard mod filter 2019-07-04 13:24:13 -07:00
5f6544eebf Fix beatmap leaderboards requiring supporter when signed out 2019-07-04 12:05:07 -07:00
9b2ebed669 Remove unused EditSongSelect file 2019-07-04 08:36:34 -07:00
4758914f7f Bump android TargetFrameworkVersion 2019-07-04 15:14:15 +02:00
bcea807697 Merge pull request #5241 from peppy/android-metadata
Android metadata fixes
2019-07-04 18:53:10 +09:00
be4e7d0f50 remove comment 2019-07-04 17:08:21 +09:00
07078b735c use new vector2 2019-07-04 17:06:28 +09:00
8e951d423f Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-04 17:05:47 +09:00
530675f364 Add tests as separate steps 2019-07-04 17:05:29 +09:00
d2ebf296d9 Release with better compilation options 2019-07-04 13:07:59 +09:00
70e2b83f29 Target newer api version 2019-07-04 11:40:05 +09:00
7795a16c36 Update android metadata in line with standards 2019-07-04 11:38:25 +09:00
f41c89c3be Fix replays of converted beatmaps failing to download (#5225)
Fix replays of converted beatmaps failing to download
2019-07-04 01:50:47 +09:00
fe919f1c78 Remove unused bass.dll from android project (#5230)
Remove unused bass.dll from android project
2019-07-04 01:41:59 +09:00
f358b69b8e Refactor Ruleset Selector in osu!direct (#5214)
Refactor Ruleset Selector in osu!direct

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-04 01:24:58 +09:00
c9535dcc1e Fix logo visualisation trying to catch up after being off-screen (#5222)
Fix logo visualisation trying to catch up after being off-screen
2019-07-04 01:11:17 +09:00
e55d6232d1 Merge branch 'master' into direct-ruleset-selector 2019-07-04 00:56:36 +09:00
4ecc690164 Merge branch 'master' into fix-logo-vis-catchup 2019-07-04 00:47:42 +09:00
ead961004a Update framework (#5231)
Update framework
2019-07-04 00:47:27 +09:00
a417bcb0ed Fix update notification not correctly restarting the game (#5229)
Fix update notification not correctly restarting the game
2019-07-04 00:37:05 +09:00
db3e9c7e60 Fix WaveOverlayContainer being always present (#5210)
Fix WaveOverlayContainer being always present
2019-07-04 00:35:22 +09:00
1824d29996 Update framework 2019-07-04 00:34:39 +09:00
0acaf53c9b Revert everything except removall of the bass.dll 2019-07-03 17:25:42 +02:00
b901aab19d Fix update notification not correctly restarting the game 2019-07-03 23:06:16 +09:00
66eb979fff Massivly deduplicate properties. Removed bass.dll. is it unused (and not included in the apk) 2019-07-03 15:51:20 +02:00
127b0b33c2 Fix local beatmap leaderboard displaying scores from all game m… (#5226)
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 21:52:44 +09:00
cfac90b228 Use ConstrainedIconContainer instead of SpriteIcon 2019-07-03 14:34:24 +03:00
d6740d9688 Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector 2019-07-03 14:19:41 +03:00
ae28d82b2f Update android package dependencies (#5227)
Update android package dependencies
2019-07-03 20:15:49 +09:00
105b8afc97 Add "Deflate" mod (#3365)
Add "Deflate" mod

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 19:57:46 +09:00
0740fff0c9 Update android package dependencies 2019-07-03 19:53:25 +09:00
cc9a28afa8 Add shared base class for both mod imlpementations 2019-07-03 19:42:16 +09:00
e95586857e Merge remote-tracking branch 'upstream/master' into deflate-branch 2019-07-03 19:26:21 +09:00
90bc7828f4 Add android compatibility (#4021)
Add android compatibility

Co-authored-by: Shane Woolcock <samahnub@gmail.com>
Co-authored-by: Dan Silk <dsilk@nextfaze.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: null <miterosan@gmail.com>
2019-07-03 19:23:08 +09:00
3b5ffdc2cb Merge branch 'master' into android 2019-07-03 19:05:58 +09:00
99ff59be87 Read rulesets from AppDomain in addition to disk (#5216)
Read rulesets from AppDomain in addition to disk

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 19:02:22 +09:00
8120bb36bc More methods 2019-07-03 18:42:10 +09:00
06ef8f71e9 Fix typo 2019-07-03 18:41:01 +09:00
d723998389 Merge remote-tracking branch 'upstream/master' into discoverRulesets 2019-07-03 18:36:37 +09:00
62dd89197c Refactor comment slightly 2019-07-03 18:36:04 +09:00
ccae4ce95e Fix local beatmap leaderboard displaying scores from all game modes 2019-07-03 14:39:11 +05:30