63ec36b3be
Explicitly handle null settings case + add annotations
2018-06-11 12:57:56 +09:00
b219c17115
Move dependency creation under ctor
2018-06-11 12:57:26 +09:00
aaa65c428f
Merge branch 'master' into diffcalc-modtypes
2018-06-09 23:35:17 +09:00
d3570df64f
Merge pull request #2764 from peppy/update-dependencies
...
Update framework and other packages
2018-06-08 22:07:25 +09:00
a5ddae3f37
Merge pull request #2763 from peppy/revert-update-subtree
...
Revert InputManager UpdateSubTree change
2018-06-08 22:06:55 +09:00
fd4f61fc88
Update framework and other packages
2018-06-08 21:51:43 +09:00
a880e626d8
Use for loop and SetLayoutPosition
2018-06-08 21:20:15 +09:00
1e7bffe5e3
Merge branch 'master' into badge-ordering
2018-06-08 21:13:35 +09:00
9bdb3113ce
Revert "Always update children when ruleset input manager is updated"
...
This reverts commit 4eb7a34944
2018-06-08 21:05:28 +09:00
803598c3d0
Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader
2018-06-08 20:54:14 +09:00
ecc0f5e575
Use Any() instead of Count()
2018-06-08 20:54:09 +09:00
064e8190be
Add basic documentation
2018-06-08 20:53:58 +09:00
59e5a8556f
Fix volume control adjustment being extreme when precision scrolling
2018-06-08 18:15:03 +09:00
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader
2018-06-08 16:28:25 +09:00
0fae49ee21
Don't add a 'with Video' subtitle.
2018-06-07 20:47:27 -03:00
b3cab35a2c
Update EntityFramework libraries
...
Updated Microsoft.EntityFrameworkCore.Sqlite and Microsoft.EntityFrameworkCore.Sqlite.Core to 2.1.0 to enable the app to run on arm linux platforms. This also updates SQLitePCLRaw.lib.e_sqlite3.linux from 1.1.7 to 1.1.11. While 1.1.7 only provides native libraries for linux-x64 and linux-x86, 1.1.11 adds alpine-x64, linux-arm, linux-arm64, linux-armel and linux-musl-x64.
2018-06-07 15:46:31 +01:00
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
ef287eaa7f
Merge branch 'master' into fix-menu-notifications
2018-06-07 15:35:30 +09:00
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
621be3bbfc
Merge branch 'master' into disallow-beatmap-change
2018-06-07 00:38:40 +09:00
b59c45ca57
Merge branch 'master' into fix-database-migration-failure
2018-06-06 22:44:35 +09:00
ee6f107f08
Merge remote-tracking branch 'upstream/master' into peppy-fix-import-path-failures
2018-06-06 22:12:10 +09:00
a60c888ae5
Add comment about reasoning for local context variable
2018-06-06 22:05:25 +09:00
00b4a2519f
Update framework
2018-06-06 21:22:22 +09:00
ea1336d243
Merge remote-tracking branch 'upstream/master' into nuget-consumption
2018-06-06 21:09:51 +09:00
70478e2216
Merge remote-tracking branch 'upstream/master' into fix-import-path-failures
2018-06-06 20:55:51 +09:00
c756a89daf
Standardise path
2018-06-06 20:55:42 +09:00
2e23da1dfa
Merge branch 'master' into beatmap-set-downloader
2018-06-06 20:32:58 +09:00
18fc63bac2
Add back removed using
2018-06-06 20:32:37 +09:00
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
ebcfe97ccf
Expose Dependencies from base OsuTestCase
2018-06-06 20:25:40 +09:00
f2ac5b8b2d
CreatePlayer shouldn't receive a beatmap
2018-06-06 20:21:47 +09:00
e77084bec4
Give OsuScreen a mutable BindableBeatmap
2018-06-06 20:19:53 +09:00
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
a645a109be
Merge branch 'master' into overlay-activation
2018-06-06 19:18:28 +09:00
0a97b8ae25
Implement DebugUtils locally
...
Has been removed from framework
2018-06-06 18:33:10 +09:00
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
5a4408e359
Merge remote-tracking branch 'upstream/master' into nuget-consumption
2018-06-06 18:22:22 +09:00
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
aaaa8a3b7c
match Bindable names
2018-06-06 09:55:16 +02:00
83ff47ec80
Rewrite difficulty mod combinations
2018-06-06 16:20:17 +09:00
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
9e25e02696
Ensure notifications don't appear during UserTriggered mode
...
Closes #2640 .
2018-06-06 15:50:24 +09:00
d1fd09ed47
Rename variables
2018-06-06 15:49:27 +09:00
7819be7957
Remove unused using.
2018-06-06 03:28:07 -03:00
