Dean Herbert
|
14af957599
|
Merge pull request #4468 from smoogipoo/fix-min-tick-distance
Fix ticks not being generated at the minimum tick distance
|
2019-03-15 12:12:48 +09:00 |
|
Dan Balasescu
|
2c80f73a88
|
Merge branch 'master' into increase-osu-file-validation
|
2019-03-14 18:47:32 +09:00 |
|
smoogipoo
|
71d79f0a39
|
Fix ticks not being generated at the minimum tick distance
|
2019-03-14 15:20:12 +09:00 |
|
smoogipoo
|
2815c3b07c
|
Remove unused variable
|
2019-03-14 15:12:26 +09:00 |
|
Dean Herbert
|
0042cc5337
|
Merge branch 'master' into mod-ramp-hotfix
|
2019-03-14 13:02:29 +09:00 |
|
Dean Herbert
|
85c518f146
|
Change logic to better handle external adjustments
|
2019-03-14 12:29:16 +09:00 |
|
Dean Herbert
|
c40e24739b
|
Fix weird application logic
|
2019-03-13 21:37:33 +09:00 |
|
Dan Balasescu
|
5d23a966d7
|
Fix incorrect application logic for rate fallback
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-03-13 20:55:33 +09:00 |
|
Dean Herbert
|
3d4a80957f
|
Improve comment
|
2019-03-13 18:27:54 +09:00 |
|
Dean Herbert
|
1617e2a729
|
Merge branch 'master' into mania-judgemetns
|
2019-03-13 18:17:42 +09:00 |
|
Dean Herbert
|
8f00f2290a
|
Log issues
|
2019-03-13 14:56:41 +09:00 |
|
Dean Herbert
|
f8b5cf8c8e
|
Add extra clamping of endTime to startTime
|
2019-03-13 13:46:41 +09:00 |
|
Dan Balasescu
|
a35d9ccc09
|
Apply clamping suggestion
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-03-13 12:35:05 +09:00 |
|
Dean Herbert
|
93b774104a
|
Fix NaN handling
|
2019-03-13 11:30:33 +09:00 |
|
Dean Herbert
|
cc09ecbfcf
|
Increase validation performed on .osu files to avoid hard crashes
|
2019-03-12 20:31:15 +09:00 |
|
David Zhao
|
7eb253b687
|
Fix incorrect scale duration
|
2019-03-12 19:44:53 +09:00 |
|
David Zhao
|
3b3b1e51ee
|
Move hit animation logic into virtual method
|
2019-03-12 19:41:33 +09:00 |
|
David Zhao
|
9850122245
|
Fix incorrect delay
|
2019-03-12 19:24:46 +09:00 |
|
David Zhao
|
12f334035f
|
Create properties for use in DrawableManiaJudgement
|
2019-03-12 19:23:24 +09:00 |
|
Dean Herbert
|
a10cd2288d
|
Improve ModRamp's handling of external rate changes
|
2019-03-12 18:15:18 +09:00 |
|
Dean Herbert
|
6832e384a9
|
Simplify DT/HT/NC/DC
|
2019-03-12 18:14:41 +09:00 |
|
Dean Herbert
|
63fea65c0c
|
Clarify repeat index
|
2019-03-11 14:53:21 +09:00 |
|
Dean Herbert
|
489153579a
|
Add xmldoc and clarify struct variables
|
2019-03-11 14:36:29 +09:00 |
|
Dean Herbert
|
2029cf93fd
|
Rename and reuse variables
|
2019-03-11 14:33:21 +09:00 |
|
Dean Herbert
|
c6194d5487
|
Merge branch 'master' into extract-slider-tick-creation
|
2019-03-08 20:40:03 +09:00 |
|
Dean Herbert
|
48e54c84c1
|
Merge branch 'master' into mod-wind
|
2019-03-08 20:23:02 +09:00 |
|
Dean Herbert
|
28a1baa07e
|
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
|
2019-03-08 20:13:58 +09:00 |
|
Dean Herbert
|
93a999396e
|
LegacyFinalTick -> LegacyLastTick to match existing variable
|
2019-03-08 20:13:11 +09:00 |
|
Dean Herbert
|
f59b9e933e
|
Merge branch 'master' into extract-slider-tick-creation
|
2019-03-08 20:00:12 +09:00 |
|
Dean Herbert
|
355705f0a5
|
Fix legacy tick handling
|
2019-03-08 19:57:30 +09:00 |
|
Dean Herbert
|
973f29b765
|
Apply review
|
2019-03-08 15:14:57 +09:00 |
|
Dean Herbert
|
a73e3d9700
|
Move cursor construction to BDL
|
2019-03-08 15:01:45 +09:00 |
|
Dean Herbert
|
2c98ba1c0c
|
Split out consumption and creation into two separate code paths
|
2019-03-08 14:59:45 +09:00 |
|
Dean Herbert
|
3ccc76e18f
|
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
|
2019-03-08 14:50:46 +09:00 |
|
Dan Balasescu
|
d1c18c52ab
|
Merge branch 'master' into fix-cursor-in-scale-container
|
2019-03-08 12:43:57 +09:00 |
|
Dan Balasescu
|
101009c92e
|
Merge branch 'master' into fix-autoplay-tests
|
2019-03-08 12:14:40 +09:00 |
|
Dean Herbert
|
1f44dde96b
|
Fix autoplay tests not working
|
2019-03-07 18:34:56 +09:00 |
|
smoogipoo
|
04d756524d
|
Adjust with shader changes
|
2019-03-07 18:30:18 +09:00 |
|
Dean Herbert
|
62716851a1
|
Revert some unnecessary changes
|
2019-03-06 17:41:54 +09:00 |
|
Dean Herbert
|
7aa30ca3f6
|
Change method of cursor creation
|
2019-03-06 17:41:54 +09:00 |
|
Dean Herbert
|
acf518c208
|
Move cursor inside playfield
|
2019-03-06 17:41:54 +09:00 |
|
Dean Herbert
|
5411c63093
|
Fix menu cursor not displaying outside of gameplay scaling area
|
2019-03-06 17:14:08 +09:00 |
|
Dean Herbert
|
2300e59e91
|
Formatting and simplification
|
2019-03-06 14:19:00 +09:00 |
|
Dean Herbert
|
d70b373af9
|
Merge branch 'master' into mod-wind
|
2019-03-06 14:04:04 +09:00 |
|
Dean Herbert
|
6b042eae94
|
Merge branch 'master' into fix-cursor-in-scale-container
|
2019-03-05 22:22:56 +09:00 |
|
Dean Herbert
|
8a6fa0915e
|
Merge branch 'master' into simplify-gameplay-clock
|
2019-03-05 20:22:46 +09:00 |
|
Dean Herbert
|
558dbafb71
|
Use a safer method of setting the clock
|
2019-03-05 20:14:04 +09:00 |
|
Dean Herbert
|
d5943330b1
|
Fix potential infinite loop
|
2019-03-05 20:06:04 +09:00 |
|
smoogipoo
|
a08086cc8a
|
Fix volume not being considered for file samples
|
2019-03-05 18:21:29 +09:00 |
|
Dean Herbert
|
fc0b297232
|
Fix menu cursor not displaying outside of gameplay scaling area
|
2019-03-05 18:06:24 +09:00 |
|
Dean Herbert
|
9a9b4efb8d
|
Fix excess line
|
2019-03-05 16:41:11 +09:00 |
|
Dean Herbert
|
ec063a13db
|
Update RulesetInputManager to support new clock structure more accurately
|
2019-03-05 16:34:50 +09:00 |
|
Dean Herbert
|
01f1018d02
|
Tidy up clock logic using DI and a GameplayClock
|
2019-03-05 13:37:51 +09:00 |
|
LeNitrous
|
74a23edaf7
|
no longer adjust the clock rate
|
2019-03-04 17:48:51 +08:00 |
|
LeNitrous
|
86e861ddeb
|
update mod descriptions
|
2019-03-04 17:39:13 +08:00 |
|
LeNitrous
|
b83d44c316
|
use ternary operator instead
|
2019-03-03 16:50:31 +08:00 |
|
LeNitrous
|
a1a8246c05
|
trim whitespace
|
2019-03-03 16:30:08 +08:00 |
|
LeNitrous
|
ecc2c28a62
|
mod rule changes
|
2019-03-03 16:22:00 +08:00 |
|
Dean Herbert
|
2dbf7d122c
|
Merge branch 'master' into use-pattern-matching
|
2019-02-28 14:53:07 +09:00 |
|
Dean Herbert
|
e2c6a8bc07
|
Use pattern matching wherever possible
|
2019-02-28 14:35:00 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
c8793911a8
|
Enable more stringent inspectcode style inspections
|
2019-02-27 21:25:40 +09:00 |
|
smoogipoo
|
f66fefb818
|
Adjust comment + accessibility
|
2019-02-27 16:30:10 +09:00 |
|
smoogipoo
|
a07d797d75
|
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
|
2019-02-27 12:08:43 +09:00 |
|
smoogipoo
|
8a943a6e65
|
Fix scores being stored as ints
|
2019-02-26 13:10:59 +09:00 |
|
Dean Herbert
|
90cae0a69c
|
Simplify RulesetInputManager further
|
2019-02-23 15:48:34 +09:00 |
|
Dean Herbert
|
6d3c0e3191
|
Holy sheet
|
2019-02-23 14:39:55 +09:00 |
|
Dean Herbert
|
0c218eb0d5
|
Apply new RulesetInputManager logic
Run UpdateSubTree twice to ensure correctness
|
2019-02-23 14:14:41 +09:00 |
|
smoogipoo
|
d61dfe888e
|
Fix venera fonts not being correctly specified
|
2019-02-22 19:42:09 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09:00 |
|
Dean Herbert
|
2c9e6adfd4
|
Merge branch 'master' into bindable-valuechanged
|
2019-02-22 17:14:05 +09:00 |
|
Dean Herbert
|
f919f2252f
|
Add ToString for Judgements to ease debugging
|
2019-02-22 12:02:54 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
7e41fbc29b
|
Remove LegacyDifficultyCalculator
|
2019-02-21 13:12:37 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
smoogipoo
|
b7b1f0ef0c
|
Merge branch 'remove-populateattributes' into new-diffcalc-mania
|
2019-02-19 17:55:56 +09:00 |
|
smoogipoo
|
4dcf39846d
|
Pass beatmap to CreateSkills()
|
2019-02-19 17:52:59 +09:00 |
|
smoogipoo
|
1efc5179aa
|
Merge branch 'remove-populateattributes' into new-diffcalc-mania
|
2019-02-19 17:46:52 +09:00 |
|
smoogipoo
|
ca8b7f24b4
|
Remove PopulateAttributes()
|
2019-02-19 17:36:33 +09:00 |
|
smoogipoo
|
8104c45c25
|
Merge remote-tracking branch 'origin/master' into new-diffcalc-mania
# Conflicts:
# osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs
|
2019-02-19 16:30:05 +09:00 |
|
Dean Herbert
|
151388dfad
|
Merge branch 'master' into diffcalc-merging-2
|
2019-02-19 15:42:15 +09:00 |
|
smoogipoo
|
7ed461aa8c
|
XMLDoc DifficultyHitObject
|
2019-02-19 14:30:59 +09:00 |
|
smoogipoo
|
93b7b51d0a
|
timeRate -> clockRate
|
2019-02-19 14:29:23 +09:00 |
|
smoogipoo
|
3784b673ae
|
History -> LimitedCapacityStack + re-xmldoc
|
2019-02-19 13:51:19 +09:00 |
|
smoogipoo
|
af0bb4d5e8
|
Remove mods from constructor
|
2019-02-19 13:40:39 +09:00 |
|
Dean Herbert
|
133c002d02
|
Fix test dlls being loaded as actual rulesets (and failing)
|
2019-02-19 12:13:55 +09:00 |
|
Dan Balasescu
|
c9c8cccd68
|
Merge branch 'master' into use-lifetime-optimization
|
2019-02-18 15:22:34 +09:00 |
|
smoogipoo
|
9cce9ce97c
|
Consider aggregate peaks
|
2019-02-18 15:00:32 +09:00 |
|
smoogipoo
|
a8faa942a6
|
Implement new difficulty calculator structure
|
2019-02-18 14:49:43 +09:00 |
|
Dean Herbert
|
e2e615cc5c
|
Merge branch 'master' into leased-bindables-dont-work
|
2019-02-11 16:30:12 +09:00 |
|
Dean Herbert
|
2d7c23dd9f
|
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
|
2019-02-04 12:15:53 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
ekrctb
|
8955d5de04
|
Update hit object result when lifetime is end
|
2019-01-29 15:25:27 +09:00 |
|
ekrctb
|
504e79b968
|
Merge branch 'master' into use-lifetime-optimization
|
2019-01-29 12:15:02 +09:00 |
|
LeNitrous
|
03e57d0423
|
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
|
2019-01-26 20:15:19 +08:00 |
|