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
d2c5fa72dc
Make appveyor only compile net461
2018-03-26 16:03:25 +09:00
smoogipoo
e5df2946aa
Bump OpenTK version + update submodules
2018-03-26 15:49:16 +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
3f9b14704e
Fix extra semicolon
2018-03-26 13:30:58 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
FreezyLemon
46d859a660
exit player earlier if a dummy map is loaded
2018-03-25 13:25:48 +02:00
smoogipoo
4dc317d4df
Fix msbuild warnings
2018-03-25 03:38:52 +09:00
smoogipoo
c21e820a45
One more level of nesting (we can do this better in the future)
2018-03-25 02:43:45 +09:00
smoogipoo
0b2c1930bd
Reference osu.Game.Tests in the desktop project
2018-03-25 02:28:10 +09:00
smoogipoo
31920f1866
Fix ruleset resources not getting included in build
2018-03-25 02:12:01 +09:00
smoogipoo
097ab66182
Fix resharper error
2018-03-25 01:54:25 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
John Neijzen
7b39447213
Update OsuAutoGenerator.cs
2018-03-24 18:34:56 +08:00
John Neijzen
bee9af8500
Update OsuAutoGenerator.cs
2018-03-24 18:30:36 +08:00
John Neijzen
9d96aeb347
Update OsuAutoGenerator.cs
2018-03-24 17:53:50 +08:00
John Neijzen
12f785bf40
Change duplicate condition to HitResult.Good instead of HitResult.Meh
2018-03-24 17:48:43 +08:00
Dean Herbert
0e669c9a3f
Fix many warnings
2018-03-24 18:23:22 +09:00
John Neijzen
97be022e22
Remove duplicate condition
2018-03-24 16:55:39 +08:00
Dean Herbert
9d9b9d50bc
User nuget OpenTK package
2018-03-24 17:49:23 +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
Dan Balasescu
c9276ce2b8
Merge pull request #2298 from peppy/performance-logging-toggle
...
Add setting to toggle performance logging
2018-03-24 14:14:15 +09:00
Dean Herbert
76886c8e3f
Merge branch 'master' into performance-logging-toggle
2018-03-24 13:32:49 +09:00
Dan Balasescu
bbb2f421b1
Merge pull request #2304 from peppy/fix-1x-skin-elements
...
Fix @1x skin elements not being used
2018-03-24 13:19:59 +09:00
Dean Herbert
1996698817
Fix @1x skin elements not being used
2018-03-24 11:40:45 +09:00
Dean Herbert
923f96d940
Merge branch 'master' into performance-logging-toggle
2018-03-24 11:36:20 +09:00
Dean Herbert
5e624de4b2
Merge pull request #2301 from peppy/keep-more-deltas
...
Increase deploy delta keep
2018-03-24 11:34:24 +09:00
Dan Balasescu
6dadcb9068
Merge branch 'master' into keep-more-deltas
2018-03-24 11:19:37 +09:00
Dan Balasescu
01a6d772e8
Merge pull request #2300 from peppy/fix-skin-event-again
...
Move binding to LoadComplete
2018-03-24 11:19:18 +09:00
Dean Herbert
7115e4390e
Update framework
2018-03-24 11:18:24 +09:00
Dean Herbert
ade97f8c0c
Increase deploy delta keep
2018-03-24 05:58:59 +09:00
Dean Herbert
3844e95656
Fix one more instance of the same thing happening
2018-03-24 05:55:56 +09:00
Dean Herbert
256baf6d60
Move binding to LoadComplete
...
Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.
2018-03-24 05:40:51 +09:00
Dean Herbert
b593c47809
Add setting to toggle performance logging
2018-03-24 05:07:48 +09:00
Dean Herbert
092ba4833e
Merge pull request #2296 from smoogipoo/fix-background-fade
...
Fix beatmap background fade not being updated on retry
2018-03-24 04:06:13 +09:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade
2018-03-24 03:40:13 +09:00
Dean Herbert
802ef3e3ff
Merge pull request #2293 from peppy/fix-api-abort
...
Fix API never stopping its thread
2018-03-24 03:34:01 +09:00
Dean Herbert
0976e83b33
Merge branch 'master' into fix-api-abort
2018-03-24 03:13:28 +09:00
Dan Balasescu
19900bb949
Merge pull request #2290 from Joehuu/add-perfect-mod-icon
...
Add perfect mod icon
2018-03-23 21:51:45 +09:00
Dan Balasescu
1576b31a48
Merge branch 'master' into add-perfect-mod-icon
2018-03-23 21:32:15 +09:00
Dan Balasescu
8f1db1c4b4
Merge pull request #2255 from peppy/fix-mod-button-sounds
...
Fix mod button sounds playing when mod overlay is not visible
2018-03-23 21:32:05 +09:00
Dan Balasescu
676feb3658
Merge branch 'master' into fix-mod-button-sounds
2018-03-23 21:03:42 +09:00
Dan Balasescu
15b33af6c8
Merge pull request #2292 from peppy/fix-player-disposal
...
Fix player not getting disposed in some scenarios
2018-03-23 21:01:22 +09:00
smoogipoo
f0c0a51108
Convert APIAccess to use cancellation tokens
2018-03-23 20:57:04 +09:00
