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