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

37829 Commits

Author SHA1 Message Date
Dean Herbert
35dd1c68aa Fix drag/selection events not propagating correctly to TimelineBlueprintContainer when before time zero 2021-04-06 14:34:16 +09:00
Dean Herbert
8ff13845d1 Add marker showing where 00:00:000 is 2021-04-06 14:24:22 +09:00
Dean Herbert
784552022f
Merge pull request #12303 from smoogipoo/fix-last-control-point-segmenting
Make last control point not able to make an implicit segment
2021-04-06 13:35:55 +09:00
Dan Balasescu
c228192949
Merge pull request #11690 from Syriiin/diffcalc/refactor-strain-skill
Refactor to abstract out strain logic into StrainSkill class
2021-04-06 08:56:59 +09:00
Dan Balasescu
9d8a26f373
Merge branch 'master' into diffcalc/refactor-strain-skill 2021-04-06 08:21:38 +09:00
Samuel Cattini-Schultz
5bdd15f746 Refactor Skill.Process() to not require calling base.Process() 2021-04-05 22:14:59 +10:00
Samuel Cattini-Schultz
57983ae61f Fix whitespace 2021-04-05 22:14:59 +10:00
Dan Balasescu
5e427b4384
Merge pull request #12304 from peppy/android-linker-disable
Disable sdk linker for android debug releases
2021-04-05 20:11:53 +09:00
smoogipoo
d0510222ae Fix legacy beatmap encoding 2021-04-05 19:59:54 +09:00
Dean Herbert
eee3d83ed2 Disable sdk linker for android debug releases
Aimed to improve build time (especially for CI builds).

The additional lines come from visual studio. I'm intentionally
committing its output so it doesn't cause a diff on further csproj
changes.
2021-04-05 19:36:38 +09:00
smoogipoo
a3faf0a28e Increment start time 2021-04-05 18:07:07 +09:00
smoogipoo
4b29d0ebe2 Fix last control point starting new segment 2021-04-05 17:49:36 +09:00
smoogipoo
42e816fcae Add failing tests 2021-04-05 17:48:29 +09:00
Dean Herbert
6bcbef9f25
Merge pull request #12294 from smoogipoo/mania-scoring-adjustments
Adjust scoring values to better fit osu!mania expectations
2021-04-05 17:19:28 +09:00
Dean Herbert
78759ceb6c
Update link to templates 2021-04-05 16:06:31 +09:00
Dean Herbert
d33e2b9d3c
Merge pull request #12295 from smoogipoo/ruleset-templates
Merge ruleset templates into main repository
2021-04-05 16:05:08 +09:00
smoogipoo
85e1bc85bf Update DotSettings and .editorconfig 2021-04-05 15:21:53 +09:00
Dan Balasescu
97820e0ea5
Merge branch 'master' into diffcalc/refactor-strain-skill 2021-04-05 15:09:52 +09:00
Dan Balasescu
f51bd10e2d
Merge pull request #11689 from Syriiin/diffcalc/refactor-strain-logic
Refactor to encapsulate strain logic into Skill class
2021-04-05 15:09:34 +09:00
smoogipoo
d3f61b4aab Remove templates project from sln 2021-04-05 14:42:15 +09:00
smoogipoo
0f171f092f Add template projects to desktop slnf 2021-04-05 14:24:47 +09:00
Dan Balasescu
5bf0889379
Merge branch 'master' into diffcalc/refactor-strain-logic 2021-04-05 14:16:34 +09:00
smoogipoo
fe9efc277d Rename README header 2021-04-05 13:56:04 +09:00
smoogipoo
3acc612a67 Adjust scoring values to better fit osu!mania 2021-04-05 13:28:46 +09:00
smoogipoo
b6681d01e5 Add appveyor matrix 2021-04-05 12:23:34 +09:00
smoogipoo
73c59c4e1b Fix ruleset templates not being included 2021-04-05 12:23:03 +09:00
smoogipoo
33d16a4b54 Isolate rulesets subtree 2021-04-05 12:22:38 +09:00
smoogipoo
4d9b886c07 Add ruleset examples to solution 2021-04-05 12:04:02 +09:00
smoogipoo
d1504e1b3e Remove license file, fix link 2021-04-05 11:47:37 +09:00
smoogipoo
3c3980b6bf Update links 2021-04-05 11:41:48 +09:00
smoogipoo
37f8b62200 Add ruleset templates structure 2021-04-05 11:41:40 +09:00
Bartłomiej Dach
47c0e672d6
Merge pull request #12290 from MiraiSubject/ipc-incorrect-read 2021-04-04 15:39:02 +02:00
Dean Herbert
879b1ab046 Avoid unnecessary casts 2021-04-04 21:58:27 +09:00
Shivam
4ee8224f8b change naming to be less confusing 2021-04-04 14:31:08 +02:00
Shivam
5f1f8ec0ef Fix IPC Source getting read from the incorrect location 2021-04-04 14:10:07 +02:00
Dean Herbert
f95b91e3b6
Merge pull request #12284 from bdach/fix-scores-initially-showing
Fix scores being initially visible incorrectly in gameplay screen
2021-04-04 19:30:32 +09:00
Bartłomiej Dach
5df27ce3d4 Split out score transform logic to method 2021-04-04 11:44:39 +02:00
Dean Herbert
288e9d29e1
Merge pull request #12285 from PercyDan54/fix-score-crash
Fix crash when right clicking online score
2021-04-04 15:00:05 +09:00
PercyDan54
d4724f4494
Fix crash 2021-04-04 09:44:45 +08:00
Bartłomiej Dach
0febefd8eb Fix scores fading out on entering gameplay screen 2021-04-03 22:35:36 +02:00
Bartłomiej Dach
0d9793797f Fix scores being initially visible incorrectly in gameplay screen 2021-04-03 22:24:30 +02:00
Bartłomiej Dach
eb26f6f427 Add failing test case 2021-04-03 21:45:19 +02:00
Dean Herbert
4603c81086
Merge pull request #12280 from bdach/fix-editor-arrow-seek-snapping
Fix editor arrow seek snapping not updating after control point changes
2021-04-03 21:53:23 +09:00
Bartłomiej Dach
4df7ff21c7 Fix editor arrow seek snapping not updating after control point changes
The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
2021-04-03 14:02:46 +02:00
Bartłomiej Dach
b66ba43bc5 Add failing test scene 2021-04-03 14:02:46 +02:00
Bartłomiej Dach
1e1c07ced1
Merge pull request #12279 from bdach/fix-editor-clock-test-interference
Fix editor clock test scene not re-enabling beatmap
2021-04-03 13:32:56 +02:00
Bartłomiej Dach
7d4b0e3f0a Fix editor clock scene not re-enabling beatmap
Could interfere with other tests due to causing crashes on attempts to
change `Beatmap.Value`.
2021-04-03 12:34:48 +02:00
Samuel Cattini-Schultz
85d2b1232a Refactor to abstract out strain logic into StrainSkill class
While it is the case for the existing official Skills, Skill implementations shouldn't be required to conform to a strain based approach.
There are other valid approaches to calculating skill difficulty that can be supported by abstracting the strain logic into its own StrainSkill class.
2021-04-03 20:52:39 +11:00
Samuel Cattini-Schultz
5b2dcea8a8 Refactor to encapsulate strain logic into Skill class
As strains are an implementation detail of the current Skill calculations, it makes sense that strain related logic should be encapsulated within the Skill class.
2021-04-03 20:47:43 +11:00
Dean Herbert
eb1e850f99
Merge pull request #12254 from smoogipoo/spectator-refactor
Move frame-handling spectator logic into abstract base class
2021-04-03 17:23:33 +09:00