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

29691 Commits

Author SHA1 Message Date
BananeVolante
6fd8548f79 no longer crash if the restart sample isn't found 2020-06-13 10:13:41 +02:00
BananeVolante
e8db2cfd6d Merge branch 'master' of https://github.com/ppy/osu
updated local source
2020-06-12 19:31:26 +02:00
BananeVolante
2feaf2c74a added music during pause 2020-06-12 19:17:52 +02:00
Dean Herbert
c726e6f514
Merge pull request #9261 from peppy/loading-spinner-always-animate
Fix LoadingSpinner not always playing fade in animation
2020-06-12 19:38:07 +09:00
Dean Herbert
91b6979c97 Fix LoadingSpinner not always playing fade in animation 2020-06-12 13:38:20 +09:00
Dean Herbert
8d550a7b29
Merge pull request #9241 from smoogipoo/timeshift-results-2
Implement per-beatmap results screen for timeshift
2020-06-12 13:36:33 +09:00
Dean Herbert
e26dc7ef55
Merge pull request #9260 from smoogipoo/fix-publish
Fix dotnet publish with runtime specification not working
2020-06-12 13:24:04 +09:00
Dan Balasescu
ef81873ba2
Merge pull request #9253 from swoolcock/sdl2-hide-cursor
Fix cursor not hiding with SDL2 backend
2020-06-12 13:18:25 +09:00
smoogipoo
a48e36fd31 Fix dotnet publish with runtime specification not working 2020-06-12 12:58:33 +09:00
Dan Balasescu
ee3ec2fb58
Merge branch 'master' into sdl2-hide-cursor 2020-06-12 11:44:30 +09:00
Dean Herbert
276c9da43f
Merge pull request #9247 from MiraiSubject/headless-tournamentgamebase
Move graphics from TournamentGameBase to TournamentGame
2020-06-12 11:21:43 +09:00
Dean Herbert
80140842dc
Merge branch 'master' into headless-tournamentgamebase 2020-06-12 10:51:37 +09:00
Shane Woolcock
fca6a6d69f Implement file drop with DragDrop event 2020-06-12 09:46:21 +09:30
smoogipoo
b7c1cfbe63 Adjust display to avoid overlaps 2020-06-11 15:07:14 +09:00
smoogipoo
7b012f1def Fix test failures 2020-06-11 14:55:49 +09:00
smoogipoo
afa5b995f2 Merge branch 'fix-test-nullref' into timeshift-results-2 2020-06-11 14:05:05 +09:00
smoogipoo
702bd2b65d Fix potential nullref in test 2020-06-11 13:41:53 +09:00
Shane Woolcock
b89dcb6a77 Fix cursor not hiding with SDL2 backend 2020-06-11 13:08:41 +09:30
Shivam
a43e1a0ae3 Remove whitespace 2020-06-10 08:41:13 +02:00
Shivam
0f39558da2 Apply review comment 2020-06-10 08:04:34 +02:00
Dean Herbert
969d0b7228
Merge pull request #9193 from peppy/update-inspectcode-version
Update inspectcode / CodeFileSanity versions used in CI
2020-06-10 09:38:10 +09:00
Shivam
aacacd75f0 Remove abstract from the class 2020-06-09 21:14:05 +02:00
Shivam
c9b4fa92f5 Hide in-game cursor manually in the testbrowser 2020-06-09 20:40:54 +02:00
Shivam
af05ee67cb move base.loadcomplete to the bottom 2020-06-09 20:30:15 +02:00
Shivam
e57a229474 Move all the graphics related code to TournamentGame 2020-06-09 20:22:30 +02:00
Dean Herbert
3ae1df07b0 Fix a couple more new formatting issues 2020-06-10 00:09:29 +09:00
Dean Herbert
880a127228 Use async overload 2020-06-10 00:08:48 +09:00
Dean Herbert
7dc19220e5 Apply new resharper formatting fixes 2020-06-09 23:38:54 +09:00
Dean Herbert
7274213cce Update framework 2020-06-09 23:30:42 +09:00
smoogipoo
ab10732a78 Remove usages of null-forgiving operator 2020-06-09 22:13:48 +09:00
smoogipoo
88aed1d504 Merge branch 'master' into update-inspectcode-version 2020-06-09 20:12:39 +09:00
Dan Balasescu
527577d7c3
Merge pull request #9236 from MiraiSubject/logovisualisation-subclass
Move user and skin specific settings for LogoVisualisation to a subclass
2020-06-09 19:16:24 +09:00
Dan Balasescu
0d83b0f50a
Merge pull request #9210 from peppy/fix-tourney-beatmap-change-ooo
Fix tournament displayed beatmap potentially being out of order on quick changes
2020-06-09 19:15:59 +09:00
smoogipoo
05b1edb9d8 Fix incorrect beatmap showing 2020-06-09 19:01:02 +09:00
smoogipoo
4fd5ff61eb Add loading spinner 2020-06-09 18:53:55 +09:00
smoogipoo
44dd7d65be Fix duplicate scores showing 2020-06-09 18:21:37 +09:00
smoogipoo
7f05c16c9f Merge branch 'master' into timeshift-results-2 2020-06-09 15:59:13 +09:00
Dan Balasescu
79434c6f70
Merge branch 'master' into fix-tourney-beatmap-change-ooo 2020-06-09 15:31:28 +09:00
Dean Herbert
e837528ddf
Merge pull request #9231 from peppy/fetch-private-chat-history
Fetch existing private message channels on re-joining
2020-06-09 15:08:22 +09:00
Dan Balasescu
7f72f59307
Merge branch 'master' into fetch-private-chat-history 2020-06-09 14:42:29 +09:00
Dan Balasescu
ad28f84335
Merge pull request #9230 from peppy/startup-safety
Improve handling of missing intro beatmap / files
2020-06-09 14:41:04 +09:00
Dan Balasescu
1476412eaa
Merge branch 'master' into startup-safety 2020-06-09 13:55:33 +09:00
Dean Herbert
e06e9a8bc5
Merge pull request #9217 from smoogipoo/multi-room-load-spinner
Show a loading spinner on multiplayer lounge loads
2020-06-09 11:21:43 +09:00
Dean Herbert
9d68a95f3f
Merge branch 'master' into multi-room-load-spinner 2020-06-09 10:56:56 +09:00
Dean Herbert
5fdeeec8df
Merge pull request #9175 from smoogipoo/multiplayer-beatmap-checksum
Add timeshift beatmap checksum validation
2020-06-09 10:53:33 +09:00
Shivam
a60bb5feac Rename baseclass, add xmldoc & change access to internal 2020-06-08 23:45:40 +02:00
Shivam
2a5e960025 Move user and skin specific settings to a subclass 2020-06-08 21:15:51 +02:00
smoogipoo
8a021e0beb Use save method in test 2020-06-08 22:35:01 +09:00
Dean Herbert
e5569ab963
Merge pull request #9233 from ppy/dependabot/nuget/Humanizer-2.8.26
Bump Humanizer from 2.8.11 to 2.8.26
2020-06-08 20:31:10 +09:00
Dean Herbert
1ab78fa8a7
Merge pull request #9234 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.0.48
Bump Microsoft.Build.Traversal from 2.0.34 to 2.0.48
2020-06-08 20:30:54 +09:00