1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 12:47:24 +08:00
Commit Graph

11850 Commits

Author SHA1 Message Date
TocoToucan
e6d7136a92 Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction 2018-04-21 20:21:09 +03:00
TocoToucan
21454d1f10 Revert "Add 'End replay' button"
This reverts commit c34ef42f00.
2018-04-21 19:27:17 +03:00
TocoToucan
3b621db460 Implement CircularProgress filling 2018-04-21 19:25:21 +03:00
TocoToucan
633c775306 Initial HoldToQuit commit 2018-04-21 18:24:31 +03:00
TocoToucan
c34ef42f00 Add 'End replay' button 2018-04-20 12:50:19 +03:00
Dean Herbert
6d3533b777
Merge pull request #2422 from tgi74/profile_web_changes
Update profile header to match osu-web changes
2018-04-20 14:00:34 +09:00
Dean Herbert
a64ed142f0 Use a more suiting icon for discord for now 2018-04-20 13:51:30 +09:00
Dean Herbert
8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
Dean Herbert
fe644c6909
Merge branch 'master' into profile_web_changes 2018-04-20 12:51:30 +09:00
Dan Balasescu
3824d61b99
Merge pull request #2416 from peppy/beatmap-set-overlay-nullability
Make BeatmapSetOverlay accept nulls everywhere
2018-04-19 22:19:57 +09:00
tgi74000
64709da546 Update profile header to osu-web changes 2018-04-19 14:46:42 +02:00
Dean Herbert
7880dc8f8c Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 21:11:23 +09:00
Dean Herbert
77af8ce556 Add back online load test for BeatmapScoresContainer 2018-04-19 21:11:16 +09:00
Dan Balasescu
c247fe1343
Merge pull request #2421 from peppy/appveyor-release
Add automated appveyor deployment
2018-04-19 21:05:51 +09:00
Dean Herbert
0356e5e6bf Remove unused property 2018-04-19 21:00:22 +09:00
Dean Herbert
f7ca6267b1 Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 20:53:06 +09:00
Dean Herbert
8a243461a6 Expose appveyor artifacts 2018-04-19 17:51:10 +09:00
Dean Herbert
312068d7a2 Add deploy config 2018-04-19 17:51:02 +09:00
Dean Herbert
278a878b09 Add non-interactive deploy mode 2018-04-19 17:14:51 +09:00
Dean Herbert
dd7020d5a4
Merge pull request #2398 from tgi74/rightclickscrolling
Add right click absolute scrolling in song select
2018-04-18 19:57:52 +09:00
Dean Herbert
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
Dean Herbert
69a91c610d
Merge pull request #2366 from tgi74/ctb_hr_mangling
Add HardRock position mangling for CatchTheBeat
2018-04-18 16:57:16 +09:00
Dean Herbert
d307b8dc2e Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling 2018-04-18 16:46:02 +09:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
Dean Herbert
0a292a6ab4
Merge pull request #2415 from smoogipoo/better-test-case
Update OsuTestCase with framework testing changes
2018-04-18 15:56:09 +09:00
smoogipoo
560fcfc661 Update framework 2018-04-18 15:32:21 +09:00
smoogipoo
d5ce618d9b Update with framework changes 2018-04-18 15:12:48 +09:00
Dan Balasescu
bc3150776e
Merge pull request #2377 from Joehuu/fix-rank-status
Fix qualified category on rank status
2018-04-18 14:33:03 +09:00
Dan Balasescu
533b7d907d
Merge branch 'master' into fix-rank-status 2018-04-18 14:19:53 +09:00
smoogipoo
68a13a5fb5 Update framework 2018-04-18 14:18:56 +09:00
Dan Balasescu
f8a9d9d4fe
Merge pull request #2381 from peppy/app-manifest
Add back app.manifest
2018-04-18 14:18:13 +09:00
smoogipoo
ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status
# Conflicts:
#	osu.Game/Beatmaps/RankStatus.cs
#	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
#	osu.Game/Overlays/Direct/FilterControl.cs
#	osu.Game/Overlays/DirectOverlay.cs
2018-04-18 14:16:58 +09:00
Dean Herbert
c32ab7d08c
Merge branch 'master' into app-manifest 2018-04-18 14:10:03 +09:00
Dean Herbert
919f2acccd
Merge pull request #2400 from tgi74/replay_mods
Add support for replay mods
2018-04-18 14:09:54 +09:00
Dan Balasescu
33f4f57ee3
Merge branch 'master' into replay_mods 2018-04-18 14:00:32 +09:00
Dan Balasescu
0e640b432d
Merge branch 'master' into app-manifest 2018-04-18 13:59:47 +09:00
Dean Herbert
2b83d49862
Merge pull request #2408 from smoogipoo/fix-leaderboard-nullref
Fix various leaderboard data races
2018-04-18 13:48:14 +09:00
Dean Herbert
64f47daff4
Merge branch 'master' into fix-leaderboard-nullref 2018-04-18 12:05:13 +09:00
Dean Herbert
188c8ce1e7 Remove unnecessary score nulling (already happens in PlaceholderState_Set) 2018-04-18 11:58:55 +09:00
Dean Herbert
a27f39a555 Add documentation explaining intertwining logic 2018-04-18 11:57:06 +09:00
Dean Herbert
f678ce1bf5
Merge pull request #2407 from jorolf/profile-badges
Add badges to ProfileHeader
2018-04-18 11:53:15 +09:00
Dean Herbert
a827fb51bc Simplify child definition 2018-04-18 11:42:55 +09:00
jorolf
ddd59382e2 Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges 2018-04-16 19:37:52 +02:00
jorolf
de9f15f620 add new test case and fix rotation not working 2018-04-16 19:22:11 +02:00
jorolf
046412f962 make hover lost transition instant (similar to hover transition) 2018-04-16 18:52:09 +02:00
jorolf
2a18b4c3f8 add a DRAWABLE_BADGE_SIZE const and center badges 2018-04-16 18:51:35 +02:00
jorolf
af0c49cca8 badge_size is the actual badge size now
also fixes rotateBadges bug when hover is lost
2018-04-16 18:27:18 +02:00
tgi74000
1feba556eb CI: unused directive 2018-04-16 14:25:43 +02:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00