1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:07:52 +08:00
Commit Graph

668 Commits

Author SHA1 Message Date
smoogipoo
cf08293be1 Remove extra newline 2018-05-15 21:49:44 +09:00
smoogipoo
4101b8ddde Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements 2018-05-15 21:31:58 +09:00
smoogipoo
22f3bee55a Fix incorrect iteration over difficulty sections 2018-05-15 21:26:06 +09:00
smoogipoo
bc197a88e1 Fix slider length calculation including slider head 2018-05-15 21:25:33 +09:00
smoogipoo
1b5c151e0e Fix DeltaTime being capped incorrectly 2018-05-15 21:25:02 +09:00
smoogipoo
49c36787d7 Remove triangle pattern and remove not-implemented reading strain 2018-05-15 21:24:41 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
smoogipoo
9fd972e0a3 Rename OsuDifficulty -> Difficulty 2018-05-15 17:36:29 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows 2018-05-15 17:33:27 +09:00
smoogipoo
10e2f74538 Port osu-performance HD AR fix 2018-05-15 11:53:11 +09:00
smoogipoo
a81921118d Strip whitespaces 2018-05-14 11:54:11 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
ce6b4cc2d3 Add more attributes to OsuPerformanceCalculator's output 2018-05-14 11:15:37 +09:00
smoogipoo
e1b8a1589b Fix TimeRate not being considered for performance calculation 2018-05-14 11:15:14 +09:00
Dean Herbert
f6df704deb
Merge branch 'master' into diffcalc-fixes 2018-05-12 22:16:20 +09:00
smoogipoo
416ed72597 Port osu-performance changes into OsuPerformanceCalculator 2018-05-12 15:46:25 +09:00
smoogipoo
a337248999 Fix incorrect count 2018-05-11 22:06:16 +09:00
smoogipoo
224f1a0810 Fix incorrect osu! difficulty calculator combo count 2018-05-11 21:49:16 +09:00
smoogipoo
faa82f17cc Pass original hitobject HitWindows during conversion 2018-05-11 15:30:50 +09:00
smoogipoo
251bdfdee8 Simplify statistics in osu ruleset 2018-05-07 15:51:08 +09:00
smoogipoo
5f74dc2c17 Simplify osu-ruleset statistics 2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo
268c14813b Fix resharper warnings 2018-05-07 11:38:41 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
smoogipoo
0dce7a5b61 Update framework + fix CI errors 2018-04-20 18:19:17 +09:00
smoogipoo
c9e4a07e12 Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
2018-04-20 18:04:43 +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
smoogipoo
cea3e1c7f5 Remove now unnecessary approachcircle proxy disables
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update 2018-04-06 20:16:13 +09:00
Dean Herbert
acbdbcc3df Update AssemblyInfo in line with framework changes 2018-04-06 13:17:26 +09:00
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite 2018-04-04 20:47:36 +09:00
Dean Herbert
b7325d73e8 Don't inherit VisbilityContainer 2018-04-04 20:44:11 +09:00
smoogipoo
d4cb00e08f Don't display judgements in OsuEditPlayfield 2018-04-04 17:12:41 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite 2018-04-04 15:38:27 +09:00
Dean Herbert
ddba7254ca Merge remote-tracking branch 'upstream/master' into linq 2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite 2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix 2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite 2018-04-03 03:05:42 +09:00
Dan Balasescu
d7b61b3c09
Merge branch 'master' into Small-Clean-Up 2018-04-02 14:13:15 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08: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