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

36217 Commits

Author SHA1 Message Date
Dean Herbert
d17c091d63 Move constant to a better location 2022-11-18 15:47:31 +09:00
Dean Herbert
3faa7f5f74
Merge branch 'master' into gameplay-leaderboard-fix 2022-11-18 15:44:30 +09:00
Dean Herbert
bab5be8dee
Merge pull request #21290 from smoogipoo/multiplayer-test-debug
Add some debugging for multiplayer test failures
2022-11-18 15:39:33 +09:00
Dan Balasescu
c2a127dc68
Merge pull request #21289 from peppy/fix-triangle-button-flash
Fix triangle button flash effect looking incorrect
2022-11-18 15:26:43 +09:00
Dan Balasescu
219d049edf
Merge pull request #21140 from maromalo/long-standard
Standardise scores to `long` type
2022-11-18 15:26:33 +09:00
Dan Balasescu
cc434c9113
Merge pull request #21288 from peppy/fix-no-network-slow-gameplay-load
Fix entering gameplay while network connection is in a bad state taking too long
2022-11-18 15:24:31 +09:00
Dan Balasescu
7e9d2ecaf5
Merge pull request #21287 from peppy/fix-null-ref-persistent-endpoint-connector
Fix potential incorrect connection state resulting in null reference
2022-11-18 15:08:33 +09:00
Dan Balasescu
b0faa009c1 Add some debugging for multiplayer test failures 2022-11-18 14:52:11 +09:00
Dean Herbert
5fc0d45675 Fix triangle button flash effect looking incorrect 2022-11-18 14:30:59 +09:00
Dan Balasescu
57b8495c7a Merge branch 'master' into long-standard 2022-11-18 14:24:04 +09:00
Dan Balasescu
d47c46d144 Compute raw score in-line
Saves on an allocation (though it seems to only be a ValueType so it
shouldn't be a big deal) and a tail-call.
2022-11-18 14:22:28 +09:00
Dean Herbert
964ceddf83 Fix API queue only being flushed once while in a failing state 2022-11-18 14:21:37 +09:00
Dean Herbert
e4d134a820 Reduce time waited on a score submission token from 60 to 30s 2022-11-18 14:07:40 +09:00
Dan Balasescu
1b1fed723d
Merge pull request #21269 from peppy/fix-key-bindings-keyword
Move "keybindings" keyword to correct section
2022-11-18 14:05:08 +09:00
Dean Herbert
a5d22195f2 Fix potential incorrect connection state resulting in null reference 2022-11-18 13:45:46 +09:00
Dean Herbert
1ff1738988
Merge pull request #21244 from nanashi-1/beatmapoptions-disabled
Disable certain beatmap option buttons when there are no beatmaps selected
2022-11-18 12:55:07 +09:00
Dan Balasescu
a776622ce0
Merge pull request #21284 from peppy/now-playing-overlay-texture-reduction
Fix `NowPlayingOverlay` loading background texture too early (and permanently)
2022-11-18 12:09:16 +09:00
Dan Balasescu
c34dd27674
Merge pull request #21276 from peppy/eager-triangles-disposal
Eagerly dispose of triangles intro textures to avoid holding for full length of game session
2022-11-18 11:58:39 +09:00
Dan Balasescu
baa4fd56e2
Merge pull request #21279 from peppy/news-load-unload
Fix news post images never unloading from memory after first display
2022-11-18 11:56:13 +09:00
Dan Balasescu
13fe0d3491
Merge pull request #21278 from peppy/overlay-header-texture-reduction
Avoid loading overlay headers until first open
2022-11-18 11:53:46 +09:00
Dean Herbert
b53f9baf6a Fix NowPlayingOverlay loading background texture too early (and permanently) 2022-11-18 11:21:12 +09:00
Dean Herbert
93c2280754 Fix supporter filters text not being set correctly 2022-11-18 10:35:05 +09:00
Dawid Sośnia
0dbf491872
Merge branch 'master' into gameplay-leaderboard-fix 2022-11-17 22:06:51 +01:00
Piggey
eb691266c1 cleanup 2022-11-17 21:50:39 +01:00
Dean Herbert
b37e9c0266 Fix news post images never unloading from memory after first display 2022-11-18 00:01:53 +09:00
Dean Herbert
73e4827d36 Avoid loading overlay headers until first open
Also switches them to use non-atlased target as they won't benefit much
from atlasing.
2022-11-17 23:55:43 +09:00
Dean Herbert
63c1855511 Avoid loading beatmap listing placeholders until required 2022-11-17 23:42:21 +09:00
Dean Herbert
a3e8cc1663 Mark beatmap listing placeholder textures as large 2022-11-17 23:41:35 +09:00
Dean Herbert
20d87fbed4 Eagerly dispose of triangles intro textures to avoid holding for full length of game session 2022-11-17 23:05:34 +09:00
Piggey
fa00fc5c6d change scoresType to be a bindable 2022-11-17 13:27:56 +01:00
Piggey
dea2a6ed8d override sort() function in SoloGameplayLeaderboard 2022-11-17 12:12:36 +01:00
nanashi-1
4773979e52 add condition 2022-11-17 16:15:34 +08:00
Dean Herbert
bd2e0dc82b Move "keybindings" keyword to correct section
Without this, things like tablet settings would show when searching for
bindings, even though these settings have nothing to do with key
bindings.
2022-11-17 15:09:42 +09:00
Dean Herbert
bfcd9e0f45 Don't seek to current editor location when location is close to (or before) the first object 2022-11-17 12:32:35 +09:00
Dan Balasescu
bdfc317a8e
Merge pull request #21255 from peppy/fix-full-area-reset
Fix "reset to full area" button not always working correctly
2022-11-17 11:13:06 +09:00
Dan Balasescu
b23b5ebce9
Merge pull request #21257 from peppy/fix-test-mode
Fix combo colour normalisation setting not applying to editor test play
2022-11-17 10:44:44 +09:00
Salman Ahmed
87b4fee10f Remove leftover constant 2022-11-17 04:05:21 +03:00
Salman Ahmed
55beaf5d93 Revert buttons order change 2022-11-17 04:05:15 +03:00
Salman Ahmed
039ab83a46 Disable beatmap options button when none selected 2022-11-17 04:00:23 +03:00
Salman Ahmed
0e46614c57 Revert beatmap option button state changes 2022-11-17 03:57:01 +03:00
Salman Ahmed
c1673771eb
Merge branch 'master' into fix-full-area-reset 2022-11-17 01:57:56 +03:00
Salman Ahmed
7a28a7f2a0 Move IGameplaySettings override to compose screen to keep test mode unaffected 2022-11-17 01:45:16 +03:00
Dean Herbert
ee6fffec5f Fix combo colour normalisation setting not applying to editor test play 2022-11-16 17:54:49 +09:00
Dean Herbert
bb762d8131 Fix "reset to full area" button not always working correctly 2022-11-16 15:45:26 +09:00
nanashi-1
5d8d8ffce5 fix naming 2022-11-16 10:09:51 +08:00
nanashi-1
55edd6c907 add space 2022-11-16 09:58:49 +08:00
nanashi-1
1fb8357e93 change disabledAlpha from readonly to const 2022-11-16 09:58:32 +08:00
nanashi-1
9101ad0cbd fixed naming 2022-11-16 09:42:40 +08:00
Dean Herbert
52ecd894db Move equilateral triangle ratio to constant 2022-11-15 22:20:08 +09:00
nanashi-1
5973bb1956 AddButton now returns the button 2022-11-15 20:57:31 +08:00