h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 13:52:57 +08:00
Code Issues Releases Wiki Activity
55,277 Commits 6 Branches 666 Tags 365 MiB
6db8f51c02
Commit Graph

158 Commits

Author SHA1 Message Date
Dean Herbert
1ef2a4c46f Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-04-03 16:23:33 +09:00
Dean Herbert
d6f17a5ecd Bring nuget packages up to date 2019-03-22 02:41:21 +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
628b3e1119 Move osu-resources to nuget 2019-01-28 18:33:39 +09:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Dean Herbert
bb4b54799f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-20 15:57:20 +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
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
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
3276f0f54d Update ef/sqlite version 2018-08-30 14:58:00 +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
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
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
563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
Dean Herbert
6aa0ca5cc9 Add (one-way) migration for existing users 2018-06-21 14:22:25 +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
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
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
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
d76bc1a8ad Revert "Move NoWarns" 
This reverts commit 75a413a40e.
 2018-03-27 21:13:06 +09:00
Dean Herbert
75a413a40e Move NoWarns 2018-03-27 19:19:09 +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
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
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
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
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
smoogipoo
e98d9e8a8c Explicitly define constant 2017-11-20 19:44:06 +09:00
smoogipoo
e608d2841b Prefer net461 2017-11-20 16:10:34 +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
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +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
Dean Herbert
365e2343a1 Remove AllRuleset references 2017-10-19 21:09:29 +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
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
Dean Herbert
d62ad89150 Remove unnecessary Microsoft.Net.Http include 2017-09-18 14:10:59 +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
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
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Vlad K
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03: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
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Adrian Kaz Scherzinger
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +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
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
0ec166f701
Remove broken dependency. 2017-03-15 21:50:28 +09:00
Huo Yaoyuan
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
Dean Herbert
b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
Andrey Zavadskiy
3106c52098 Removed unnecessary references 2017-02-19 13:25:41 +03:00
Andrey Zavadskiy
e803564b5a Added the specific exception 2017-02-18 13:46:47 +03:00
Dean Herbert
874af48de6 Merge remote-tracking branch 'upstream/master' into installer-updater 2017-02-12 17:18:04 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Dean Herbert
6aa0e7729c Add icon and window title. 2017-02-12 15:03:36 +09:00
Dean Herbert
0cd149eda4 Stop using embedded manifest, add AssemblyInfo. 2017-02-12 14:54:07 +09:00
Dean Herbert
49ae976af6 Add squirrel dependencies. 2017-02-12 14:52:10 +09:00
default0
299c4923c3 Implement Beatmap Import via drag&drop 2017-02-05 13:32:08 +01:00