1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 01:53:08 +08:00
Commit Graph

658 Commits

Author SHA1 Message Date
Christine Chen
a2723f3f57 Perform elevated check asynchronously, use a separate function w/ switch statement 2021-04-26 22:44:22 -04:00
Christine Chen
c3bad1d4c5 Rename AdminChecker to ElevatedPrivilegesChecker, refactor elevated check 2021-04-26 21:05:18 -04:00
Christine Chen
260dd06f47 Move AdminChecker to osu.Desktop.Admin 2021-04-26 20:04:34 -04:00
Christine Chen
9ad30da729 Show a notification if game is run as administrator 2021-04-26 16:41:26 -04:00
Dean Herbert
b5954a55ad Remove empty <returns> xmldoc 2021-04-12 17:46:14 +09:00
Dean Herbert
30cae46cbd Group large drag drop imports into a single operation 2021-03-31 14:57:28 +09:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
2021-03-21 11:05:15 +01:00
Dean Herbert
79041c1c4b Remove osuTK reference 2021-03-17 18:07:42 +09:00
Dean Herbert
249ab8ab3d Merge branch 'master' into input-handler-configuration 2021-03-17 18:05:14 +09:00
Roman Kapustin
61d5a6cc57 Simplify Microsoft.EntityFrameworkCore.Design PackageReference 2021-03-14 19:47:14 +03:00
Dean Herbert
6eadae8aaf Remove remnants of OsuTK 2021-03-12 18:35:42 +09:00
Roman Kapustin
f1302d1600 Update Microsoft.EntityFrameworkCore 2021-03-11 19:23:56 +03:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
Salman Ahmed
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
Dean Herbert
a080a9bdbc
Merge pull request from Game4all/handle-stable-imports-custom-songs-folder
Handle beatmap import from a stable installation with a custom Songs directory
2021-02-12 21:42:36 +09:00
dependabot-preview[bot]
57213e6308
Bump DiscordRichPresence from 1.0.169 to 1.0.175
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.169 to 1.0.175.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 18:09:07 +00:00
Salman Ahmed
63f057a525 Fix dotnet run/publish with runtime specified not working again 2021-01-27 20:45:52 +03:00
Dean Herbert
f3061a8e83 Update squirrel to fix incorrect desktop icon creation on install 2021-01-25 18:47:41 +09:00
Lucas A
d71ac83428 Use StableStorage in ArchiveModelManager. 2021-01-24 19:46:10 +01:00
Lucas A
9a5790cd31 Implement StableStorage class. 2021-01-24 19:18:16 +01:00
Dean Herbert
3f88340304 Restore previous exception handling flow for stable path lookup 2021-01-15 15:17:38 +09:00
Roman Kapustin
0ea4e221b2 Merge branch 'master' into net5.0 2021-01-14 14:02:51 +03:00
Bartłomiej Dach
fb057857e7 Update references to current year 2021-01-06 18:38:24 +01:00
Dean Herbert
866fb28d6c
Merge pull request from LavaDesu/feature/discord-presence-toggle
Add ability to toggle discord rich presence
2021-01-07 00:52:38 +09:00
Dean Herbert
a8530fde9d Tidy up variables and spacing 2021-01-07 00:05:12 +09:00
Dean Herbert
d056e6575e Use IsDeployedBuild instead of IsDebugBuild for footer display conditional 2021-01-06 23:30:54 +09:00
Dean Herbert
cf3043fc08 Only show "development build" footer on debug releases 2021-01-06 23:20:26 +09:00
LavaDesu
7c9f345cd2
Use better naming for DiscordRichPresenceMode 2021-01-03 16:46:25 +07:00
LavaDesu
2e5c67be3f
Add ability to toggle discord rich presence
There are 3 modes: enabled, limited, and disabled.

The limited mode hides identifiable information such as username, rank, and
(if participating in one) multiplayer lobby name.
2021-01-03 10:37:28 +07:00
Dean Herbert
206bf3713e Make IAPIProvider read-only bindables into IBindables 2020-12-18 15:16:36 +09:00
Dean Herbert
53da137425
Merge branch 'master' into net5.0 2020-12-10 17:14:21 +09:00
Dean Herbert
42b810d0c8 Update DiscordRichPresence with fix for startup crashes 2020-12-07 13:03:34 +09:00
smoogipoo
8ac2f7d8cb Merge remote-tracking branch 'upstream/dependabot/nuget/System.IO.Packaging-5.0.0' into update-dependencies 2020-12-02 10:38:46 +09:00
dependabot-preview[bot]
8a65328a6d
Bump DiscordRichPresence from 1.0.150 to 1.0.166
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.150 to 1.0.166.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:08 +00:00
dependabot-preview[bot]
aac20eef44
Bump System.IO.Packaging from 4.7.0 to 5.0.0
Bumps [System.IO.Packaging](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:05 +00:00
Bartłomiej Dach
c9429632f4 Resolve new NRE inspections 2020-12-01 22:39:10 +01:00
dependabot-preview[bot]
b236c75ac8
Bump Microsoft.Win32.Registry from 4.7.0 to 5.0.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-01 17:32:24 +00:00
Dean Herbert
285e62be9a Bring code in line with SDL2 defaults 2020-12-01 17:47:07 +09:00
Roman Kapustin
1feda1152d Fix InspectCode warnings 2020-11-21 02:06:20 +03:00
Roman Kapustin
7435416497 Workaround FileNotFoundException in a test projects 2020-11-20 14:13:16 +03:00
Roman Kapustin
1a676ef0d8 Resolve CA1416 properly using new API 2020-11-20 12:06:08 +03:00
Roman Kapustin
044622036c Disable CA1416 2020-11-20 11:53:17 +03:00
Roman Kapustin
f562a7ea0d Fix FileNotFoundException on startup 2020-11-20 11:52:17 +03:00
Roman Kapustin
ca0e1c8cee Update NuGet packages 2020-11-20 10:47:57 +03:00
Roman Kapustin
3b600f0a7b Target net5.0 instead of netcoreapp3 2020-11-20 10:45:19 +03:00
Dean Herbert
efc18887c8 Update framework 2020-11-18 18:01:55 +09:00
Dean Herbert
85d641c630
Merge pull request from Game4all/add-multi-statuses 2020-11-10 14:23:26 +09:00
Lucas A
b8c63e7944 Apply review suggestions. 2020-11-09 13:39:50 +01:00
Dean Herbert
2e3fdf8116 Update reference to TK game window class 2020-11-09 20:50:36 +09:00
Lucas A
e4fb9b4dd3 Display room name on discord rich presence. 2020-11-08 18:42:24 +01:00
Shane Woolcock
c2161bb4cf
Merge branch 'master' into sdl-icon 2020-10-11 16:21:39 +10:30
Dean Herbert
09e350d14d Remove canBNull specification 2020-10-10 13:28:27 +09:00
Dean Herbert
20f1eb2b33 Fix windows key blocking applying when window is inactive / when watching a replay
Closes .
2020-10-10 13:11:39 +09:00
Dean Herbert
de47392e3d Display the "restart to update" notification on checking for update after dismissal 2020-10-06 13:19:57 +09:00
Dean Herbert
22b0105d62 Show a notification if checking for updates via button and there are none available 2020-10-06 13:00:02 +09:00
Shane Woolcock
7359c422dd Hoist icon stream 2020-10-03 12:58:43 +09:30
Shane Woolcock
42f666cd24 Set icon for SDL desktop window 2020-09-29 23:04:03 +09:30
Bartłomiej Dach
6c44513115 Update .csproj descriptions to match 2020-08-16 12:53:31 +02:00
Dean Herbert
dbe9180c55 Rename class and remove screen conditionals 2020-07-24 16:38:48 +09:00
Lucas A
5e6adfff99 Disable windows key only while in gameplay. 2020-07-23 12:45:14 +02:00
Lucas A
4102dae999 Revert commit 939441ae 2020-07-23 11:56:46 +02:00
Lucas A
939441ae40 Disable the windows key only when in gameplay. 2020-07-16 14:50:11 +02:00
Lucas A
022e4b6335 Apply review suggestions. 2020-07-06 11:15:56 +02:00
Lucas A
ce5da5c51b Block CTRL + ESC 2020-07-05 20:21:56 +02:00
Lucas A
8869979599 Trigger hook activation on bind. 2020-07-04 12:30:09 +02:00
Lucas A
fc1eb42a65 Disable windows key while in gameplay. 2020-07-01 17:15:41 +02:00
Dean Herbert
6beb28b685 Rename method to be less bad 2020-06-12 18:07:39 +09:00
Dean Herbert
95f57ca88c Remove duplicate calls to CheckForUpdatesAsync 2020-06-12 18:05:23 +09:00
Dean Herbert
6296cd62d0 Merge branch 'master' into update-button 2020-06-12 18:00:36 +09:00
Dean Herbert
e26dc7ef55
Merge pull request from smoogipoo/fix-publish
Fix dotnet publish with runtime specification not working
2020-06-12 13:24:04 +09:00
smoogipoo
a48e36fd31 Fix dotnet publish with runtime specification not working 2020-06-12 12:58:33 +09:00
Shane Woolcock
fca6a6d69f Implement file drop with DragDrop event 2020-06-12 09:46:21 +09:30
Shane Woolcock
b89dcb6a77 Fix cursor not hiding with SDL2 backend 2020-06-11 13:08:41 +09:30
Craftplacer
101604e741 Redesign classes and generally improve code 2020-06-08 00:39:33 +02:00
Craftplacer
e95ffcb528 Merge remote-tracking branch 'upstream/master' into update-button 2020-06-07 22:51:03 +02:00
smoogipoo
8aa8d2c880 Resolve NREs 2020-06-03 16:59:37 +09:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Salman Ahmed
82fe99cf4a
Replace any potential usage of Environment.CurrentDirectory with a new RuntimeInfo.StartupDirectory
Using `Environment.CurrentDirectory` for storing / reading files is dangerous as the current directory is mutable and can be changed when performing a certain operation (like opening solutions in roslyn type reference builder for example).
2020-05-31 02:24:49 +03:00
Dean Herbert
9ab3e3a6d5
Merge branch 'master' into update-button 2020-05-13 20:50:33 +09:00
Dean Herbert
d6840d880a Update StableStorage implementation in line with framework changes 2020-05-08 10:40:04 +09:00
Craftplacer
ebd1df8c28 Change property name to CanCheckForUpdate 2020-05-08 02:50:58 +02:00
Craftplacer
3c24ca08d0 Check whether the build is deployed within the public check updates method 2020-05-08 02:48:27 +02:00
Craftplacer
e6ad28a1cb Use property instead of type checking 2020-05-08 02:09:37 +02:00
Craftplacer
836efe3f7c Initial commit 2020-05-07 08:07:22 +02:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
Dean Herbert
6477a7b73e Centralise creation of UpdateManagers 2020-03-05 13:34:04 +09:00
dependabot-preview[bot]
b7e14569eb
Bump DiscordRichPresence from 1.0.147 to 1.0.150
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.147 to 1.0.150.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-21 03:11:10 +00:00
dependabot-preview[bot]
5609c92aaf
Bump DiscordRichPresence from 1.0.121 to 1.0.147
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.121 to 1.0.147.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-27 07:50:21 +00:00
Salman Ahmed
5a2ed5391d Update license year 2020-01-19 23:51:10 +03:00
Dean Herbert
63de934ee5
Merge branch 'master' into sdl-arg 2020-01-14 12:45:45 +08:00
Lucas A
ec95cbd0af Don't update rich presence if the rpc client isn't initialized. 2020-01-11 16:03:00 +01:00
Dean Herbert
a5e30859a9
Truncate rich presence status strings to 128 bytes ()
Truncate rich presence status strings to 128 bytes

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-25 12:28:44 +09:00
smoogipoo
1a7937bcf7 Apply suggested optimisations 2019-12-25 12:04:28 +09:00
smoogipoo
36dd0e6998 Make ellipsis length into a static 2019-12-25 11:14:40 +09:00
smoogipoo
f1f9e1f658 Don't truncate with exactly 128 bytes 2019-12-23 19:56:05 +09:00
Dean Herbert
b9bc1c954e Disable automatic retry of failed discord RPC connections 2019-12-23 19:50:35 +09:00
Dan Balasescu
bc0c331c33
Merge branch 'master' into fix-discord-rpc 2019-12-23 19:37:00 +09:00
smoogipoo
4302412243 Simplify implementation 2019-12-23 19:34:12 +09:00
Lucas A
125f4286ae Move truncate() to a method body 2019-12-23 10:55:44 +01:00
Lucas A
e2b4e3580c Truncate strings passed to the Discord RPC client to a maximum of 128 bytes 2019-12-22 19:21:21 +01:00
Huo Yaoyuan
351e826120 Upgrade project targets to netcoreapp3.1 2019-12-20 17:03:54 +08:00
Dean Herbert
9ac15ef3a8 Don't log discord connection failures 2019-12-18 22:56:00 +09:00
Dean Herbert
0710e5ba13 Rename unknown mode assets (discord dev page broken) 2019-12-18 14:35:18 +09:00
Dean Herbert
b65847b0d7 Refactor / rewrite discord code 2019-12-18 14:07:53 +09:00
Dean Herbert
0a3d339dd9 Load discord RPC asynchronously 2019-12-18 14:07:32 +09:00
Dean Herbert
0f5ef78b69 Update client id 2019-12-18 12:39:50 +09:00
Dean Herbert
72acce77b3
Merge branch 'master' into discord-rich-presence 2019-12-18 12:19:54 +09:00
Huo Yaoyuan
48976f5d0e Add VS launcher profile for tournament client. 2019-12-10 18:19:53 +08:00
Dean Herbert
dc45811dfd
Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0 ()
Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-12-09 18:18:59 +09:00
dependabot-preview[bot]
3861abce82
Bump System.IO.Packaging from 4.6.0 to 4.7.0
Bumps [System.IO.Packaging](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:52:23 +00:00
dependabot-preview[bot]
b764a74919
Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:52:22 +00:00
Bartłomiej Dach
ff8544597c Add explicit app manifest to desktop project
After the .NET Core bump to version 3.0 in the 2019.1011.0 release,
reports popped up of the game not starting any more on some computers
using Intel graphics cards (HD 3000 in particular).

After investigation the auto-generated application manifest changed in
.NET Core 3.0. In particular this seems to be a root cause for the
failed start-ups on Intel cards, due to a Windows version compatibility
section appearing. The section in turn affects some WinAPI calls like
GetVersionEx, which will return major version 10 instead of 6 if
compatibility with Windows 10 is declared. This combined with a broken
check in the Intel OpenGL driver caused the crashes.

To resolve this without having to patch binaries, add an explicit
application manifest to the desktop project with the compatibility
section removed.
2019-12-07 19:55:09 +01:00
Shane Woolcock
54a8c00bb8 Add support for --sdl command line arg 2019-11-28 17:10:39 +10:30
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
64fc5007fc Use language primitive types. 2019-11-12 19:56:45 +08:00
Huo Yaoyuan
bcf8e3a9d4 Remove redundant properties from desktop projects.
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be Normalize .props 2019-10-30 21:54:14 +08:00
Joehu
f4924dc3cf Fix volume scrolling when hovering VersionManager 2019-10-14 16:37:54 -07:00
Dean Herbert
5d6648d9c9 Update 2.2 references 2019-10-10 17:45:38 +09:00
Dean Herbert
42b6041763 Move post-update notification logic to UpdateManager base class 2019-09-24 18:37:05 +09:00
Dean Herbert
0820e23097
Merge branch 'master' into dependabot/nuget/System.IO.Packaging-4.6.0 2019-09-24 11:17:07 +09:00
dependabot-preview[bot]
50dcb70342
Bump Microsoft.Win32.Registry from 4.5.0 to 4.6.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 21:04:20 +00:00
dependabot-preview[bot]
78ce62b187
Bump System.IO.Packaging from 4.5.0 to 4.6.0
Bumps [System.IO.Packaging](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 20:29:36 +00:00
Andrei Zavatski
8ef4b2a0f6 Hide NotificationOverlay 2019-08-13 11:29:48 +03:00
Roman Kapustin
c8dd29067b Update Entity Framework Core 2019-08-04 00:34:51 +03:00
Dean Herbert
808f77f1b1
Fix version overlay displaying briefly before it should ()
Fix version overlay displaying briefly before it should
2019-07-30 14:10:24 +09:00
Dean Herbert
a16c0f2aa0 Don't report stable storage msising to sentry 2019-07-30 12:44:08 +09:00
Dean Herbert
f21a2f7e5e Fix version overlay displaying briefly before it should 2019-07-29 21:49:12 +09:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence ()
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
Dean Herbert
e579bce18a Don't report delta patch failures to sentry 2019-07-29 18:14:06 +09:00
Dean Herbert
292bd22f92 Allow multiple instances of osu! when running under debug 2019-07-23 13:38:05 +09:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements 2019-07-22 23:44:14 +09:00
Dean Herbert
376d228add Use new logo style for icons / readme 2019-07-12 17:49:59 +09:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
Lucas A
8f487de045 Merge branch 'master' into discord-rich-presence 2019-07-07 17:45:18 +02:00
Dean Herbert
b901aab19d Fix update notification not correctly restarting the game 2019-07-03 23:06:16 +09:00
Lucas A
8818543f28 Merge branch 'master' into discord-rich-presence 2019-06-29 18:08:06 +02:00
Dean Herbert
c9104e9176 Fix remaining issues 2019-06-28 21:26:31 +09:00
Dean Herbert
1289b7f5fe Commit missing piece of puzzle 2019-06-28 21:03:35 +09:00
Dean Herbert
1898a6750d Fix stutter during update process 2019-06-28 20:45:25 +09:00
Dean Herbert
d557737143 Fix windows updater showing false failures 2019-06-28 20:37:53 +09:00
Lucas A
54e6e47019 Display current user activity on rich presence if current activity != null & user online status == online. 2019-06-21 12:48:13 +02:00
Lucas A
d1319d7037 Merge branch 'master' into discord-rich-presence 2019-06-21 12:14:00 +02:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
Lucas A
42b205f2be Merge remote-tracking branch 'upstream/master' into discord-rich-presence 2019-06-12 13:26:52 +02:00
Lucas A
4275f70cf4 Fix CI inspections. 2019-06-12 13:14:01 +02:00
Lucas A
9faba94978 Fix references to UserActivities 2019-06-12 12:22:52 +02:00
Lucas A
001a7975d5 Merge branch 'user-status-wiring' into discord-rich-presence 2019-06-12 12:04:00 +02:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert
115a75e4c6 Use a constant for lazer variables 2019-06-03 13:16:05 +09:00
Lucas A
ebd66a1e21 Merge branch 'user-status-wiring' into discord-rich-presence 2019-05-31 12:42:57 +02:00
Lucas A
446210b812 Use an if statement instead of a switch 2019-05-25 11:33:31 +02:00
Dean Herbert
492dd3eee2 Restore accidentally commented conditional 2019-05-24 10:53:02 +09:00
Dean Herbert
e034b3d514 Use TaskCompletionSource in a better manner 2019-05-23 19:08:44 +09:00
Dean Herbert
acaf2f9fbb Show changelog from new build notification 2019-05-23 18:54:42 +09:00
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +09:00
Lucas A
59613722bc Merge branch 'user-status-wiring' into discord-rich-presence 2019-05-16 18:49:57 +02:00
Lucas A
01b75db21a Use ruleset.ShortName instead of hardcoded names. 2019-05-16 18:36:54 +02:00
Dean Herbert
501eaa072e Use local logger 2019-05-15 14:12:59 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
smoogipoo
c01841d7d7 Use Logger for squirrel update logs 2019-05-15 11:28:22 +09:00
Lucas A
d4013ae0d8 Make DiscordRichPresenceClient dispose client on disposal 2019-05-14 19:37:43 +02:00
Lucas A
ee2bbf950f Update DiscordRichPresenceClient presence logic 2019-05-14 19:13:21 +02:00
Lucas A
e4ad30cc07 Merge branch 'user-status-wiring' into discord-rich-presence 2019-05-14 18:12:25 +02:00
Dean Herbert
83663467ce Update dependencies 2019-05-08 21:08:46 +09:00
smoogipoo
1cfb7550ee Fix possible nullref 2019-05-07 13:42:55 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Lucas A
a4166ce1e3 Removed Update() override from DiscordRichPresenceClient because client.Invoke() is unecessary (events callbacks are automatically called) 2019-04-19 19:50:13 +02:00
Lucas A
b38160177a Add some more icons to rich presence + prevent rich presence from displaying empty brackets when current beatmap doesn't have a version (trying to edit osu! main menu theme music ?) 2019-04-19 19:29:23 +02:00
Lucas A
1b1ebb7fd9 Show current logged-in user on rich presence 2019-04-19 19:29:11 +02:00
Lucas A
4996ad4b04 Show the current gamemode on the rich presence 2019-04-19 19:29:01 +02:00
Lucas A
533afaa770 Added DiscordRichPresenceClient 2019-04-19 19:28:38 +02:00
Lucas A
65d664425b Added DiscordRichPresence to osu.Desktop packages 2019-04-19 19:28:21 +02:00
Dean Herbert
1ef2a4c46f Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-04-03 16:23:33 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
41d776b090 Fix stable import failing
Regressed due to null GameHost. Fixes the new reports in .
2019-03-30 23:56:38 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
d6f17a5ecd Bring nuget packages up to date 2019-03-22 02:41:21 +09:00
Dean Herbert
796f6c3092 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-02 13:13:51 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
smoogipoo
a0dae820ee Woops 2019-02-22 19:49:37 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
09056fd0d8
Merge branch 'master' into resources-via-nuget 2019-01-31 18:40:45 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
Dean Herbert
628b3e1119 Move osu-resources to nuget 2019-01-28 18:33:39 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
398171afd8 Standardise remaining cases 2019-01-24 18:24:30 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
4a4bc8955d Fix crash on startup when specifying --no-version-overlay 2018-12-27 20:08:16 +09:00
Dean Herbert
c6d017b503 And some more 2018-12-27 19:23:58 +09:00
Dean Herbert
bdadd1bba2 Add actual changes 2018-12-27 19:22:24 +09:00