RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,734 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

11734 Commits

Author SHA1 Message Date
Dean Herbert f99503b60c Add new gitattributes 2018-04-13 18:19:38 +09:00
Dean Herbert 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
Endrik Tombak d9f587edff Merge remote-tracking branch 'upstream/master' into alt-eagerselect 2018-04-13 11:55:35 +03:00
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
Dean Herbert ea24006a66
Merge pull request #2372 from smoogipoo/remove-gamefield-test 
Remove TestCaseGamefield
 2018-04-12 23:50:16 +09: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
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
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
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
Dean Herbert 421e9e0641 Add xmldoc to some high-level classes to explain their separation 2018-04-08 12:58:34 +09: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
Dean Herbert 596b63f7df
Merge pull request #2353 from peppy/dynamic-assembly-update 
Update AssemblyInfo in line with framework changes
 2018-04-06 20:41:51 +09:00
Dan Balasescu 1895111c75
Merge branch 'master' into dynamic-assembly-update 2018-04-06 20:16:13 +09:00
Dean Herbert 6bc319caae
Merge branch 'master' into manual-input-test-case 2018-04-06 20:07:07 +09:00
Dean Herbert b91f538d5d
Merge pull request #2329 from smoogipoo/selectionlayer-rewrite 
Rewrite editor selections to better handle selection and movement logic
 2018-04-06 20:06:49 +09:00
smoogipoo c80c1071e8 Update framework 2018-04-06 19:54:19 +09:00
Dean Herbert ae2dce254a Rename TestCase 2018-04-06 19:53:34 +09:00
Dean Herbert cd48cb1887 Add comment 2018-04-06 19:53:23 +09:00
smoogipoo 070e68f235 Give the test case clock an accurate IsRunning value 2018-04-06 19:14:04 +09:00
smoogipoo e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
Endrik 8ef5855e84
Fix typo 2018-04-06 12:38:17 +03:00
Endrik c7440201fb
Merge branch 'master' into alt-eagerselect 2018-04-06 12:37:16 +03:00
smoogipoo b238130fe4 DI beat divisors to test cases with editor clocks 2018-04-06 18:23:22 +09:00
smoogipoo 9e8490735f Fix Compose not binding to the editor's beat divisor 2018-04-06 18:22:24 +09:00
smoogipoo 248be8e35f HitObjectComposer no longer needs a beat divisor 2018-04-06 18:21:45 +09:00
smoogipoo fdb3227fd7 Fix + cleanup testcases 2018-04-06 18:12:44 +09:00
smoogipoo c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00