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

552 Commits

Author SHA1 Message Date
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
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
Dan Balasescu 6dfca4b2fa
Merge branch 'master' into osu-tab-strip 2018-04-04 14:20:06 +09:00
smoogipoo 551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +09:00
Dean Herbert cf3cafd9a9
Merge branch 'master' into beatmap-set-status 2018-03-30 20:55:36 +09:00
DrabWeb e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
Dean Herbert 59df02da00 Update test projects to actually load in visual studio 2018-03-28 16:12:25 +09:00
Dean Herbert 0026b94cd3 Consolidate and move ruleset test projects 2018-03-28 14:41:25 +09:00
Dean Herbert 4907f14dbe Add back resources 2018-03-28 13:00:18 +09:00
Dean Herbert 94b1d3e4af Make VisualTests/nUnit work again 2018-03-28 12:33:01 +09:00
DrabWeb 19bc6b9168 Merge https://github.com/ppy/osu into beatmap-set-status 2018-03-27 18:13:58 -03:00
Dean Herbert d76bc1a8ad Revert "Move NoWarns" 
This reverts commit 75a413a40e.
 2018-03-27 21:13:06 +09:00
Dean Herbert 75a413a40e Move NoWarns 2018-03-27 19:19:09 +09:00
Dean Herbert 1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
Dean Herbert b290d2d039 Move NUnit includes to individual projects 2018-03-27 15:07:09 +09:00
DrabWeb eb374c5774 Add beatmap set online status and display it in direct panels and the beatmap set overlay. 2018-03-26 21:04:45 -03:00
smoogipoo dd5bbbbd9f Define testable projects 2018-03-26 19:11:23 +09:00
smoogipoo 5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo 35ef9d99c6 Only compile with net461 in visual studio 2018-03-26 15:44:55 +09:00
smoogipoo 96901b6498 Add msbuild/dotnet build + launch targets 2018-03-26 10:52:54 +09:00
smoogipoo 4dc317d4df Fix msbuild warnings 2018-03-25 03:38:52 +09:00
smoogipoo c21e820a45 One more level of nesting (we can do this better in the future) 2018-03-25 02:43:45 +09:00
smoogipoo d28de89e50 Add net461 target to test projects for nunit discovery 
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).
 2018-03-25 01:35:50 +09:00
smoogipoo c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert 92d8781bf0
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:14:50 +09:00
Dean Herbert 1b116dd04e Adjust testcase sizing to match editor 2018-03-22 16:11:56 +09:00
Dean Herbert c2eb32c0e9 DrawableBeatDivisor -> BeatDivisorControl 2018-03-20 20:10:27 +09:00
Dean Herbert 6fd650777c Move value change logic to bindable 
Also add drag support
 2018-03-20 20:09:55 +09:00
Dean Herbert d1c2aa71d0 Add beatmap sample override support 2018-03-20 16:24:06 +09:00
Dean Herbert 9a0fc9e29a Move combo colours completely out of beatmap 2018-03-20 16:24:06 +09:00
smoogipoo 786e6242e1 Make bdl beat divisor nullable 2018-03-20 14:01:06 +09:00
smoogipoo 50192b21e3 Give DrawableBeatDivisor a ctor 2018-03-20 13:57:25 +09:00
smoogipoo fa5fd46f85 Clean up + rename testcase 2018-03-19 20:42:42 +09:00
smoogipoo b1d09500f2 Integrate beat snap divisor into editor seeking 2018-03-19 20:42:06 +09:00
smoogipoo c5eab7a227 Actually rename to DrawableBeatDivisor... 2018-03-19 20:34:24 +09:00
smoogipoo 5ecbc5612c Integrate with dependency injection 2018-03-19 20:33:58 +09:00
smoogipoo 46f10b392d Fix merge errors 2018-03-19 20:23:31 +09:00
smoogipoo 4c0ccffe08 Merge remote-tracking branch 'origin/master' into beat-snap-divisor 2018-03-19 20:23:15 +09:00
smoogipoo df0b8a24c5 Rename + renamespace 2018-03-19 20:21:19 +09:00
smoogipoo b25c564ecb Integrate into editor's compose screen 2018-03-19 20:14:58 +09:00
smoogipoo 070db63157 Privatise tick to TickContainer 2018-03-19 19:52:22 +09:00
smoogipoo 66e4e45882 Offset test case a little bit for dynamic compilation message 2018-03-19 19:49:46 +09:00
smoogipoo 6b035e8c53 Add basic structure/layout for the beat snap visualiser 2018-03-19 19:46:26 +09:00
smoogipoo 193142e901 Fix missed BDL case 2018-03-19 16:44:46 +09:00
smoogipoo e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09:00
smoogipoo abb5dcf678 Fix null-refing testcase 
This would also be fixed with BDL loading children after we're fully loaded ;).
 2018-03-16 23:53:55 +09:00
Dean Herbert 4b83278cf4
Merge branch 'master' into fix-editor-clocks 2018-03-16 23:32:54 +09:00
Dean Herbert e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement 2018-03-16 18:19:42 +09:00