1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 00:57:25 +08:00
Commit Graph

2101 Commits

Author SHA1 Message Date
Dean Herbert
034875be47 Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
2018-02-27 20:45:32 +09:00
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30
Dean Herbert
402d71a8d9 Add user skin setting storage 2018-02-22 16:29:05 +09:00
Dean Herbert
659cf629b6 Add skin seleciton dropdown to settings 2018-02-22 15:46:11 +09:00
Dean Herbert
c070c69522 Update framework 2018-02-22 15:01:53 +09:00
Dean Herbert
f2b3d9a0e8 Change some missed instances 2018-02-22 14:17:35 +09:00
Joseph Madamba
3d4bed462b
Reword sign in text 2018-02-21 20:54:47 -08:00
Dean Herbert
d07ab1fbea Fix undelete all 2018-02-15 15:14:55 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
e2d11af4ef Fix incorrect MusicController drag handling 2018-02-13 20:08:59 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
Dean Herbert
6b6d4f9527
Merge branch 'master' into country_rank 2018-02-07 18:49:40 +09:00
Dean Herbert
4c3606f8fb Handle non-present country rank 2018-02-07 18:34:38 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
Shane Woolcock
e0c52c69cf Prevent revert-to-default OnHover from hiding visual settings at beatmap load 2018-02-06 22:31:30 +10:30
Dean Herbert
30b9439263 Fix default mouse sensitivity not reverting correctly 2018-02-05 20:00:36 +09:00
Dean Herbert
7e56519d6a Add setting for absolute input mapping 2018-02-05 16:13:39 +09:00
Imnooby
c4f3223e34 Stops non-url text from being hyperlinks
Fixed crash when you attempted to click one
2018-02-03 18:24:49 -06:00
Dean Herbert
39160d895c Update design of "revert to default" button
Also fixes some inconsistencies in padding
2018-02-02 15:18:39 +09:00
tgi74000
e08a9350a0 Store and show SSPlus and SPlus statistics 2018-02-01 15:19:49 +01:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck 2018-02-01 16:21:33 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
Dean Herbert
e5188fd151 Add better channel test cases (testing non-existent channels) 2018-01-30 17:43:19 +09:00
smoogipoo
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
Dean Herbert
7852015db3 Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
2018-01-26 19:32:57 +09:00
smoogipoo
5742e61e68 Merge remote-tracking branch 'origin/master' into ruleset-configs 2018-01-26 15:39:09 +09:00
Dean Herbert
fd7d7c3953
Merge branch 'master' into MakeMusicControllerDraggableAgain 2018-01-25 09:01:54 +09:00
TocoToucan
51e188401f Make MusicController draggable again 2018-01-25 00:38:22 +03:00
Aergwyn
205d3ed896 fix settings not getting injected 2018-01-23 19:42:21 +01:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
Dean Herbert
95f941163b
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 17:08:10 +09:00
Dan Balasescu
73799832ef
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 16:54:32 +09:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00
Aergwyn
82c8822888 we need to go back
reverted change and instead check `DeletePending` when retrieving existing online IDs
2018-01-22 08:04:14 +01:00
Dan Balasescu
20be4bbbcd
Merge branch 'master' into better-direct-progress-bar 2018-01-22 14:25:23 +09:00
Dean Herbert
3d4e2d400c Remove unused using 2018-01-22 13:52:10 +09:00
Dean Herbert
53e40a77dc Don't show error messages when a download is user-cancelled
Resolves #1941.
2018-01-22 13:25:49 +09:00
smoogipoo
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +09:00
Dean Herbert
060d80efbe Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
2018-01-22 13:05:07 +09:00
Aergwyn
596044e19d show beatmapsets with pending deletion in osu!direct 2018-01-19 17:25:32 +01:00
Dean Herbert
652f273961 Ensure previews stop playing when they are removed from the draw hierarchy 2018-01-19 15:46:42 +09:00
Dan Balasescu
250e936099
Merge branch 'master' into preview-fixes 2018-01-19 00:03:47 +09:00
Aergwyn
56619ae926 use ternary expression 2018-01-18 15:53:53 +01:00
smoogipoo
a94ea7025e Register/Unregister -> BeginTracking/StopTracking and add exceptions 2018-01-18 18:45:48 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
Dean Herbert
7ceed8b5eb Stop any playing preview when closing the direct overlay
Resolves #1925
2018-01-18 17:28:56 +09:00
smoogipoo
c2c478750d Remove generics from OSD registration methods 2018-01-18 16:57:32 +09:00
smoogipoo
09dfea7e29 Use tracked settings from ConfigManager changes 2018-01-18 15:26:03 +09:00
Aergwyn
65bac6d31a return preview instead of nothing if it exists already
allows listening to it again after reaching the end
2018-01-17 20:36:47 +01:00
Aergwyn
f86cb30e47 prevent negative width on progress bar 2018-01-17 20:35:28 +01:00
Dean Herbert
e7524445ee Use Restart() 2018-01-17 21:33:19 +09:00
Dean Herbert
54ed608ddb Mute global track volume when a beatmap preview is playing 2018-01-17 21:26:12 +09:00
Dean Herbert
783ca40c64 Update with upstream changes 2018-01-17 16:51:47 +09:00
Dean Herbert
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
Dean Herbert
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Aergwyn
1c5b3d009c remove volume reduction on preview
it doubles with global reduction
2018-01-12 17:09:57 +01:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
Dean Herbert
73aa56a8a7
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-12 18:58:30 +09:00
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +09:00
Dean Herbert
ff725f0e32 Fix incorrect online conditional check in social browser logic 2018-01-12 18:20:46 +09:00
Dean Herbert
29c8400ec7
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:35:24 +09:00
Dean Herbert
0a06f8069f Remove panel fade out for now
Should be implemented at one level above using a dedicated container.
2018-01-12 17:22:51 +09:00
smoogipoo
441e8aced5 Better namings for the speed change "algorithms" 2018-01-12 17:18:34 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
FreezyLemon
174fdf5037 Nicer code to remove non-existent channels from links 2018-01-11 18:51:20 +01:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00
Aergwyn
312f52072b enable query
change Avatar animation too
add forgotten usings
2018-01-10 16:46:55 +01:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
smoogipoo
c010b48b29 Remove number format specified from OsuSliderBar, override ToolTipText
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca More osu!-side bindable fixes 2018-01-10 15:41:13 +09:00
Aergwyn
4ce125478a remove unnecessary Schedules
one was bugging out when rapidly switching display styles and the other was... unnecessary
2018-01-09 19:03:23 +01:00
Aergwyn
44d821172a tidying up 2018-01-09 16:29:12 +01:00
FreezyLemon
3bf9901dd2 Fixed bugs and added tests 2018-01-09 16:11:45 +01:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
72624aea18 Use a better method of link compilation
Adds word wrap back, simplifies a lot.
2018-01-09 20:33:20 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support 2018-01-09 14:28:20 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Aergwyn
d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn
a61666d2a7 update licence headers 2018-01-06 10:54:53 +01:00