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

772 Commits

Author SHA1 Message Date
smoogipoo
93696fb5e5 Merge branch 'ruleset-configs' into mania-playfield-inversions
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
smoogipoo
4fb6a8627e Merge remote-tracking branch 'origin/master' into mania-playfield-inversions 2018-06-11 13:45:47 +09:00
smoogipoo
baaf431b9e Make IScrollingInfo and store direction as bindable 2018-06-11 13:42:13 +09:00
smoogipoo
ca5103615d DI the scrolling info rather than pass by ctor 2018-06-11 13:42:13 +09:00
smoogipoo
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e Make ruleset config manager variants nullable 2018-06-11 13:13:36 +09:00
Crusensis
fbc0cd6f5f Split AffectsCombo into IsBonus 2018-06-09 18:14:33 -07:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
smoogipoo
0fb4e6b41b Fix hold note body not following the scroll direction 2018-06-08 18:16:55 +09:00
Dan Balasescu
4dfc328117
Remove unused array 2018-06-08 17:46:38 +09:00
smoogipoo
5c8bea82f8 Fix scroll direction not applying to nested hitobjects 2018-06-08 15:29:08 +09:00
smoogipoo
7deaffdb62 Fix hit explosions not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo
d73c2a1654 Fix various note elements not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo
80a577f182 Fix notes not scrolling correctly 2018-06-08 15:16:45 +09:00
smoogipoo
ee64760406 Add mania stage test case 2018-06-08 14:28:27 +09:00
smoogipoo
32037701bf Make the column hitobject area follow the scroll direction 2018-06-07 21:40:12 +09:00
smoogipoo
0c35908802 Reorder fields 2018-06-07 21:19:31 +09:00
smoogipoo
207cdbdefe Make the column key area follow the scroll direction 2018-06-07 21:13:57 +09:00
smoogipoo
11f067d7d6 Fix background input 2018-06-07 21:13:29 +09:00
smoogipoo
d49758d149 Make background handle its own lit state 2018-06-07 20:59:04 +09:00
smoogipoo
4af8baefc1 Make the column background follow the scroll direction 2018-06-07 20:49:31 +09:00
smoogipoo
9b10cc4e0c Remove invertability of ManiaStage 2018-06-07 19:53:47 +09:00
Dan Balasescu
8d0161c2fc Refactoring 2018-06-07 15:11:48 +09:00
Dean Herbert
f9449e841a Improve overall visual clarity and explosion effects 2018-06-07 14:30:27 +09:00
Dean Herbert
dff4b360b7 Fix ticks not getting accent colour 2018-06-07 14:30:27 +09:00
Dean Herbert
56ea1c1d63 Adjust hold note visibility and glow composition 2018-06-07 14:30:27 +09:00
Dean Herbert
81a3a8a1a4 Add corner radius 2018-06-07 11:57:30 +09:00
Dean Herbert
dc10277d50 Thicker bar lines and new design colour 2018-06-07 11:16:26 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759 Reverse order of exposed objects in HitObjectContainer
Closes #2740.
2018-06-06 15:03:47 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
smoogipoo
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +09:00
smoogipoo
d850e34003 Actually cast to int 2018-05-26 09:25:16 +09:00
smoogipoo
215cc9fba7 Change all performance calculators to use int hitwindows
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007 Remove 0.5 offsets
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
Dean Herbert
6c00046835
Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
smoogipoo
43cdbec0a3 Fix hold note hitwindow lenience 2018-05-17 13:59:04 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
Dean Herbert
97e179b390
Merge branch 'master' into mania-performance-improvements 2018-05-17 12:54:04 +09:00
smoogipoo
2fc1939d65 Fix hold notes never dying 2018-05-16 19:43:01 +09:00
smoogipoo
5aadc35a25 Stably-sort difficulty hitobjects to prevent future issues 2018-05-16 14:47:50 +09:00
smoogipoo
edbb3a5a57 Rename to use new hit result namings 2018-05-16 12:44:11 +09:00
smoogipoo
de63a1b578 Remove construction of new ruleset 2018-05-16 01:43:58 +09:00
smoogipoo
ed902d9325 Cleanup 2018-05-16 01:36:28 +09:00
smoogipoo
1fdc77d579 Update with the rebalance changes 2018-05-16 01:34:07 +09:00
smoogipoo
4019683f6c Implement osu!mania performance calculation 2018-05-16 01:24:53 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
smoogipoo
803200ff6a Apply similar changes to other rulesets 2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
0cdd39b8b8 Add todo because TailNote shouldn't hardcore lenience 2018-05-11 15:32:13 +09:00
smoogipoo
faa82f17cc Pass original hitobject HitWindows during conversion 2018-05-11 15:30:50 +09:00
smoogipoo
7eb64ab590 Remove object counts from mania/taiko/catch 2018-05-07 15:51:08 +09:00
smoogipoo
b737644208 Add mania statistics 2018-05-07 15:51:08 +09:00
smoogipoo
e20323b5f6 Trim whitespace 2018-05-07 11:23:29 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
f3aa9269ff Fix mania-specific beatmap conversion 2018-05-07 09:17:12 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
acbdbcc3df Update AssemblyInfo in line with framework changes 2018-04-06 13:17:26 +09:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits 2018-03-31 10:43:58 -07:00
smoogipoo
bb7618eb0c FIx mania playfield playing the wrong/duplicated sounds
Fixes #2266.
2018-03-29 16:13:31 +09:00
smoogipoo
187a025d36 Make hitobjects sorted by their start times 2018-03-29 16:07:31 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits 2018-03-28 20:42:35 -07:00
Dean Herbert
9aae568bbe Tidy up csproj further 2018-03-28 15:19:56 +09:00
Dean Herbert
9667d54ecb Add missing licence headers 2018-03-28 14:48:08 +09:00
Dean Herbert
0026b94cd3 Consolidate and move ruleset test projects 2018-03-28 14:41:25 +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
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
Joseph Madamba
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07:00
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
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
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
Joseph Madamba
1eeacb7bf7
Change descriptions and special section 2018-03-14 01:05:19 -07:00
Dean Herbert
908d38279b
Merge branch 'master' into fix-mania-conversion 2018-03-14 12:27:32 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
smoogipoo
9e09d434dd Fix argument null exception in ManiaBeatmapConverter 2018-03-14 11:27:14 +09:00
Dean Herbert
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty 2018-03-12 13:31:48 +09:00
smoogipoo
fbb80edde1 Minor cleanups 2018-03-12 13:01:29 +09:00
smoogipoo
46caab6310 Reorder arithmetic operation 2018-03-12 11:56:49 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
Dan Balasescu
dc85067b8c
Merge branch 'master' into mania_mirror 2018-03-12 11:52:38 +09:00
tgi74000
a4dfeff2d7 Renamed ManiaMirrorMod to ManiaModMirror 2018-03-10 08:44:46 +01:00
tgi74000
ed20e31bbe Removed redundant parentheses 2018-03-10 08:39:11 +01:00
Dan Balasescu
ac9de336db
Merge branch 'master' into fix-mania-conversion 2018-03-09 16:09:14 +09:00