1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00
Commit Graph

104 Commits

Author SHA1 Message Date
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
Dean Herbert
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00
Dean Herbert
d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Dean Herbert
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Drew DeVault
94f2898f52 Implement beatmap sending/receiving over IPC 2016-10-13 12:18:04 +09:00
Drew DeVault
bc69aa1455 Initial support code for beatmap loading 2016-10-12 11:32:40 -04:00
Dean Herbert
656aee41e2 Never Prefer32bit. 2016-10-08 15:54:04 +09:00
Dean Herbert
4f2bb25853 Remove "Deploy" configuration. 2016-10-08 15:54:03 +09:00
Dean Herbert
6cbbeaaac0 Initial commit. 2016-08-26 14:41:47 +09:00