1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 23:27:34 +08:00
Commit Graph

20281 Commits

Author SHA1 Message Date
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
7423d0e857 Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-03 17:41:05 +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
David Zhao
b2185cd3a2
Merge branch 'master' into buttonsystem-entermode 2019-07-03 15:54:34 +09:00
David Zhao
6391d21af1
Remove test used for visualization 2019-07-03 15:54:21 +09: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
Salman Ahmed
98daaf634a Simplify changes 2019-07-03 06:44:17 +03: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
Dean Herbert
d22a1229cb Remove unnecessary disposal 2019-07-03 12:06:20 +09:00
Dean Herbert
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4 2019-07-03 11:47:10 +09:00
Salman Ahmed
3f39541cc2 Fade health bar on value change 2019-07-03 05:11:11 +03:00
Salman Ahmed
8b4ef52c13
Revert unnecessary changes 2019-07-03 07:27:24 +03:00
Salman Ahmed
30ec8e031e
Merge branch 'master' into animated-rank-grades 2019-07-03 02:34:08 +03:00
Joehu
a1fb41ea66 Use FillFlowContainer on flag and country 2019-07-02 10:53:52 -07:00
Joehu
d387629e53 Fix layout of profile top header to match web 2019-07-02 10:52:24 -07:00
Dean Herbert
a155cdf5fd
Merge branch 'master' into fix-overlay-presence 2019-07-03 00:51:22 +09:00
Dean Herbert
a3499a531b
Update framework (#5217)
Update framework
2019-07-03 00:51:06 +09:00
Dean Herbert
f9c24f2281 Update framework 2019-07-03 00:35:55 +09:00
miterosan
f1ceea8361 style fixes 2019-07-02 17:25:12 +02:00
Dean Herbert
e1d0d26669 Add a note about local optimisation that may not be required in the future 2019-07-03 00:21:16 +09:00
miterosan
778c36c7d7 Allow discover of rulesets that are already loaded. 2019-07-02 17:05:04 +02:00
Dean Herbert
2fcd428d73
Merge branch 'master' into fix-overlay-presence 2019-07-02 23:40:49 +09:00