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

28274 Commits

Author SHA1 Message Date
smoogipoo
4d8418e072 Fix possible nullrefs 2021-09-30 17:54:56 +09:00
smoogipoo
d2a8f35b4c Update styling 2021-09-30 17:54:52 +09:00
smoogipoo
84bddf0885 Initial PP counter implementation 2021-09-30 17:00:24 +09:00
Dean Herbert
7914daaef0 Remove unused using 2021-09-29 19:09:48 +09:00
Dean Herbert
4fd19cbb0d Use null check instead of assert in Hide() due to public exposure 2021-09-29 18:58:43 +09:00
Dean Herbert
c5b7e97bd9 Fix skin editor potentially crashing during close process
As reported at
https://github.com/ppy/osu/discussions/14850#discussioncomment-1399382.
2021-09-29 18:53:49 +09:00
Dan Balasescu
754c56d7ae
Merge branch 'master' into move-startup-concurrency-check 2021-09-29 17:20:20 +09:00
Dan Balasescu
ce3cf72a77
Merge pull request #14888 from peppy/rename-json-key-resolver
Rename JSON key resolver to better expose what it's doing
2021-09-29 16:58:42 +09:00
Dean Herbert
dcf87e97c2 Update framework 2021-09-29 14:03:41 +09:00
Dean Herbert
117d47bf7f Rename JSON key resolver to better expose what it's doing 2021-09-29 11:26:37 +09:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Bartłomiej Dach
ca6cbca04a
Fix range selection crashing after non-mouse selection 2021-09-27 20:54:29 +02:00
Dean Herbert
bcdbffbca0 Update framework 2021-09-27 20:56:54 +09:00
Dean Herbert
d4310f5d9a Move database connection string operations local
In line with framework changes in
https://github.com/ppy/osu-framework/pull/4793.
2021-09-27 17:32:41 +09:00
Dean Herbert
df85092426 Resolve inner items early in process and rename variable 2021-09-27 14:24:17 +09:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting 2021-09-27 14:12:09 +09:00
Dean Herbert
5466fb08fd
Merge branch 'master' into timeline-shift-click-selection 2021-09-27 13:40:39 +09:00
Bartłomiej Dach
d3203f83dd
Add implementation of range selection 2021-09-26 20:12:26 +02:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection 2021-09-26 19:27:47 +02:00
Bartłomiej Dach
6dc3e66c93
Include combo information when determining ordering if available 2021-09-26 15:52:25 +02:00
Bartłomiej Dach
a86b9893ac
Always re-sort blueprints before adding/removing one 2021-09-26 15:48:56 +02:00
Bartłomiej Dach
a66d48dbad
Merge branch 'master' into diffcalc-optimisations 2021-09-26 14:46:50 +02:00
Joseph Madamba
9b9c30c8a1 Fix text overflowing on dropdown headers 2021-09-24 22:04:45 -07:00
Dean Herbert
ad6c4e3878 Update framework 2021-09-24 12:46:46 +09:00
Dean Herbert
6b698047ab Fix DialogOverlay potentially not expiring dialogs as soon as it should 2021-09-23 19:19:03 +09:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dean Herbert
3b174a71a3 Move startup concurrency check to higher level
Makes more sense to perform this check outside of the game itself now
that we can.
2021-09-21 18:00:55 +09:00
Dan Balasescu
ffdaf23329
Merge pull request #14814 from peppy/fix-key-counter-masking
Fix `KeyCounterDisplay` potentially getting stuck invisible due to autosize masking
2021-09-21 16:21:38 +09:00
smoogipoo
6246bbc262 Also add to ParticleExplosion 2021-09-21 14:37:09 +09:00
smoogipoo
bad3f0b1e9 Disable FtB pass for particle spewer 2021-09-21 14:25:44 +09:00
Dean Herbert
8584c0b6da Merge branch 'master' into diffcalc-optimisations 2021-09-21 14:22:42 +09:00
Dean Herbert
add8aac6d5
Merge pull request #14815 from ppy/dependabot/nuget/osu.Game/SharpCompress-0.29.0
Bump SharpCompress from 0.28.3 to 0.29.0 in /osu.Game
2021-09-21 14:05:21 +09:00
Bartłomiej Dach
761548e533
Merge branch 'master' into 14470-ur-not-updating 2021-09-20 22:07:33 +02:00
dependabot[bot]
b715b89edc
Bump SharpCompress from 0.28.3 to 0.29.0 in /osu.Game
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.28.3 to 0.29.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.28.3...0.29)

---
updated-dependencies:
- dependency-name: SharpCompress
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 19:54:05 +00:00
sh0ckR6
fb416c79e9
Fully revert Player 2021-09-20 15:01:03 -04:00
Dean Herbert
a3464c98a7 Fix KeyCounterDisplay potentially getting stuck invisible due to autosize masking
Closes #14793.
2021-09-20 23:52:01 +09:00
sh0ckR6
9a1db04920
Resolve GameplayClockContainer instead of Player 2021-09-20 10:28:58 -04:00
sh0ckR6
36a20ab0b3
Resolve failed test compilation 2021-09-20 10:26:07 -04:00
sh0ckR6
10fe2382b0
Address most issues 2021-09-20 10:07:42 -04:00
Dean Herbert
7812c33ddd
Merge branch 'master' into add-legacy-star-particles 2021-09-20 18:15:12 +09:00
Dean Herbert
cdef6d0cf5 Add key binding support for grid mode cycle 2021-09-20 16:43:15 +09:00
Dean Herbert
d96d1b3e47 Update framework 2021-09-20 15:09:27 +09:00
Dean Herbert
16e60eed56 Reduce NestedHitObject enumerator overhead
This was especially bad due to it allocating on any and every start time
change, even the first (see usage in `HitObject.ctor`).
2021-09-20 15:09:27 +09:00
Bartłomiej Dach
ab213e2010
Add missing licence headers 2021-09-19 21:09:03 +02:00
Bartłomiej Dach
4e094b2127
Implement grid size toggling matching stable 2021-09-19 20:26:02 +02:00
Bartłomiej Dach
56e80a0706
Add rectangular position snap grid 2021-09-19 18:07:19 +02:00
Opelkuh
9c90dd539f Use Interpolation.Lerp 2021-09-19 15:06:15 +02:00
Opelkuh
0b593fac5c Scope down DrawNode's source parameter 2021-09-19 14:49:09 +02:00
Opelkuh
d5a10e9221 Fix particles not spawning if Time.Current is negative 2021-09-19 14:47:20 +02:00
Opelkuh
761da45f6a Revert af4c3727d77a16e2534df9bbf452336b5c544342 2021-09-19 14:00:56 +02:00