h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 09:17:48 +08:00
Code Issues Releases Wiki Activity
69,717 Commits 3 Branches 656 Tags 368 MiB
17bc5ce5a9
Commit Graph

816 Commits

Author SHA1 Message Date
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 #10740 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 #10467.
 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 #9260 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 (#7318) 
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 (#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
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
Dean Herbert
bb4b54799f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-20 15:57:20 +09:00
Dean Herbert
4e9f727759
Merge branch 'master' into netcoreapp22 2018-12-14 11:33:41 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dean Herbert
67a759122a Fix update code crashing when no internet connection is available 2018-12-06 14:59:17 +09:00
Dean Herbert
dbc33c45a6 Update nuget packages 2018-12-06 00:14:21 +09:00
Dean Herbert
68745b221e Update projects to target .NET core 2.2 2018-12-05 19:46:07 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dan Balasescu
777b33b30e
Trim newline 2018-11-20 13:36:50 +09:00
Dean Herbert
375543c644 Add squirrel update log output 
Also updates squirrel to latest version.
 2018-11-20 13:29:24 +09:00
Dean Herbert
9c5eddea54 Allow running tournament tools from main executable 2018-11-06 14:49:09 +09:00
Dean Herbert
ae94aab677 Update framework 2018-10-18 21:04:29 +09:00
Dean Herbert
9aeba149f6 Update squirrel for more diagnostics 2018-10-17 19:39:32 +09:00
Dean Herbert
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
6a1e2c6fa5 Update efcore packages 2018-09-15 18:49:01 +09:00
Dean Herbert
f280e910bb Bump squirrel version 2018-09-14 04:26:30 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
Dean Herbert
3276f0f54d Update ef/sqlite version 2018-08-30 14:58:00 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
smoogipoo
da13266ae9 Fix missed string interpolation 2018-08-21 09:17:44 +09:00
Dean Herbert
583e026906 Don’t suppress unhandled exceptions in debug builds 2018-08-17 13:28:35 +09:00
Dean Herbert
83dc01d07c Fix multiple sentry reports arriving for similar exceptions 2018-08-17 12:05:21 +09:00
Dean Herbert
562a31713e Fix regression in handling logic 2018-08-16 16:44:04 +09:00
Dean Herbert
9fc0a75b71
Merge branch 'master' into sentry-logging 2018-08-16 13:33:24 +09:00
Dean Herbert
8ee38460d3 Bump squirrel version with bugfix 2018-08-07 02:01:31 +09:00
Dean Herbert
5d573ae176 Update squirrel 2018-08-07 01:00:06 +09:00
Dean Herbert
2ea90ef98a Add sentry logging 2018-08-03 19:25:55 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
4224d35a75 Use forked squirrel 
Allows for updating SharpCompress, too.
 2018-08-01 16:56:36 +09:00
Dean Herbert
139f6d8c4f Fix incorrect nuspec title 2018-08-01 12:30:09 +09:00
Dean Herbert
854beaab5f Remove only remaining .NET desktop code 2018-08-01 02:58:49 +09:00
Dean Herbert
4f1736ceb2 Make squirrel work again 2018-08-01 02:58:39 +09:00
Dean Herbert
fb09385f51 Remove net471 targeting 2018-07-18 11:01:08 +09:00
Dean Herbert
5615a32953 Fix mac installer extension being incorrect 2018-07-11 14:53:40 +09:00
Dean Herbert
2150cb1028 Update framework and other packages 2018-07-10 20:31:04 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling 2018-07-10 16:32:14 +09:00
Dean Herbert
7120408a63 Add fallback "updater", which prompts the user to update 2018-07-06 16:46:22 +09:00
Dean Herbert
b8d314a809 Tidy up updater namespace 2018-07-06 16:39:27 +09:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary 
Also fixes some typos and reduces spelling suggestions to hints.
 2018-07-05 15:54:41 +09:00
Dean Herbert
563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
6aa0ca5cc9 Add (one-way) migration for existing users 2018-06-21 14:22:25 +09:00
Dean Herbert
3819ecb2be Update framework 2018-06-19 20:19:52 +09:00
Dean Herbert
fd4f61fc88 Update framework and other packages 2018-06-08 21:51:43 +09:00
rootyElf
95bc312799
Update EntityFramework libraries 2018-06-07 15:48:06 +01:00
jai_
fdf2120852
Update notfication now points to new changelog page 2018-06-06 18:08:43 +01:00
Dean Herbert
2ec1fcd245 Fix incorrect using 2018-06-06 21:29:45 +09:00
Dean Herbert
115595251d Remove unnecessary reference in osu.Desktop 2018-06-05 15:02:34 +09:00
Dean Herbert
601ef3b6f7 Consume osu.Framework via nuget 2018-06-05 14:14:56 +09:00
Dean Herbert
6781807e23 Remove unnecessary EF tools references 2018-06-03 00:28:10 +09:00
Dean Herbert
d287e32faf Update project build configurations to target netcoreapp2.1 2018-06-02 22:20:17 +09:00
Dan Balasescu
1147ef61ed
Merge branch 'master' into long-path-fix 2018-05-31 15:32:47 +09:00
Dean Herbert
c18a5b5ac8 Fix importing long filenames from stable 2018-05-29 19:32:56 +09:00
Dean Herbert
749a69567b Add EF tooling references 2018-05-29 16:26:58 +09:00
Dean Herbert
d4e7f08c20 Bring entity framework up-to-date and re-enable transactions 2018-05-29 16:23:27 +09:00
Dean Herbert
e92166b40f Update csproj defaults 2018-05-02 16:33:48 +08:00
Dean Herbert
b37acf7510 Update squirrel version for net471 prereq support 2018-05-02 16:23:48 +08:00
Dean Herbert
de424648d2 Update to .NET 4.7.1 
Resolves #2368.
 2018-04-20 14:46:52 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
687c889345 Add back osu.Desktop versions (used in deploy) 2018-03-29 12:47:17 +09:00
Dean Herbert
9aae568bbe Tidy up csproj further 2018-03-28 15:19:56 +09:00
Dean Herbert
81a8385c8c Remove lingering reference to tests 2018-03-28 15:17:09 +09:00
Dean Herbert
94b1d3e4af Make VisualTests/nUnit work again 2018-03-28 12:33:01 +09:00
Dean Herbert
d76bc1a8ad Revert "Move NoWarns" 
This reverts commit 75a413a40e.
 2018-03-27 21:13:06 +09:00
Dean Herbert
524044d487 Add licence header to SquirrelUpdateManager 2018-03-27 19:19:28 +09:00
Dean Herbert
75a413a40e Move NoWarns 2018-03-27 19:19:09 +09:00
Dean Herbert
04a7754049 Make squirrel local so ifdef is nicer 2018-03-27 18:57:20 +09:00
Dean Herbert
1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
Dean Herbert
868a221b6c Fix VisualTests build configuration 2018-03-26 19:43:35 +09:00
smoogipoo
bdaba97d62 Merge remote-tracking branch 'smoogipoo/update-netstandard' into update-netstandard 2018-03-26 19:00:04 +09:00
Dean Herbert
0b38c8ec4f Fix some VS specific issues 2018-03-26 18:58:19 +09:00
smoogipoo
b9f456402a Re-implement OsuGameDesktop icon 2018-03-26 18:55:55 +09:00
smoogipoo
c6b9c4b588 Fix startup failures 2018-03-26 18:40:59 +09:00
smoogipoo
5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6 Only compile with net461 in visual studio 2018-03-26 15:44:55 +09:00
smoogipoo
76588a1029 Target WinExe to remove console window 2018-03-26 15:12:17 +09:00
smoogipoo
4dc317d4df Fix msbuild warnings 2018-03-25 03:38:52 +09:00
smoogipoo
0b2c1930bd Reference osu.Game.Tests in the desktop project 2018-03-25 02:28:10 +09:00
smoogipoo
ffa712dccb Fix post-merge issues 2018-03-24 15:19:45 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
e67d8e1354 Update nuspec to include humanizer localisations 2018-03-21 22:32:10 +09:00
Dean Herbert
db9b5ebaca Reduce complexity of code 2018-02-27 22:26:54 +09:00
TocoToucan
89bac13bf2 Fix profiles folder path 2018-02-27 22:06:32 +09:00
TocoToucan
714d7b4477 Do not use Multicore JIT on Mono 2018-02-27 22:06:32 +09:00
TocoToucan
ed99f26699 Use Multicore JIT 2018-02-27 22:06:32 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
Felix Ang
d294fcfb0b Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?) 2018-01-22 18:42:03 +01:00
Felix Ang
423559ec6c Update license year. 2018-01-22 18:22:38 +01:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines 
codefactor.io \(o.o)/
also one unnecessary semicolon
 2018-01-12 19:30:34 +01:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
smoogipoo
5b529511ec Update OpenTK nuget package 
Fixes the recent AppVeyor errors
 2017-12-27 13:18:34 +09:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager 
Also better handles delays before notifications are displayed.
 2017-12-25 20:53:23 +09:00
smoogipoo
a30270658d Merge remote-tracking branch 'origin/master' into netstandard 2017-12-01 18:50:28 +09:00
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
smoogipoo
0ec10ba32d CI fixes 2017-11-30 00:11:00 +09:00
smoogipoo
6003282e66 Give osu!lazer an application icon again 
Fixes https://github.com/ppy/osu/issues/1548.
 2017-11-22 22:07:55 +09:00
smoogipoo
d364603e45 Make registry checking work again 2017-11-22 20:02:31 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
smoogipoo
a66edea6dc Move sqlite batteries to osu.Desktop 
Fixes e_sqlite.dll not being copied to output on Windows
 2017-11-21 15:33:05 +09:00
Dean Herbert
62dcc316e2 Remove unnecessary using 2017-11-21 15:02:16 +09:00
Dean Herbert
8e63a7dd8d Handle more exceptions when checking for updates 
Should resolve #849.
 2017-11-21 14:42:49 +09:00
smoogipoo
e98d9e8a8c Explicitly define constant 2017-11-20 19:44:06 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
smoogipoo
e608d2841b Prefer net461 2017-11-20 16:10:34 +09:00
smoogipoo
067c018422 Cleanups 2017-11-19 17:31:35 +09:00
smoogipoo
5fd16c6268 Make osu.Desktop.Deploy work 2017-11-19 16:30:41 +09:00
smoogipoo
db4c912e1e Fix up assembly name 2017-11-19 14:46:51 +09:00
smoogipoo
440c1a9f83 Make osu.Desktop and osu.Game.Tests compile under net461+netstandard 2017-11-19 14:30:56 +09:00
smoogipoo
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09:00
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
smoogipoo
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo
3d6bb3befe Add startup argument to disable the version overlay 2017-11-11 22:56:02 +09:00
Dean Herbert
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
Dean Herbert
65b23f38f1 fixup! Allow version manager to load completely async 2017-10-24 10:08:42 +09:00
Dean Herbert
ae0029082a Allow version manager to load completely async 2017-10-24 10:08:42 +09:00
Dean Herbert
f66747b63d Merge branch 'master' into fix-missing-sqlite 2017-10-24 08:14:55 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project 
This allows tests to successfully retrieve rulesets, as they are referenced.
 2017-10-23 19:32:02 +09:00
Dean Herbert
b1d5fc523f Add sqlite raw packages to osu.Desktop to ensure sqlite is copied locally 2017-10-23 00:36:50 +09:00
Shane Woolcock
a9657d2142 Change beatmap import to use OpenTK's FileDrop event 2017-10-22 00:55:32 +10:30
Dean Herbert
7ce6167220 Merge branch 'master' into EfCore 2017-10-19 21:20:22 +09:00
Dean Herbert
365e2343a1 Remove AllRuleset references 2017-10-19 21:09:29 +09:00
Dean Herbert
a724a20b02 Remove duplicate reference to opentk package 2017-10-19 20:07:25 +09:00
Dean Herbert
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
Dean Herbert
a5ccf12e4a Fix ValueTuple mess 2017-10-16 14:04:04 +09:00
TocoToucan
5f083f10a7 Add System.ValueTuple NuGet package 2017-10-14 16:19:03 +03:00
Dean Herbert
179542daf1 Standardise AssemblyInfos 2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project 
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
 2017-10-14 14:33:05 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dan Balasescu
375fda4f8d Merge branch 'master' into remove-include 2017-09-18 15:12:07 +09:00
Dean Herbert
d62ad89150 Remove unnecessary Microsoft.Net.Http include 2017-09-18 14:10:59 +09:00
Dean Herbert
15d3a998fa Don't unlimit FPS for visual tests 2017-09-18 11:13:14 +09:00
Dean Herbert
db6437eea9 Remove very old defined constants 2017-09-14 17:58:42 +09:00
Dean Herbert
160f48bf85 Make VisualTests target 64 bit where possible 2017-09-14 17:55:56 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Dean Herbert
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
Dean Herbert
71af30d222 Remove redundant visibility changes 2017-08-22 22:48:50 +09:00
Dean Herbert
9f69aa9082 Show a notification after a successful update 
Allows access to the github changelog
 2017-08-22 19:41:39 +09:00
Dean Herbert
0ea6c65be6 Fix potentially racey behaviour of versionManager initialisation 
Changing the state while the container wasn't necessarily completed loading caused inconsistent behaviour.
 2017-08-22 19:34:06 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Jorolf
56caa6ef10 fix tests argument 2017-08-09 01:49:50 +02:00
Dean Herbert
fc97fdb8c1 Use a common build directory between both build ccnfigurations 
There's no need to build to VisualTests when they share everything
 2017-08-04 16:07:25 +09:00
Dean Herbert
7e89b1021d FirstOrDefault 2017-08-04 15:58:59 +09:00
Dean Herbert
104c25266d Add missing licence headers 2017-08-04 15:48:42 +09:00
Dean Herbert
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
 2017-08-03 14:36:21 +09:00
Dean Herbert
e7e822ecd5 Fix StableStorage having "Songs" in the path twice 2017-08-01 16:37:43 +09:00
Dean Herbert
941f3f0934 Tidy up osu-stable import process 
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
 2017-08-01 15:12:38 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
5f53426a9a *Database -> *Store 
Welcome back BeatmapManager
 2017-07-27 16:56:41 +09:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore 
Hide database functionality at a lower level in preparation from eventually making it private.
 2017-07-26 16:31:34 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
a5e610a7ba Update framework and fix compilation 
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
 2017-07-14 19:18:12 +03:00
Dean Herbert
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used 
Enforces at CI.
 2017-07-13 15:11:33 +09:00
Dean Herbert
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Dean Herbert
96189fa749 Fix crash on startup for release builds 2017-07-08 16:16:49 +09:00
Vlad K
5602f04611 CI fix 2017-06-27 04:23:58 +03:00
Vlad K
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03:00
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5 Update nuget packages 
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
 2017-06-13 11:50:46 +09:00
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
Dean Herbert
ce12cc20bd
Merge remote-tracking branch 'upstream/master' into remove-playmode 2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
c0338a82e7
Update nuget packages. 
Includes fix in OpenTK for focus issues.
 2017-04-12 19:35:16 +09:00
Dean Herbert
7d7bea7198
Fix crash on restart after update. 
Also make update process more graceful.
 2017-04-11 18:40:39 +09:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
smoogipooo
15db37d9e0 Cleanup. 2017-04-03 20:27:25 +09:00
smoogipooo
19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
e57de373a8
Add opentk to osu.Desktop's packages. 2017-03-31 09:02:55 +09:00
ElegantMonkey
5393525e3c Fix OpenTK hint on project file 2017-03-24 18:29:19 -03:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert
6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
Dean Herbert
0ec166f701
Remove broken dependency. 2017-03-15 21:50:28 +09:00
Dean Herbert
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader" 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
 2017-03-14 11:46:34 +09:00
Huo Yaoyuan
e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08:00
Huo Yaoyuan
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
Alex Amadori
c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
Alex Amadori
caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
Alex Amadori
7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Alex Amadori
1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Alex Amadori
309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
 2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert
9106c45858
Fix remaining errors. 2017-03-07 10:42:59 +09:00
Alex Amadori
fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
Dean Herbert
0ee38571a6
Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
Dean Herbert
ff51af94ec
Fail on drag drop operations with mixed files. 2017-03-06 15:03:58 +09:00
Dean Herbert
4e4408cd20 Merge branch 'master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
 2017-03-05 17:45:03 +09:00
Dean Herbert
65699eb39d
Fix missing .config files from nuspec. 
These are required to correctly redirect dll dependencies.
 2017-03-05 02:48:44 +09:00
Dean Herbert
95e2e2b027
Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
aa9d85624d
Change IPC to make sense. 2017-03-04 18:51:16 +09:00
Dean Herbert
b294386077
Remove misleading beatmap import method. 2017-03-04 16:47:37 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
 2017-03-04 13:17:01 +09:00
Dean Herbert
9a323226e3
Log errors with updating. 2017-03-03 18:09:38 +09:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
 2017-03-01 18:05:58 +01:00
Dean Herbert
b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
default0
03889e6ca6 Update References to FlowStrategies 
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
 2017-02-27 16:55:55 +01:00
Andrey Zavadskiy
9444ffd849 Removed redundant qualifiers 2017-02-27 17:37:38 +03:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Dean Herbert
5ff4028c29
Make beatmap importing async. 2017-02-24 18:12:50 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
74ea5e7343 Fix updates downloading in non-deploy builds. 2017-02-23 00:41:04 +09:00
Dean Herbert
b744f3a3a7
Re-nest code and handle even more potential exceptions. 2017-02-21 14:15:46 +09:00
Dean Herbert
461a22bccb
Add resiliency to update process when delta patching fails. 2017-02-21 13:52:52 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert
bc032aa0a6
Catch http errors in full update process (could happen during downloads too). 2017-02-21 12:58:56 +09:00
Andrey Zavadskiy
3106c52098 Removed unnecessary references 2017-02-19 13:25:41 +03:00