1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 08:42:55 +08:00
Commit Graph

564 Commits

Author SHA1 Message Date
Ivan Pavluk
36b458bdee Fixed #3777 2018-11-29 08:56:19 +07:00
smoogipoo
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
08ffa18936 Fix nullref 2018-11-19 17:05:51 +09:00
Dean Herbert
a57f98ed4d
Merge branch 'master' into fix-taiko-lifetimes 2018-11-19 08:41:19 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
smoogipoo
e207dd728b Fix taiko proxies not receiving the correct lifetimes 2018-11-15 20:26:12 +09:00
jorolf
f0f7b15edc
remove unused using 2018-11-15 00:45:27 +01:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
jorolf
023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo
a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
smoogipoo
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
Dean Herbert
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds 2018-10-12 18:25:24 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00
smoogipoo
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup 2018-10-02 09:37:04 +09:00
smoogipoo
08bd363827 Adjust taiko scrolling speed 2018-10-01 18:15:55 +09:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc Move judgement text to internal container 2018-09-30 04:01:33 -04:00
smoogipoo
3479bfa409 Rename variable 2018-09-28 17:18:34 +09:00
smoogipoo
5f61faa2d9 Fix multiple hits in the same frame pressing multiple hitobjects 2018-09-25 18:37:25 +09:00
smoogipoo
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
Hanamuke
309d8c8cb4 CI 2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
smoogipoo
2bc827fa0c Fix taiko beatmap conversion attempting to make strong swells 2018-08-22 11:32:00 +09:00
smoogipoo
7c3556baf8 Throw exception when Swell.IsStrong is set 2018-08-15 09:12:29 +09:00
smoogipoo
8be5a606bf Fix swells possibly being strong hitobjects 2018-08-14 18:33:07 +09:00
smoogipoo
b045f5c9b6 Adjust filename 2018-08-14 14:32:06 +09:00
smoogipoo
1a35506386 Cleanup strong hit construction 2018-08-14 14:29:49 +09:00
smoogipoo
732dfde8ed DrawableStrongHandler -> DrawableNestedStrongHit 2018-08-14 14:28:40 +09:00
smoogipoo
7971d06df1 Remove AlwaysPresent 2018-08-14 14:27:47 +09:00
smoogipoo
5c4c2dff09 Fix strong hits not being visualised 2018-08-06 13:01:27 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo
3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
smoogipoo
38263714a1 Cleanups 2018-08-03 16:56:46 +09:00
smoogipoo
412e4ff681 Fix display of swells 2018-08-03 16:49:24 +09:00
smoogipoo
e6775c7a16 Fix playfield display 2018-08-03 16:46:03 +09:00
smoogipoo
19c541dbf5 Migrate swells to use nested hitobjects for ticks 2018-08-03 16:35:29 +09:00
smoogipoo
e8a140930e Migrate drum roll to use nested hitobjects for strong hits 2018-08-03 16:35:12 +09:00
smoogipoo
4494853446 Migrate DrawableDrumRoll to use a nested hitobject for strong hits 2018-08-03 16:20:08 +09:00
smoogipoo
fdf889359f Migrate DrawableHit to use a nested hitobject for strong hits 2018-08-03 16:19:37 +09:00
smoogipoo
2dff04392e Re-implement strong judgements via hitobject 2018-08-03 16:12:12 +09:00
smoogipoo
fa3c919e2e Fix up taiko judgement creation 2018-08-03 16:11:38 +09:00
smoogipoo
0da6c8c1a7 Remove unnecessary local variables 2018-08-02 22:20:07 +09:00
smoogipoo
a0887a600f Fix swells showing hit circles on intermediate judgements 2018-08-02 21:08:06 +09:00
smoogipoo
35b4ab5456 Introduce the concept of a "MainResult" 2018-08-02 21:07:40 +09:00
smoogipoo
9c2122c0ca Make Rulesets.Taiko use the new judgement result structure 2018-08-02 20:36:19 +09:00
smoogipoo
1b7b6f341c Migrate Rulesets.Taiko to the new judgement system 2018-08-02 16:09:04 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
ekrctb
c6816a6cf3 Fix potential quadratic complexity in taiko autoplay 2018-07-17 17:00:28 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
9f933187e9 Apply review feedback 2018-07-17 16:33:08 +09:00
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Roman Kapustin
2a72062c33 Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part. 2018-06-26 00:53:31 +03:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes 2018-06-25 19:53:22 +09:00
Dean Herbert
d4d9d20147
Merge branch 'master' into fix-taiko-rewind 2018-06-25 18:08:27 +09:00
Dean Herbert
5e6634cd00
Merge branch 'master' into fix-taiko-rewind 2018-06-25 17:10:53 +09:00
Dean Herbert
d7133f059d Fix incorrect implementation 2018-06-25 16:53:12 +09:00
Dean Herbert
63448dc9dc
Merge branch 'master' into master 2018-06-25 16:33:08 +09:00
smoogipoo
185789bc7f Remove unused variable 2018-06-25 16:13:15 +09:00
Dan Balasescu
26d9e3cc10
Merge branch 'master' into fix-taiko-rewind 2018-06-25 16:08:52 +09:00
smoogipoo
70e9f7cb8d Always proxy taiko hits when hit 2018-06-25 15:55:09 +09:00
nl-tatatat
09b2025fad
Update TaikoRulesetContainer.cs
Remove code that I am almost 100% sure that makes barlines every 1/1 instead of 4/1.
2018-06-24 04:48:38 -05:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
566d125658 Change order of default initialisation to look better in settings 2018-06-21 14:28:40 +09:00
smoogipoo
48989df6eb Make sure that 0 SR is returned when there are no hitobjects 2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes 2018-06-21 09:26:50 +09:00
Tom Arrow
d753df65a5 Remove default bindings for right actions 2018-06-19 18:04:53 +02:00
Dean Herbert
5b344525e1 Move proxy state check to base class 2018-06-18 00:27:18 +09:00
smoogipoo
4575319102 Privatise the proxied content 2018-06-17 17:56:46 +09:00
smoogipoo
99ef44eca2 Merge remote-tracking branch 'origin/master' into fix-taiko-proxies 2018-06-17 17:54:50 +09:00
Dean Herbert
f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes 2018-06-15 18:29:20 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +09:00
Dean Herbert
30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions 2018-06-15 17:52:53 +09:00
smoogipoo
01dd2d7919 Move taiko difficulty attributes to TaikoDifficultyCalculator 2018-06-14 16:26:51 +09:00
smoogipoo
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo
33c7ce1bec Adjust TaikoDifficultyCalculator in-line with changes 2018-06-14 15:47:42 +09:00
Joehu
b182635aae Fix taiko nightcore regression 2018-06-12 20:21:37 -07:00
smoogipoo
0f9c05d1e6 Fix taiko swells not properly rewinding 2018-06-11 22:32:08 +09:00
Dan Balasescu
1b12820de9
Restore a removed comment 2018-06-11 21:54:11 +09:00
smoogipoo
22dfe46572 Make taiko hitobject properly unproxy when rewound 2018-06-11 21:46:45 +09:00
smoogipoo
b6fb01440b Fix taiko hit states not being reverted on rewind 2018-06-11 20:44:26 +09:00
smoogipoo
8f3215f5a0 Make sure taiko hitexplosions expire and get removed 2018-06-11 20:42:04 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +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
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
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
Dean Herbert
14d67e0b1e
Merge branch 'master' into fix-taiko-slider-multiplier 2018-05-18 11:39:24 +09:00
smoogipoo
3091d3a014 Implement the taiko performance calculator 2018-05-17 17:56:44 +09:00
smoogipoo
450d54eea9 Fix taiko difficulty calculator never considering mods 2018-05-17 17:56:37 +09:00
smoogipoo
b9ed976954 Fix taiko slider multiplier being applied twice 2018-05-17 14:44:30 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
smoogipoo
397d93660a Don't deep-clone beatmapinfo/control points 2018-05-17 13:17:33 +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
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows 2018-05-15 17:33:27 +09:00
smoogipoo
7d027098ec Fix drumroll completions always giving GREAT judgements
Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.
2018-05-14 14:13:07 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +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
accffda532 Add taiko statistics 2018-05-07 15:51:08 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +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
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked 2018-03-30 16:35:00 +09:00
Joseph Madamba
0887dafa2c Revert changes on hard rock mod 2018-03-29 20:36:52 -07:00
smoogipoo
187a025d36 Make hitobjects sorted by their start times 2018-03-29 16:07:31 +09: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
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