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 |
|
ekrctb
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +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 |
|
Dan Balasescu
|
77e03a59a9
|
Merge branch 'master' into ruleset-container
|
2018-06-19 21:47:10 +09:00 |
|
Tom Arrow
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
Dan Balasescu
|
0b1b3319aa
|
Merge branch 'master' into update-framework
|
2018-06-19 20:57:19 +09:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
Tom Arrow
|
4aa89de2d7
|
Fix reverse arrow displayed with incorrect angle
|
2018-06-18 17:22:01 +02:00 |
|
smoogipoo
|
41abd5990c
|
Move osu! difficulty attributes to OsuDifficultyCalculator
|
2018-06-14 16:27:05 +09:00 |
|
smoogipoo
|
af218b3d8d
|
No need to use properties
|
2018-06-14 16:13:21 +09:00 |
|
smoogipoo
|
8f7334874c
|
Fix up performance calculators
|
2018-06-14 16:04:48 +09:00 |
|
smoogipoo
|
47fc18d7c4
|
Adjust OsuDifficultyCalculator in-line with changes
|
2018-06-14 15:45:16 +09:00 |
|
Dean Herbert
|
f4cb0d7d8d
|
Fix memory leak due to incorrect binding
|
2018-06-13 14:16:58 +09:00 |
|
Dean Herbert
|
ae136e89a4
|
Merge branch 'master' into ruleset-configs
|
2018-06-12 13:13:18 +09:00 |
|
Dan Balasescu
|
9994c69d58
|
Merge branch 'master' into fix-object-ordering
|
2018-06-11 17:53:33 +09:00 |
|
smoogipoo
|
f4fbf27d42
|
Give ruleset settings a ruleset-specific config manager
|
2018-06-11 13:28:50 +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
|
ff60f69f47
|
Explicitly construct local beatmaps rather than using GetBoundCopy
|
2018-06-06 20:19:30 +09:00 |
|
smoogipoo
|
72cc53aded
|
Rename GameBeatmap -> BindableBeatmap
|
2018-06-06 20:16:20 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +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 |
|
Dean Herbert
|
f253828d49
|
Fix regressions
|
2018-06-06 13:51:51 +09:00 |
|
Dean Herbert
|
ee92986494
|
Merge branch 'master' into osu-hd-setting
|
2018-06-06 12:09:12 +09:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +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
|
a3470f9ec3
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
|
2018-05-28 18:01:15 +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 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
Dean Herbert
|
cea935ea40
|
Merge branch 'master' into osu-hd-setting
|
2018-05-21 15:21:09 +09:00 |
|
smoogipoo
|
1f37dca7b7
|
Fix HR / EZ being applied twice to AR
|
2018-05-19 14:47:06 +09:00 |
|
Dean Herbert
|
8e784d9104
|
Merge branch 'master' into fix-conversion-hitwindows
|
2018-05-18 11:59:16 +09:00 |
|
Vidalee
|
6a1abf4084
|
Merge branch 'master' into osu-hd-setting
|
2018-05-17 19:39:17 +02:00 |
|
smoogipoo
|
eba1d309b6
|
Fix incorrect namespace of OsuPerformanceCalculator
|
2018-05-17 16:58:22 +09:00 |
|
smoogipoo
|
f67d263596
|
Move ruleset-specific hitwindows to post-converted hitobjects
|
2018-05-17 13:35:15 +09:00 |
|
smoogipoo
|
c1d9fcc140
|
Make OsuPerformanceCalculator use the new hitresult namings
|
2018-05-16 12:46:31 +09:00 |
|
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 |
|
Vidalee
|
16bcd6c3ed
|
Appvtests (#1)
* Resolving AppVeyor's errors
|
2018-05-08 14:33:26 +02: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 |
|
Vidalee
|
393c01ba90
|
Made the changes requested
|
2018-05-06 12:38:25 +02:00 |
|
Dean Herbert
|
76e58a51b9
|
Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
|
2018-04-25 17:28:21 +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 |
|
Joseph Madamba
|
ee14ca7cc5
|
Merge branch 'master' into score-multiplier-edits
|
2018-03-31 10:43:58 -07:00 |
|
Dan Balasescu
|
824201336a
|
Merge branch 'master' into hr-on-mania-is-unranked
|
2018-03-30 16:35:00 +09:00 |
|
smoogipoo
|
4ad776bfde
|
Make slider circle masks not handle mouse input at all
|
2018-03-30 14:15:46 +09:00 |
|
Joseph Madamba
|
0887dafa2c
|
Revert changes on hard rock mod
|
2018-03-29 20:36:52 -07:00 |
|
Dean Herbert
|
e1123c5a95
|
Merge branch 'master' into selectionlayer-rewrite
|
2018-03-30 12:29:58 +09:00 |
|