h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 03:52:55 +08:00
Code Issues Releases Wiki Activity
14,431 Commits 3 Branches 657 Tags 357 MiB
a113cf4118
Commit Graph

414 Commits

Author SHA1 Message Date
smoogipoo
9314f49bc3 Expose the catch width from the Catcher 2018-06-21 12:57:59 +09:00
smoogipoo
5d0c847835 Fix post-merge errors 2018-06-21 12:26:21 +09:00
smoogipoo
c9581a2d56 Merge remote-tracking branch 'origin/master' into catch_star_rating 
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
#	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
 2018-06-21 12:15:25 +09:00
ekrctb
9194fd8dfe don't expose HyperDashModifier directly 2018-06-20 20:08:27 +09:00
ekrctb
79c5596b27 Merge remote-tracking branch 'origin/master' into catch-stable-hyper 2018-06-20 19:06:54 +09:00
ekrctb
516b1c5495 Fix droplet position clamping 2018-06-20 18:29:23 +09:00
ekrctb
9d7e5b4920 Clamp juice stream position 2018-06-20 17:23:55 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +09:00
Dan Balasescu
0ba80fad60
Merge branch 'master' into droplets-should-bounce 2018-06-15 17:34:54 +09:00
Dean Herbert
149d94116b Fix droplets not bouncing off catcher's plate immediately 2018-06-15 15:44:47 +09:00
Dean Herbert
2ff7b4cdcf
Merge branch 'master' into catch-droplet-fix 2018-06-15 14:34:01 +09:00
smoogipoo
e840083ab4 Oops fix incorrectly changed file 2018-06-14 21:38:08 +09:00
smoogipoo
31bd59442f Remove banana positioning comment 2018-06-14 21:38:08 +09:00
smoogipoo
6867a398ca Add one more test case 2018-06-14 21:38:08 +09:00
smoogipoo
ced4e61b54 Adjust expected output with spinner changes 2018-06-14 21:38:08 +09:00
smoogipoo
e1f5498924 Discarding 3 times is correct 2018-06-14 21:38:08 +09:00
smoogipoo
250e8645e1 finalisePosition -> applyPositionOffsets 2018-06-14 21:38:08 +09:00
smoogipoo
9b403b0053 Fix non-catch beatmaps not getting properly converted 
Because Osu.ConvertSpinner implements IHasXPosition.
 2018-06-14 21:38:08 +09:00
smoogipoo
a97a7e13bd Rework RNG discarding comment 2018-06-14 21:38:08 +09:00
smoogipoo
cafdbc2d25 Fix discarding too many RNG values, and add test 2018-06-14 21:38:08 +09:00
Dean Herbert
c41a50bf24 Fix combos ending with JuiceStreams never leaving the catcher's plate 
Closes #2634.
 2018-06-14 16:39:31 +09:00
smoogipoo
6ff06d4757 Adjust CatchDifficultyCalculator in-line with changes 2018-06-14 15:48:56 +09:00
Dan Balasescu
cbb883614a
Merge branch 'master' into catch-droplet-fix 2018-06-13 15:18:52 +09:00
clayton
785c24b11b
Check for null CatchJudgement 2018-06-11 13:30:30 -07:00
clayton
d3ada7914c
Fix condition for dropping health on miss 2018-06-11 13:29:36 -07:00
clayton
e44e08201b
Remove unnecessary usings and move Banana out of BananaShower 2018-06-11 12:43:01 -07:00
clayton
3e6e2ac09a
Add CatchBananaShowerJudgements in simulated autoplays 2018-06-09 18:23:05 -07:00
Crusensis
fbc0cd6f5f Split AffectsCombo into IsBonus 2018-06-09 18:14:33 -07:00
clayton
808118e4d4
Add health drain to catch 2018-06-09 17:39:17 -07:00
clayton
f486bcfee1
Add judgements to catch 2018-06-09 17:38:17 -07: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
ekrctb
25d3f0ead1 Revert TestCaseCatcherArea 2018-06-03 15:31:51 +09:00
ekrctb
9f27dd848a HyperDashModifier >= 1 2018-06-03 15:29:56 +09:00
ekrctb
dd7d54bcc7 Merge remote-tracking branch 'origin/master' into catch-stable-hyper 2018-06-02 18:42:40 +09:00
Dean Herbert
b7511251d9 Remove pointless FillMode specification 2018-05-31 12:50:01 +09:00
Dan Balasescu
9924ec9606
Merge branch 'master' into catch-sizing-fixes 2018-05-31 12:31:52 +09:00
ekrctb
0b7fdd4e8d Merge branch 'master' into catch-stable-hyper 2018-05-29 18:52:09 +09:00
Dean Herbert
8b2a6b8cce Fix formatting 2018-05-26 12:38:33 +09:00
ekrctb
456dc81f2f Fix InspectCode issues 2018-05-25 19:18:11 +09:00
ekrctb
26c6313dec catch: the fruit positions are finalized on the post process 2018-05-25 19:11:29 +09:00
ekrctb
8c8e87ed7a Make FastRandom public 2018-05-25 18:57:59 +09:00
ekrctb
ca2c209701 add FastRandom 2018-05-25 18:57:46 +09:00
Dean Herbert
f5ab93a712 Make all drawable fruit absolute values easily scalable 2018-05-25 17:37:52 +09:00
Dean Herbert
3fe25fe67d Fix catcher sizing to (roughly) match stable 2018-05-25 17:33:53 +09:00
Dean Herbert
5e4f83b80b Add more correct catch playfield sizing 2018-05-25 17:33:27 +09:00
ekrctb
be323c7147 Fix InspectCode issues. 2018-05-25 02:14:56 +09:00
ekrctb
38e5e35743 modify catch hyperdash behavior 2018-05-25 01:20:05 +09:00
frankhjwx
fda7025ac3 Re-order positionData judgement for correct banana creation 2018-05-23 13:47:33 +08:00
frankhjwx
4784538d73 Fixing minor bugs 2018-05-21 13:53:48 +08:00
frankhjwx
193a298601 Fixing minor bugs 2018-05-21 13:36:57 +08:00
frankhjwx
6d71f7f220 Minor fixes 2018-05-21 13:35:02 +08:00
frankhjwx
2e5bc4323a Fixing null reference exception bugs 2018-05-21 13:31:00 +08:00
frankhjwx
871743204b Fixing parameters naming 2018-05-21 10:41:58 +08:00
frankhjwx
68a929eb0c Fixing parameters naming 2018-05-21 10:39:16 +08:00
frankhjwx
886be8ce1f Adding lisence header 2018-05-21 10:16:32 +08:00
frankhjwx
0405383e4e Fixing code style 2018-05-21 10:12:18 +08:00
frankhjwx
44fd4b95bd We need DistanceToHyperDash for star rating calculation 2018-05-21 09:58:46 +08:00
frankhjwx
0ef718a09e Fixes on categoryDifficulty 2018-05-21 09:55:07 +08:00
frankhjwx
6bf5ea73d5 Fix CatcherWidth 2018-05-21 09:53:20 +08:00
frankhjwx
79c64d16e4 Realization on Catch Star Rating 2018-05-21 09:49:23 +08: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
97a523584d Make HitWindows not return null by default 2018-05-11 15:52:51 +09:00
smoogipoo
7eb64ab590 Remove object counts from mania/taiko/catch 2018-05-07 15:51:08 +09:00
smoogipoo
b9e4b59e46 Actually construct catch beatmaps 2018-05-07 15:51:08 +09:00
smoogipoo
8a4717d2e9 Add catch 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
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
Dean Herbert
d307b8dc2e Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling 2018-04-18 16:46:02 +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
tgi74000
82d9504cbf Changed relative position to [0, 1] 2018-04-09 09:02:32 +02:00
tgi74000
b40af0848f White space 2018-04-08 15:52:40 +02:00
tgi74000
58dbc63c6e Add HardRock position mangling for CatchTheBeat 2018-04-08 15:24:34 +02:00
Dean Herbert
acbdbcc3df Update AssemblyInfo in line with framework changes 2018-04-06 13:17:26 +09:00
smoogipoo
364c3bca06 Fix osu!catch autoplay missing starts/ends of JuiceStreams 
Fixes #2328.

Would only happen when ticks and ends were spaced too far apart (or there were no ticks in a juicestream).
 2018-04-04 16:24:03 +09:00
smoogipoo
551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +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
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +09:00
Dean Herbert
7bdca0ff39 Merge remote-tracking branch 'upstream/master' into accent-colour-properties 2018-03-22 15:07:28 +09:00