671de4f6c2
Resolve merge conflicts
2018-04-14 15:11:28 +03:00
f59eef072d
Merge pull request #2389 from UselessToucan/ignored_input_handler
...
Fix new input handlers not being enabled by default
2018-04-13 22:36:04 +09:00
a6dfe0d4c9
Final framework update
2018-04-13 22:24:19 +09:00
fe77417e03
Merge remote-tracking branch 'origin/master' into ignored_input_handler
2018-04-13 22:23:33 +09:00
aadde08396
Merge pull request #2399 from FreezyLemon/update-nunit-3.10.1
...
Update NUnit to version 3.10.1
2018-04-13 22:22:37 +09:00
258e17566c
Merge branch 'master' into update-nunit-3.10.1
2018-04-13 22:05:26 +09:00
a0f9f8d512
Update frramework again
2018-04-13 21:47:50 +09:00
4b3a129738
bump NUnit to version 3.10.1
2018-04-13 13:19:52 +02:00
9f5a52b641
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
2018-04-13 19:54:15 +09:00
e962bc312e
Update framework
2018-04-13 19:53:29 +09:00
632befb210
Merge pull request #2378 from peppy/fix-line-endings
...
Normalize line endings to LF
2018-04-13 19:47:30 +09:00
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
f99503b60c
Add new gitattributes
2018-04-13 18:19:38 +09:00
5f020074e0
Merge pull request #2332 from LittleEndu/alt-eagerselect
...
Make beatmap carousel select a random beatmap when there was no previous selection
2018-04-13 18:11:45 +09:00
a1a7e63646
Merge branch 'master' into ignored_input_handler
2018-04-13 18:05:12 +09:00
d9f587edff
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
2018-04-13 11:55:35 +03:00
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
f7c50dee65
Merge branch 'master' into beatmap_set_overlay_difficulties_ordering
2018-04-13 16:48:43 +09:00
0871c16075
Merge pull request #2390 from Joehuu/lowercase-back-button
...
Lowercase back button
2018-04-13 14:25:23 +09:00
2699ad8c89
Merge branch 'master' into lowercase-back-button
2018-04-13 14:14:18 +09:00
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
128446e51d
Remove composer from player loader
2018-04-12 16:46:46 -07:00
9acea6eab0
Order beatmap difficulty icons correctly
2018-04-12 19:33:30 +03:00
61d6f52a53
Lowercase back button
2018-04-12 08:26:25 -07:00
ea24006a66
Merge pull request #2372 from smoogipoo/remove-gamefield-test
...
Remove TestCaseGamefield
2018-04-12 23:50:16 +09:00
7c3441e2d0
ActiveInputHandlers -> IgnoredInputHandler
2018-04-12 17:06:35 +03:00
1e6244afe1
Merge branch 'master' into remove-gamefield-test
2018-04-12 21:37:04 +09:00
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
127f0d7b01
Fix smoogipoo's comments
2018-04-12 21:17:17 +09:00
0ca703beaa
Add some missing xmldoc
2018-04-12 21:04:45 +09:00
b50bad0072
Merge branch 'master' into editor-clock
2018-04-12 19:29:58 +09:00
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
3ddf00ee74
Merge branch 'master' into high-level-xmldoc
2018-04-12 19:05:10 +09:00
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
baae4427ff
Move string-token property to OAuth
2018-04-12 14:30:28 +09:00
e007365916
Save OAuth token to config on every token change
2018-04-12 14:23:49 +09:00
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
a2484fbf56
Move back to DI-ing adjustable clock into SummaryTimeline
2018-04-12 13:37:02 +09:00
fbc50d6030
Merge master into editor-clock
2018-04-12 13:35:53 +09:00
9e2494c57b
Merge branch 'master' into high-level-xmldoc
2018-04-12 12:59:37 +09:00
6a8f568f66
BeatmapContainer -> beatmapContainer
2018-04-11 16:32:58 +03:00
6cdfaffcf7
PaginatedBeatmapContainer.BeganPlayingPreview
2018-04-11 16:19:21 +03:00
62968bb4c7
Merge pull request #2379 from peppy/fix-crash-regression
...
Fix regression causing hard crash
2018-04-11 13:08:32 +02:00
903dd7a015
Fix regression causing hard crash
...
Regressed in #2373 . My bad.
2018-04-11 19:24:19 +09:00
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
b97c4e8b44
Fix all possible cases of crossthread import data races
2018-04-09 12:45:44 +09:00
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
421e9e0641
Add xmldoc to some high-level classes to explain their separation
2018-04-08 12:58:34 +09:00
640be621ac
Handle multiple song previews playing in different beatmap categories on profile
2018-04-07 13:29:46 +03:00
81981acc68
Merge pull request #2354 from peppy/manual-input-test-case
...
Create ManualInputManagerTestCase
2018-04-06 20:52:07 +09:00
