1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

12007 Commits

Author SHA1 Message Date
Dean Herbert
06efddd4b4
Merge pull request #2394 from UselessToucan/beatmap_set_overlay_difficulties_ordering
Fix incorrect ordering of difficulties retrieved from API
2018-04-13 17:09:48 +09:00
Dean Herbert
f7c50dee65
Merge branch 'master' into beatmap_set_overlay_difficulties_ordering 2018-04-13 16:48:43 +09:00
Dan Balasescu
0871c16075
Merge pull request #2390 from Joehuu/lowercase-back-button
Lowercase back button
2018-04-13 14:25:23 +09:00
Dan Balasescu
2699ad8c89
Merge branch 'master' into lowercase-back-button 2018-04-13 14:14:18 +09:00
Dean Herbert
68d865bbd1
Merge pull request #2396 from Joehuu/remove-composer-from-player-loader
Remove composer from player loader
2018-04-13 13:08:13 +09:00
Joehu
128446e51d Remove composer from player loader 2018-04-12 16:46:46 -07:00
TocoToucan
9acea6eab0 Order beatmap difficulty icons correctly 2018-04-12 19:33:30 +03:00
Joehu
61d6f52a53 Lowercase back button 2018-04-12 08:26:25 -07:00
Joehu
463b189d2f Remove unused using directives 2018-04-12 08:13:24 -07:00
Joehu
df4b64effc Rename rankStatus to searchCategory 2018-04-12 08:03:19 -07:00
Dean Herbert
ea24006a66
Merge pull request #2372 from smoogipoo/remove-gamefield-test
Remove TestCaseGamefield
2018-04-12 23:50:16 +09:00
Joehu
f18594887b Move enum to SearchBeatmapSetsRequest 2018-04-12 07:49:23 -07:00
TocoToucan
7c3441e2d0 ActiveInputHandlers -> IgnoredInputHandler 2018-04-12 17:06:35 +03:00
Dean Herbert
1e6244afe1
Merge branch 'master' into remove-gamefield-test 2018-04-12 21:37:04 +09:00
Dean Herbert
3de460f84c
Merge pull request #2356 from smoogipoo/editor-clock
Move seeking logic into a custom editor clock
2018-04-12 21:36:50 +09:00
Dean Herbert
127f0d7b01 Fix smoogipoo's comments 2018-04-12 21:17:17 +09:00
Dean Herbert
0ca703beaa Add some missing xmldoc 2018-04-12 21:04:45 +09:00
Dean Herbert
b50bad0072
Merge branch 'master' into editor-clock 2018-04-12 19:29:58 +09:00
Dean Herbert
ce01fd245a
Merge pull request #2376 from peppy/high-level-xmldoc
Add xmldoc to some high-level classes to explain their separation
2018-04-12 19:26:31 +09:00
Dean Herbert
3ddf00ee74
Merge branch 'master' into high-level-xmldoc 2018-04-12 19:05:10 +09:00
Dean Herbert
47a78ffb5d
Merge pull request #2387 from smoogipoo/oauth-token-logging
Fix OAuth token not saving often enough
2018-04-12 19:04:48 +09:00
Joehu
461e063f19 Rename RankStatus to BeatmapSearchCategory 2018-04-11 22:50:39 -07:00
smoogipoo
baae4427ff Move string-token property to OAuth 2018-04-12 14:30:28 +09:00
smoogipoo
e007365916 Save OAuth token to config on every token change 2018-04-12 14:23:49 +09:00
smoogipoo
6e35910419 Remove start/stop clock logic
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
2018-04-12 14:06:36 +09:00
smoogipoo
a2484fbf56 Move back to DI-ing adjustable clock into SummaryTimeline 2018-04-12 13:37:02 +09:00
smoogipoo
fbc50d6030 Merge master into editor-clock 2018-04-12 13:35:53 +09:00
Dan Balasescu
9e2494c57b
Merge branch 'master' into high-level-xmldoc 2018-04-12 12:59:37 +09:00
DrabWeb
0bede52381 Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places. 2018-04-11 16:22:27 -03:00
TocoToucan
d7812ab12e CursorOverrideContainer.ShowMenuCursor 2018-04-11 21:22:52 +03:00
TocoToucan
6a8f568f66 BeatmapContainer -> beatmapContainer 2018-04-11 16:32:58 +03:00
Dean Herbert
9793137bfa Add back app.manifest
Resolves #2380
2018-04-11 22:32:38 +09:00
TocoToucan
6cdfaffcf7 PaginatedBeatmapContainer.BeganPlayingPreview 2018-04-11 16:19:21 +03:00
Thomas Müller
62968bb4c7
Merge pull request #2379 from peppy/fix-crash-regression
Fix regression causing hard crash
2018-04-11 13:08:32 +02:00
Dean Herbert
903dd7a015 Fix regression causing hard crash
Regressed in #2373. My bad.
2018-04-11 19:24:19 +09:00
Dean Herbert
9e5e2c8863
Merge pull request #2373 from smoogipoo/fix-crossthread-imports
Fix all possible cases of crossthread import data races
2018-04-10 23:05:22 +09:00
naoey
d851446aca
Remove redundant anchor and use Show/Hide instead of FadeIn/Out. 2018-04-10 19:15:37 +05:30
Joseph Madamba
767ecb4422 Fix rank status 2018-04-10 00:11:53 -07:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
smoogipoo
cea3e1c7f5 Remove now unnecessary approachcircle proxy disables
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
tgi74000
82d9504cbf Changed relative position to [0, 1] 2018-04-09 09:02:32 +02:00
smoogipoo
b97c4e8b44 Fix all possible cases of crossthread import data races 2018-04-09 12:45:44 +09:00
smoogipoo
7e78b2e54e Remove TestCaseGamefield
Unused. Unneeded. We already have TestCaseAllPlayers and individual tests in all rulesets. Eventually we probably also want osu.Game.Tests to not reference ruleset projects anyway.
2018-04-09 11:37:03 +09:00
tgi74000
b40af0848f White space 2018-04-08 15:52:40 +02:00
tgi74000
58dbc63c6e Add HardRock position mangling for CatchTheBeat 2018-04-08 15:24:34 +02:00
Dean Herbert
421e9e0641 Add xmldoc to some high-level classes to explain their separation 2018-04-08 12:58:34 +09:00
TocoToucan
640be621ac Handle multiple song previews playing in different beatmap categories on profile 2018-04-07 13:29:46 +03:00
Dean Herbert
81981acc68
Merge pull request #2354 from peppy/manual-input-test-case
Create ManualInputManagerTestCase
2018-04-06 20:52:07 +09:00
Dean Herbert
c2a2457160
Merge branch 'master' into manual-input-test-case 2018-04-06 20:42:08 +09:00