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

596 Commits

Author SHA1 Message Date
smoogipoo 31920f1866 Fix ruleset resources not getting included in build 2018-03-25 02:12:01 +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 9d3529ce7b
Merge branch 'master' into cursor-skinning 2018-03-22 21:07:16 +09:00
Dean Herbert af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +09:00
Dan Balasescu ab9505652b Merge branch 'master' into skin--completion 2018-03-22 16:44:00 +09:00
smoogipoo 4ccaf143b5 Give sliders a default accent colour 2018-03-22 15:50:19 +09:00
Dean Herbert 78a8f60b39 IHasComboIndex -> IHasComboInformation 2018-03-22 12:35:17 +09:00
Dean Herbert d909cce8d6 Add the ability to skin the gameplay cursor 2018-03-21 20:06:10 +09:00
Dean Herbert fb3d319d0e Make fallback bool into a function 
Allows correct handling now that beatmap skins are also a thing.
 2018-03-20 16:40:11 +09:00
Dean Herbert c38c26eacb Move combo index processing to BeatmapProcessor 2018-03-20 15:57:43 +09:00
Dean Herbert cb3d0db555 Move combo colours completely out of HitObjects 2018-03-20 15:50:12 +09:00
Dean Herbert 7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert 23ffee3d38
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:38:52 +09:00
Dean Herbert 46f5c0fc19
Merge branch 'master' into mod-fixes 2018-03-16 15:38:41 +09:00
Dan Balasescu cdc61d5f0d
Merge branch 'master' into fix-combo-colours 2018-03-16 14:59:45 +09:00
Dean Herbert 7ed84465fb
Merge branch 'master' into mod-fixes 2018-03-16 11:27:39 +09:00
Dean Herbert a42035f494 Make DrawableHitObject a CompositeDrawable 
No reason for it to be a container.
 2018-03-15 13:41:06 +09:00
Dean Herbert 8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
Dean Herbert a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
Dean Herbert 81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
Joseph Madamba d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Dean Herbert 13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
Dean Herbert c55d70ec13
Merge branch 'master' into fix-combo-colours 2018-03-13 19:19:45 +09:00
Dean Herbert e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
smoogipoo 0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
Dean Herbert b93e83e3d2
Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
Dean Herbert 107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
smoogipoo d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
smoogipoo 8c4bcb4a04 Only accept drag movement on the overlays 2018-03-12 17:33:10 +09:00
smoogipoo 212142429f Derive from IHasPosition 2018-03-12 17:25:34 +09:00
smoogipoo 2d9fcdcbd0 Fix slider circle overlays moving with the endpoints 2018-03-12 17:18:50 +09:00
Dean Herbert eb643b690a
Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
Dean Herbert d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
Dan Balasescu 8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements 2018-03-12 10:29:50 +09:00
Dean Herbert ccc3c573ab Fix resharper not fixing 2018-03-11 02:20:00 +09:00
Dean Herbert 5092fe5596 Adjust cursor trail display length 
In line with shader change at ad5ddec7b2
 2018-03-11 02:11:56 +09:00
Dean Herbert df2815f19e Add TestCase for GameplayCursor 2018-03-11 02:11:25 +09:00
Dean Herbert 487a03d0d7
Merge branch 'master' into cursor-trail 2018-03-11 02:07:05 +09:00
smoogipoo 92b302971f Trim whitespace 2018-03-10 01:23:53 +09:00
smoogipoo 24501c37dd Merge branch 'drawableslider-cleanup' into editor-hitobject-movement 2018-03-10 01:15:24 +09:00
smoogipoo 8ed5fce43a Split out the slider head into a separate drawable hitobject 2018-03-10 01:13:59 +09:00
smoogipoo 376f6eec58 SetPosition -> OffsetPosition 2018-03-10 00:02:13 +09:00
smoogipoo 4a48136e4f Make hitobject positions adjustable 2018-03-09 23:12:34 +09:00
Dean Herbert 81b778fdcf
Merge branch 'master' into cursor-trail 2018-03-08 09:31:42 +09:00
Dean Herbert 04f5563238 Match HP drain harshness closer to stable 
Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.
 2018-03-07 19:37:26 +09:00
Dean Herbert b62ed004f2 Remove judgements when deciding a new judgement for a HitObject 
Generally happens when rewinding.
 2018-03-07 19:14:42 +09:00
Dean Herbert f2d7621df3 Add skin support for explode/flash layers 
Basically to hide them for legacy skins, though.
 2018-03-07 18:21:05 +09:00
Dean Herbert 05eb678654 Add skin support for judgements 2018-03-07 18:21:05 +09:00
Dan Balasescu 1375ee8408
Merge branch 'master' into slider-tick-transform-cleanup 2018-03-07 16:59:04 +09:00