1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 02:37:25 +08:00
Commit Graph

59202 Commits

Author SHA1 Message Date
Bartłomiej Dach
73f53328cf
Merge branch 'master' into argon-kiai 2023-01-25 22:21:26 +01:00
Bartłomiej Dach
004f20d739
Merge pull request #22404 from peppy/argon-hit-lighting-peppy-take
Add support for disabling "hit lighting" with osu! argon skin
2023-01-25 22:19:59 +01:00
Bartłomiej Dach
3daa9e6295
Merge branch 'master' into argon-hit-lighting-peppy-take 2023-01-25 21:44:43 +01:00
Bartłomiej Dach
65c3303bbe
Merge pull request #22391 from peppy/fix-disappearing-argon-circles-editor
Fix argon hit circles occasionally going missing during editor seeking
2023-01-25 21:42:32 +01:00
Bartłomiej Dach
34aa8b872e
Mention stable weirdness next to constant 2023-01-25 19:02:38 +01:00
Bartłomiej Dach
fd495e87f7
Fix GetAsync() not limiting texture dimensions 2023-01-25 19:02:35 +01:00
EXtremeExploit
fc968d1d89
del extra newline 2023-01-25 14:38:02 -03:00
EXtremeExploit
a4a94cb96e
Add movement to misses in osu ruleset 2023-01-25 14:34:00 -03:00
EXtremeExploit
0eaebfd40a
Use Alpha instead of opacity on bg color 2023-01-25 10:22:42 -03:00
Dean Herbert
48d68b0f4f Add very basic kiai flash to argon hit circles 2023-01-25 18:59:26 +09:00
Andrei Zavatski
1485a6e006 Make masking false by default 2023-01-25 12:54:30 +03:00
Dean Herbert
78cfe2f547 Fix hit circle kiai test scene not always working as expected 2023-01-25 18:46:52 +09:00
Andrei Zavatski
d09d6f31d7 Implement Masking property for TrianglesBackground 2023-01-25 12:20:51 +03:00
Dean Herbert
e3a5c233e9 Update test to use newer assetion logic 2023-01-25 17:39:35 +09:00
Dean Herbert
f0406c34fd Merge branch 'master' into revert-result-in-playfield 2023-01-25 17:35:33 +09:00
Dean Herbert
efe57f29e0
Merge pull request #22382 from JDECOMBE/beatmapSelectionBlur
Add ability to disable background blur at song select
2023-01-25 17:34:35 +09:00
Dean Herbert
67e9de43be
Merge pull request #22386 from EVAST9919/triangles-og-shhader
Use `TriangleBorder` shader in `Triangles` background
2023-01-25 17:25:18 +09:00
Dean Herbert
d15f8c2f3a Fix beatmaps with multiple osb files potentially reading the storyboard from the wrong one
In stable, the storyboard filename is fixed. In lazer, we were always
looking for the first `.osb` in the database. In the case a beatmap
archive housed more than one `.osb` files, this may load the incorrect
one.

Using `GetDisplayString` here feels like it could potentially go wrong
in the future, so I'm open to hard-coding this locally (or using string
manipulation to remove the ` [creator_name]` portion of the beatmap's
filename). Open to opinions on that.

Fixes storyboard playback in https://osu.ppy.sh/beatmapsets/1913687#osu/3947758
2023-01-25 17:11:15 +09:00
Dean Herbert
5c888e0c68
Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:37:19 +09:00
Dean Herbert
59ee6922b1
Merge pull request #22399 from bdach/user-profile/update-cover
Update appearance of profile cover area to match web
2023-01-25 16:35:44 +09:00
Dean Herbert
01e280eb6b Add classic default for song select blur setting 2023-01-25 16:32:00 +09:00
Dean Herbert
e333e12b2e Fix typo in settings enum (seriously) 2023-01-25 16:32:00 +09:00
Dean Herbert
3faab66f39 Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:32:00 +09:00
Dean Herbert
1a9ed1ac3f Remove unnecessary IgnoreUserSettings value change 2023-01-25 16:28:06 +09:00
Dean Herbert
f81dea4166 Remove now unused localisation string 2023-01-25 16:24:52 +09:00
Dean Herbert
9499d3a20a Add support for disabling "hit lighting" with osu! argon skin 2023-01-25 15:50:49 +09:00
Dean Herbert
4674956ccf
Merge pull request #22318 from naoey/fix-copy-difficulty-moving-collections
Fix creating a copy of a difficulty in the editor removing the original beatmap from user collections
2023-01-25 15:06:46 +09:00
Dean Herbert
1cde90d55d Add note about CheckScreenSpaceActionPresJudgeable being naive 2023-01-25 15:03:47 +09:00
Dean Herbert
e4a79d8581 Rename test scene to differentiate from other ruleset touch tests 2023-01-25 15:01:05 +09:00
Dean Herbert
5bfd4e47a1 Refactor position tracking touch handling (and comments) to read better 2023-01-25 14:59:54 +09:00
Dean Herbert
7bb6337d2e Fix nullability (thanks bdach for patch) 2023-01-25 14:43:46 +09:00
Dean Herbert
8caf960f9a Revert weird nullable changes to Skin.cs 2023-01-25 14:43:46 +09:00
Dean Herbert
0a9b20d5d5 Split lookup store into own file / class 2023-01-25 14:43:46 +09:00
Dean Herbert
c1a5c16973 Reduce maximum texture size to a more commonly-supported 8192 2023-01-25 14:43:46 +09:00
Dean Herbert
d000a4ed28 Make sure to dispose of the original texture upload as we are replacing it 2023-01-25 14:43:46 +09:00
Dean Herbert
598c6fcbad Add basic support for stupidly long hold note skin textures 2023-01-25 14:43:46 +09:00
Dean Herbert
68a9d945b9
Merge branch 'master' into user-profile/update-cover 2023-01-25 14:30:35 +09:00
Dean Herbert
6bf7773532 Increase duration of expansion transition 2023-01-25 14:28:25 +09:00
Dean Herbert
3e91dd2a16 Update spacing along with expanded state 2023-01-25 14:28:25 +09:00
Dean Herbert
73d7043201
Merge pull request #22383 from jai-x/wikimarkdown-update-tests
Update `WikiMarkdownContainer` tests
2023-01-25 14:20:47 +09:00
Dean Herbert
6efab635d8
Merge branch 'master' into fix-copy-difficulty-moving-collections 2023-01-25 14:11:32 +09:00
Dean Herbert
392ff2ffea Reword comment regarding hash transfer to make more sense 2023-01-25 14:11:02 +09:00
Dean Herbert
741ca96853 Make transferCollections argument to private method explicitly required 2023-01-25 14:09:13 +09:00
Dean Herbert
739ec8d81d
Add argument hint for nondescript bool
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-25 14:04:30 +09:00
itsMapleLeaf
132417b4e4 fix braces 2023-01-24 22:36:13 -06:00
itsMapleLeaf
5f037ac1e9 comment not useful 2023-01-24 22:24:21 -06:00
Dean Herbert
b182178340
Merge pull request #22325 from sw1tchbl4d3r/sv_scaling
Move fixed scroll speed change out of classic mod for taiko
2023-01-25 12:55:43 +09:00
Dean Herbert
d8365f4fca Reverse order of application to match DrawableHitObject 2023-01-25 11:47:15 +09:00
Dean Herbert
7e9b3fb253
Merge pull request #22400 from frenzibyte/fix-ios-ci
Fix iOS workflow still targeting old Xcode version
2023-01-25 10:30:23 +09:00
Salman Ahmed
4d4dfd9e8b Fix iOS workflow still targeting old Xcode version 2023-01-25 02:15:08 +03:00