h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-23 00:42:55 +08:00
Code Issues Releases Wiki Activity
34,265 Commits 5 Branches 664 Tags 360 MiB
85de1a1d20
Commit Graph

462 Commits

Author SHA1 Message Date
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 (#7112) 
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 (#5512) 
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 (#5275) 
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 #4043.
 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