1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 03:27:26 +08:00
Commit Graph

20010 Commits

Author SHA1 Message Date
Dean Herbert
86e9d97b6a Adjust variables and test length to avoid random failures 2019-07-04 18:38:29 +09:00
Dean Herbert
73bc71f8b2 Use local clock to add consistency to skip times 2019-07-04 17:32:58 +09:00
Dean Herbert
db24ac28ec Add tests 2019-07-04 16:53:08 +09:00
Dean Herbert
a20d5baa57 Fix skip button not being clickable after fade out 2019-07-04 16:21:01 +09:00
Dean Herbert
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
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
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
Dean Herbert
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
Dean Herbert
e55d6232d1
Merge branch 'master' into direct-ruleset-selector 2019-07-04 00:56:36 +09:00
Dean Herbert
4ecc690164
Merge branch 'master' into fix-logo-vis-catchup 2019-07-04 00:47:42 +09:00
Dean Herbert
ead961004a
Update framework (#5231)
Update framework
2019-07-04 00:47:27 +09:00
Dean Herbert
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
Dean Herbert
db3e9c7e60
Fix WaveOverlayContainer being always present (#5210)
Fix WaveOverlayContainer being always present
2019-07-04 00:35:22 +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
Dean Herbert
b901aab19d Fix update notification not correctly restarting the game 2019-07-03 23:06:16 +09: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
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
Andrei Zavatski
cfac90b228 Use ConstrainedIconContainer instead of SpriteIcon 2019-07-03 14:34:24 +03:00
Andrei Zavatski
d6740d9688 Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector 2019-07-03 14:19:41 +03:00
Dean Herbert
ae28d82b2f
Update android package dependencies (#5227)
Update android package dependencies
2019-07-03 20:15:49 +09:00
Dean Herbert
105b8afc97
Add "Deflate" mod (#3365)
Add "Deflate" mod

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 19:57:46 +09:00
Dean Herbert
0740fff0c9 Update android package dependencies 2019-07-03 19:53:25 +09:00
Dean Herbert
cc9a28afa8 Add shared base class for both mod imlpementations 2019-07-03 19:42:16 +09:00
Dean Herbert
e95586857e Merge remote-tracking branch 'upstream/master' into deflate-branch 2019-07-03 19:26:21 +09:00
Dean Herbert
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
Dean Herbert
3b5ffdc2cb
Merge branch 'master' into android 2019-07-03 19:05:58 +09:00
Dean Herbert
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
Dean Herbert
8120bb36bc More methods 2019-07-03 18:42:10 +09:00
Dean Herbert
06ef8f71e9 Fix typo 2019-07-03 18:41:01 +09:00
Dean Herbert
d723998389 Merge remote-tracking branch 'upstream/master' into discoverRulesets 2019-07-03 18:36:37 +09:00
Dean Herbert
62dd89197c Refactor comment slightly 2019-07-03 18:36:04 +09:00
naoey
ccae4ce95e
Fix local beatmap leaderboard displaying scores from all game modes 2019-07-03 14:39:11 +05:30
Dean Herbert
7a08f88400
Merge pull request #5219 from peppy/update-readme
Update readme with bounty changes
2019-07-03 18:08:15 +09:00
miterosan
5ecb764cdc Remove whitespaces and lowercase the comments 2019-07-03 10:57:09 +02:00
naoey
9805adc61d
Fix online ScoreInfo having the wrong ruleset 2019-07-03 14:25:59 +05:30
miterosan
43d7f66c5b Add comment about the android ruleset situation. 2019-07-03 10:54:10 +02:00
Dean Herbert
1219bea077
Fix layout of profile top header to match web (#5218)
Fix layout of profile top header to match web
2019-07-03 17:48:18 +09:00
Dean Herbert
43bdf49277
Implement Hidden mod for osu!catch (#5176)
Implement Hidden mod for osu!catch

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 17:39:08 +09:00
miterosan
ab244d1b7f Only log that the rulesets could not be loaded from a directory. 2019-07-03 10:21:18 +02:00
miterosan
d9e646d9ef Use addRuleset inside loadRulesetFromFile 2019-07-03 09:51:09 +02:00
Dean Herbert
6e308945b1 Fix logo visualisation trying to catch up after being off-screen 2019-07-03 15:22:17 +09:00
Dean Herbert
299e9c9c33 Update bounty line 2019-07-03 14:34:51 +09:00
Dean Herbert
6c46643c26 Update icon 2019-07-03 14:26:29 +09:00
Dean Herbert
9eef8243c0 Update bounty/contribution information 2019-07-03 14:22:14 +09:00
Dean Herbert
392985a95b
Merge branch 'master' into ctb-hd 2019-07-03 13:29:59 +09:00
Dean Herbert
7c5e4c60c1
Use actual drawables instead of texture in DrawableRank (#5192)
Use actual drawables instead of texture in DrawableRank
2019-07-03 13:01:24 +09:00
Dean Herbert
1189092e20 Remove redundant scale specification 2019-07-03 12:49:16 +09:00
Dean Herbert
be904512d9
Merge branch 'master' into animated-rank-grades 2019-07-03 12:44:08 +09:00
Dean Herbert
67981a003f
Add ability to download and watch replays (#5189)
Add ability to download and watch replays

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-03 12:21:13 +09:00