Hanamuke
b983e20067
Merge branch 'master' into AR_Catch
2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc
Move judgement text to internal container
2018-09-30 04:01:33 -04:00
Dean Herbert
862d3c4a69
Add back autojoins
2018-09-28 19:33:35 +09:00
Dean Herbert
3cacc11af1
Fix outdated API variable
2018-09-28 19:33:30 +09:00
Dean Herbert
6841d5c2ec
Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework
2018-09-28 18:32:59 +09:00
Dean Herbert
d3eb24e70a
Fix score retrieval no longer working
2018-09-28 18:29:49 +09:00
Dean Herbert
9baf587246
Bump framework again
2018-09-28 18:25:40 +09:00
Dean Herbert
e1c187b641
Merge remote-tracking branch 'origin/update-chat-api' into update-framework
2018-09-28 18:23:09 +09:00
smoogipoo
3539874262
Add missing scale
...
Makes about a 1px difference.
2018-09-28 11:40:13 +09:00
Dean Herbert
d5d8a28b53
Add explanatory comment about startup channel joins
2018-09-28 10:01:25 +09:00
Dean Herbert
6a763334a1
Exit early as safety when no messages are received
2018-09-28 10:00:40 +09:00
Dean Herbert
f0b1aa7edf
Fix unnecessary messages retrieval
2018-09-27 20:04:22 +09:00
smoogipoo
1c242556ca
Add comments + cleanup
2018-09-27 17:40:28 +09:00
smoogipoo
8191f03503
Implement HitCircleFont skin configuration
2018-09-27 17:40:28 +09:00
smoogipoo
0d8276c5f8
Implement skinnable sprite text
2018-09-27 17:40:28 +09:00
smoogipoo
b84994e643
Make GetTexture return the post-scaled texture
2018-09-27 17:40:28 +09:00
Dean Herbert
a4bf21268b
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:59:18 +09:00
Dean Herbert
6f3c8e9f8b
Add explicit usage via attribute
2018-09-26 19:58:58 +09:00
Dean Herbert
16d74a5983
Merge pull request #3465 from plankp/patch-1
...
Check if object to be deleted actually exists
2018-09-26 19:53:51 +09:00
Dean Herbert
2ed7785cfc
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:50:48 +09:00
Dean Herbert
1b77d9fd05
Merge branch 'update-chat-api' into update-framework
2018-09-26 19:50:23 +09:00
Dean Herbert
a77a55d71d
Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework
2018-09-26 19:49:41 +09:00
Dean Herbert
b8f19f8640
Merge branch 'master' into judgement-size-fix
2018-09-26 19:42:09 +09:00
Dean Herbert
5197bf77e4
Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions
...
Fix files with upper-case extensions failing to import correctly
2018-09-26 19:40:00 +09:00
Dean Herbert
1fd2782dd4
Fix loading spinner not disappearing on empty channels
2018-09-26 19:15:02 +09:00
Dean Herbert
2436ee589d
Remove incorrect API response
2018-09-26 19:13:38 +09:00
smoogipoo
e259911875
Use invariant tolower
2018-09-26 18:44:03 +09:00
Dan Balasescu
e71e871d1f
Remove unnecessary comment
2018-09-26 18:41:55 +09:00
Dan Balasescu
3a5e380e46
Merge branch 'master' into judgement-size-fix
2018-09-26 18:36:12 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760
Update chat to work with new API version
2018-09-25 20:53:24 +09:00
smoogipoo
cb500e80e4
Make BeatmapInfoWedge present until info is not null
2018-09-25 14:45:26 +09:00
Paul Teng
319ed1bf0f
Reorder if statement
2018-09-24 21:35:13 -04:00
Paul Teng
dd36b6a381
Remove unused field storage
2018-09-24 21:08:58 -04:00
Paul Teng
b95cc798b2
Remove unused fallback
2018-09-24 20:56:18 -04:00
Paul Teng
62df0ec7d4
Handle external files with File instead
2018-09-24 07:16:19 -04:00
Kyle Chang
7a43677849
Make judgements scale with cs
2018-09-22 22:54:38 -04:00
Dean Herbert
6efecc4b35
Fix files with upper-case extensions failing to import correctly
2018-09-23 05:23:49 +09:00
Dean Herbert
dafbabec31
Fix import buttons having incorrect mappings when setting disabled states
2018-09-21 21:08:21 +09:00
Paul Teng
ed0ea3ad41
Merge branch 'master' into patch-1
2018-09-21 06:31:15 -04:00
smoogipoo
4380ef15bf
Fix potential exception during async load callback
2018-09-21 16:31:09 +09:00
Dan Balasescu
c1604145df
Merge branch 'master' into background-brightness
2018-09-21 16:20:32 +09:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7
Make Playfield not a ScalableContainer
2018-09-21 14:02:32 +09:00
Paul Teng
f01dfc2860
Merge branch 'master' into patch-1
2018-09-20 23:45:44 -04:00
Paul Teng
eaf7697b85
Add boolean return value
2018-09-20 23:21:27 -04:00
Dean Herbert
293a5dd099
Use string interpolation
2018-09-21 11:50:36 +09:00
Paul Teng
654345f380
Remove duplicate condition test
2018-09-20 22:32:24 -04:00
Paul Teng
1644719893
Update SongSelect.cs
2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a
Test if there are beatmaps when click on delete btn
2018-09-20 22:00:20 -04:00
Paul Teng
52877eca83
Update ArchiveModelManager.cs
2018-09-20 20:01:04 -04:00
Dean Herbert
83bf38f4bc
Make menu background blurrable
...
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510
Fade menu background a bit when menu is active
2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5
Use random default background on starting the game
2018-09-21 03:12:20 +09:00
Dean Herbert
fa33e0bd6b
Fix background brightness being adjusted globally
2018-09-21 02:51:14 +09:00
Paul Teng
199d76217e
Merge branch 'master' into patch-2
2018-09-20 06:47:42 -04:00
Dean Herbert
aa453f8ff8
Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework
2018-09-20 19:03:49 +09:00
Dean Herbert
1861547c86
Apply review
2018-09-20 19:01:04 +09:00
Dean Herbert
37f3035437
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-20 18:39:48 +09:00
Dean Herbert
5ee4130351
Update framework reference
2018-09-20 18:39:44 +09:00
Dan Balasescu
4b907336c5
Move readonly field above ctor
2018-09-20 13:17:17 +09:00
smoogipoo
62135c39aa
Cleanup
2018-09-20 12:56:39 +09:00
smoogipoo
04cd68f970
Hide status pill when status is none
2018-09-20 12:53:45 +09:00
smoogipoo
7b8094d731
Move text size/padding out of constructor
2018-09-20 12:53:45 +09:00
Hanamuke
309d8c8cb4
CI
2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae
Remove ScrollingVisualisation from settings
2018-09-19 18:30:25 +02:00
Dean Herbert
ae4c371bec
Merge branch 'update-framework-event-handling' into update-framework
2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5
Merge branch 'localisation-changes' into update-framework
2018-09-20 00:29:31 +09:00
smoogipoo
73fb3fa3a4
Fix macOS crashing in fullscreen mode
2018-09-19 17:52:35 +09:00
smoogipoo
38a3c2a820
Fix song select wedge sometimes not updating when localisation changes
2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4
Apply changes in-line with framework localisation changes
2018-09-19 14:07:46 +09:00
ekrctb
b790e16217
Use Click instead of now removed TriggerOnClick
2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
ekrctb
c8e9d9375f
Use new InputStateChangeEvent for RulesetInputManager
2018-09-19 11:36:55 +09:00
Hanamuke
6d229716e7
Remove unused using directives
2018-09-18 20:42:55 +02:00
Hanamuke
2afcdb1451
Add the file
2018-09-18 20:23:25 +02:00
Hanamuke
e3cc25a96a
Implement ConstantScrollingSpeedVisualiser
2018-09-18 20:21:10 +02:00
Dan Balasescu
ad31962643
Cleanup, use similar code to everywhere else
2018-09-18 15:27:21 +09:00
LastExceed
27ea6102bc
only return true on Mclick
2018-09-18 08:07:19 +02:00
Dan Balasescu
af6618a239
Merge branch 'master' into close-chattabs-with-Mclick
2018-09-18 14:52:56 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status
2018-09-18 14:10:42 +09:00
Dan Balasescu
9f1f879f3d
Merge branch 'master' into music-controller-topmost
2018-09-18 13:56:13 +09:00
Dan Balasescu
29e023b252
Merge branch 'master' into fix_combo
2018-09-18 12:54:51 +09:00
smoogipoo
aba1de8b1a
Cleanup
2018-09-18 12:54:07 +09:00
Paul Teng
8bfd981a50
Handle directory checking before entering task
2018-09-17 21:05:28 -04:00
Paul Teng
000beea01b
Merge branch 'master' into patch-2
2018-09-17 15:20:54 -04:00
LastExceed
ed01f3067f
Merge branch 'master' into close-chattabs-with-Mclick
2018-09-15 18:05:01 +02:00
LastExceed
fce9740f28
return true since we are handling the action
2018-09-15 18:00:47 +02:00
Dean Herbert
00d0613053
Fix new resharper redundant parenthesis inspections
2018-09-16 00:09:17 +09:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Paul Teng
d469748612
Reformat code
2018-09-15 09:53:59 -04:00
Paul Teng
42b2c32222
Catch directory not found exception
2018-09-15 09:47:50 -04:00
Dean Herbert
6a1e2c6fa5
Update efcore packages
2018-09-15 18:49:01 +09:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead
2018-09-15 18:33:22 +09:00
Dean Herbert
79b56cb35c
Make saveState private
2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2
Simplify implementation
2018-09-15 14:51:04 +09:00
Hanamuke
3e7006ec1f
Fix fonction name
2018-09-14 19:52:32 +02:00
Hanamuke
c8d3776c79
Remove uneeded brackets
2018-09-14 19:46:04 +02:00
Hanamuke
347cb0a1b5
Check for type conversion, mais the update recursive
2018-09-14 19:41:29 +02:00
Hanamuke
a17200a66a
Merge branch 'master' into fix_combo
2018-09-14 18:48:13 +02:00
LastExceed
9f546bd484
close tab on Mclick
2018-09-14 13:50:35 +02:00
Dean Herbert
1662575f88
Merge branch 'master' into replay_keycounter
2018-09-14 19:08:54 +09:00
Dean Herbert
a1328fb4e5
Merge branch 'master' into fix-system-user
2018-09-14 17:19:17 +09:00
Hanamuke
b8afd01950
Merge branch 'master' into fix_combo
2018-09-13 21:55:19 +02:00
Hanamuke
1c2cc3837a
Compute combo for nested Objects. Display fruit depending on Combo for
...
osu!catch
2018-09-13 21:52:15 +02:00
Dean Herbert
c6b909e4a5
Merge branch 'master' into judgement-fixes
2018-09-14 04:03:54 +09:00
Unknown
04853b8c83
don't show StatusPill without a difficulty
2018-09-13 13:49:57 +02:00
Unknown
638a2e5ba8
populate Status for Beatmap + BeatmapSet
...
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
Unknown
5414ce9932
add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet
2018-09-13 10:18:20 +02:00
Unknown
13b988053a
add status column to BeatmapInfo + BeatmapSetInfo
2018-09-13 10:10:58 +02:00
Unknown
221a99d886
fix StatusPill not setting text when initially set with NONE
2018-09-13 10:07:26 +02:00
Dean Herbert
4341d258af
Make readonly instead
2018-09-13 14:03:21 +09:00
Dean Herbert
0be3ba946f
Fix system user attempting to show in profile overlay
2018-09-13 13:40:46 +09:00
smoogipoo
067bc39185
Update nuget package
2018-09-13 12:47:26 +09:00
Dan Balasescu
96b4cb7821
Merge branch 'master' into texture-dispose-fix
2018-09-13 11:54:23 +09:00
Dan Balasescu
04f49200e2
Merge branch 'master' into fix-collection-modified
2018-09-13 11:43:48 +09:00
smoogipoo
356a60b561
Fix hitobjects in scrolling rulesets getting masked away
2018-09-12 15:14:51 +09:00
Dean Herbert
02313c6d6e
Wait longer before confirming test players are cleaned up
2018-09-11 13:21:05 +09:00
smoogipoo
9b0954ab81
Reference whether texture is available rather than disposed
2018-09-11 11:28:02 +09:00
Dean Herbert
7c7f0e11e3
Merge branch 'master' into fix-logo-overhead
2018-09-11 01:22:44 +09:00
Dean Herbert
144779c698
Update framework
2018-09-11 00:30:13 +09:00
smoogipoo
92386edb32
Scale the results screen score to keep it in view
2018-09-10 18:13:44 +09:00
Dean Herbert
55372496d1
Fix thread-safety of queued events list in ArchiveModelManager
2018-09-09 22:37:15 +09:00
Dean Herbert
27ac7685e1
Bring music controller in front of notification overlay
2018-09-09 22:12:37 +09:00
Dean Herbert
f149a66a4d
Use LargeTextureStore for all online texture retrieval
...
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885 .
2018-09-09 02:45:37 +09:00
Dean Herbert
0f9aa834e5
Fix osu! logo being present throughout the whole game
2018-09-08 16:31:59 +09:00
Roman Kapustin
125b569ccb
Change AudioClock type to IFrameBasedClock and comment its usage
2018-09-07 21:39:41 +03:00
Roman Kapustin
dae54d252d
Remove redundant checks in RestoreState
2018-09-07 21:35:32 +03:00
Dean Herbert
6c150c9ed7
Remove unnecessary override
2018-09-08 03:21:42 +09:00
Dean Herbert
c1cdff8505
Add default resolution to avoid crashing
2018-09-07 19:29:51 +09:00
Dean Herbert
cc533a05c5
Update framework
2018-09-07 19:00:43 +09:00
Dean Herbert
7cca990be4
Merge remote-tracking branch 'upstream/master' into framework-image-changes
2018-09-07 18:56:00 +09:00
Dean Herbert
bb67f1a361
Merge remote-tracking branch 'upstream/master' into add-skin-import-delete
2018-09-07 18:18:03 +09:00
Dean Herbert
75d2cb199c
Fix formatting
2018-09-07 18:14:27 +09:00
Dean Herbert
168dbe9329
Fix error notification
2018-09-07 18:14:23 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete
2018-09-07 16:48:01 +09:00
Dean Herbert
2c0ba401d5
Add ability to click on imported complete notification to present last import
2018-09-07 16:30:11 +09:00
Dean Herbert
bf0ad723f5
Add default fallback for headless operation
2018-09-07 14:35:38 +09:00
Dean Herbert
f76d00e8ae
Simplify null checks
2018-09-07 14:31:38 +09:00
Dean Herbert
8b217ad803
Merge branch 'master' into select_resolution_in_fullscreen_mode
2018-09-07 14:25:10 +09:00
Dean Herbert
1327aed164
Update framework again
2018-09-06 19:23:19 +09:00
Dean Herbert
01389f0443
Merge remote-tracking branch 'upstream/master' into update-framework-with-everyrthing
2018-09-06 18:04:58 +09:00
Dean Herbert
da906c0ddf
Update framework
2018-09-06 18:03:27 +09:00
Dean Herbert
a1780fddc9
DrawInfo -> DrawColourInfo
2018-09-06 18:02:04 +09:00
Dean Herbert
ab7c0ccd18
Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing
2018-09-06 18:00:54 +09:00
Dean Herbert
966101e50e
Merge branch 'framework-refcount-changes' into update-framework-with-everyrthing
2018-09-06 18:00:36 +09:00
Dean Herbert
2ba7885e58
Merge branch 'unload-carousel-panels' into update-framework-with-everyrthing
2018-09-06 18:00:25 +09:00
Dean Herbert
6a783f7521
Merge pull request #3347 from peppy/load-fonts-earlier
...
Begin loading fonts earlier in startup
2018-09-06 17:58:24 +09:00
Dean Herbert
58063faee3
Merge pull request #3367 from peppy/remove-async-working-baetmap-logic
...
Remove async WorkingBeatmap logic
2018-09-06 17:57:45 +09:00
Dean Herbert
4e012042ab
Fix renaming variables too eagerly
2018-09-06 17:57:09 +09:00
Dean Herbert
80bab8e898
Merge pull request #3346 from peppy/api-ref-reduction
...
Don't use ConcurrentQueue for API
2018-09-06 17:55:40 +09:00
Dean Herbert
d05cd52d9a
Run the queue faster if multiple requests are pending
2018-09-06 17:38:15 +09:00
Dean Herbert
1f47714786
Merge pull request #3355 from peppy/fix-toolbar-blip
...
Fix the toolbar being visible during startup causing a weird offset
2018-09-06 17:35:24 +09:00
Dean Herbert
c23b9b61a8
Simplify implementation in line with framework improvements
2018-09-06 17:28:08 +09:00
Dean Herbert
5848c16f5d
Merge branch 'master' into api-ref-reduction
2018-09-06 17:18:35 +09:00
Dean Herbert
a9d4b56aeb
Merge branch 'master' into fix-web-request-schedules
2018-09-06 17:18:09 +09:00
Dean Herbert
ccd7c1a17d
Cancel request on disposal for safety
2018-09-06 17:04:33 +09:00
Dean Herbert
2356588508
Merge branch 'master' into replay_keycounter
2018-09-06 16:10:38 +09:00
Dean Herbert
91aada8be5
Fix ScaleAdjust going missing
2018-09-06 14:20:55 +09:00
Dean Herbert
e63f60231a
Optimise carousel memory usage by unloading off-screen panels
2018-09-06 13:31:37 +09:00
Dean Herbert
29b0d62f21
Changes in line with framework refcount changes
2018-09-06 13:29:57 +09:00
Dean Herbert
89a92ab7eb
Fix potential thread-safety issue
2018-09-06 13:27:53 +09:00
Dean Herbert
8d9e0ff1c3
Remove async WorkingBeatmap logic
2018-09-06 12:51:23 +09:00
Roman Kapustin
7a1fdd9dc8
Reset KeyCounter if targetState was not found
2018-09-06 01:01:36 +03:00
Dean Herbert
9b753bb429
Merge pull request #3321 from peppy/fix-importing
...
Fix order of import set conflict checks
2018-09-05 18:51:15 +09:00
smoogipoo
d5acc96efa
Apply changes in line with osu!framework changes
2018-09-05 14:59:37 +09:00
Joehu
77455e4463
Fix direct list play button disappearing after preview/switch
2018-09-04 19:44:49 -07:00
Dean Herbert
581da108fc
Rewrite to not suck
2018-09-05 11:32:38 +09:00
Dean Herbert
46b6601cbf
Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode
2018-09-05 10:47:34 +09:00
Dean Herbert
da3eb18784
Fix the toolbar being visible during startup causing a weird offset
2018-09-05 10:46:19 +09:00
Dean Herbert
923acfbeaf
Fix some web requests being run after disposal of their owner
2018-09-05 10:26:54 +09:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter
2018-09-05 08:53:02 +09:00
Dean Herbert
02437d9bbf
Merge branch 'master' into api-ref-reduction
2018-09-03 21:57:30 +09:00
Dean Herbert
5efa9c7652
Fix items in skin settings not always being removed corrrectly
2018-09-03 11:51:03 +09:00
Dean Herbert
43824c2a94
Switch back to default skin when the user selected skin is deleted
2018-09-03 11:50:50 +09:00
Dean Herbert
fb1e8fbdcf
Remove migration code
2018-09-03 10:23:56 +09:00
Dean Herbert
fa569e5ae4
Offer to import skins on first startup
2018-09-03 10:10:39 +09:00
Dean Herbert
e67f63eab6
Improve import progress messaging
2018-09-03 10:10:04 +09:00
Dean Herbert
144e80dff6
Add "import all skins from stable" option (and mass delete)
2018-09-03 10:10:04 +09:00
Dean Herbert
d9e9c61731
Begin loading fonts earlier in startup
...
Should result in a considerably faster font load, as they can be concurrently loaded alongside EF.
2018-09-01 17:48:03 +09:00
Dean Herbert
e503878956
Merge branch 'master' into master
2018-09-01 17:31:04 +09:00
Dean Herbert
562a792a99
Use thread instead of LongRunning for API
2018-09-01 13:19:22 +09:00
Dean Herbert
bf6fb1c380
Don't use ConcurrentQueue for API
...
This queue type can hold several references to already dequeued requests. In our usage, this can cause old api calls to hold references to already-disposed screens (and in turn, very large memory portions).
2018-09-01 12:56:09 +09:00
Dean Herbert
62a8245f11
Update framework
2018-09-01 10:59:04 +09:00
Dean Herbert
4c72565936
Update framework
2018-08-31 19:20:10 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
37bae8c840
Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework
2018-08-30 14:58:25 +09:00
Dean Herbert
3276f0f54d
Update ef/sqlite version
2018-08-30 14:58:00 +09:00
Dean Herbert
9fb78852de
Update framework
2018-08-30 14:58:00 +09:00
Dean Herbert
68a79f895a
Fix mania throwing an exception on start of map
2018-08-30 14:58:00 +09:00
Dean Herbert
2ff48da5af
Merge branch 'master' into fix-startup-webrequests
2018-08-30 14:43:29 +09:00
Dean Herbert
b1a3dfedd1
Reduce async-await pairs
2018-08-30 14:41:16 +09:00
smoogipoo
327bc708d7
Fix DirectOverlay performing webrequests on startup
2018-08-30 14:41:09 +09:00
Dean Herbert
20817fdf1d
Avoid using symbol windows can't diplay
2018-08-30 14:34:45 +09:00
unknown
499c5d28ff
Refactored variable names in OsuGame.cs for improved code readability.
2018-08-29 18:04:51 -04:00
Dean Herbert
4b54c65d3f
Fix single file component loading not actually working correctly
2018-08-29 15:11:02 +09:00
Dean Herbert
73c764d983
Update SpriteIcon
2018-08-29 03:36:01 +09:00
Dean Herbert
919e78a89a
Attempt to fix cross-thread database usage
2018-08-29 01:42:25 +09:00
smoogipoo
da2f04c79c
Update framework once more
2018-08-28 21:06:32 +09:00
Dean Herbert
0d4aa37a91
Fix order of import set conflict checks
2018-08-28 02:53:32 +09:00
smoogipoo
e7a5816d27
Use GetAsync for all samples
2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
smoogipoo
21d5322899
Update with async changes
2018-08-27 17:05:58 +09:00
clayton
e1f01d6f73
Update LastVisit JSON property name
2018-08-25 20:31:33 -07:00
Dean Herbert
5c7ff31675
Add note about null return
2018-08-25 14:51:42 +09:00
Dean Herbert
8204d3292e
Log to correct file
2018-08-25 14:50:46 +09:00
smoogipoo
aeb4d47c06
Remove skipping part of message
2018-08-24 18:07:39 +09:00
smoogipoo
99574ecad8
Softly handle errors when no beatmap file exists in archive
2018-08-24 17:57:39 +09:00
Dean Herbert
59d6ccbaab
Update framework
2018-08-24 15:27:13 +09:00
Dean Herbert
196fc03180
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-08-24 15:26:46 +09:00
Dean Herbert
ffcad6e0f1
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
...
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
Dan Balasescu
83ca3053c5
Merge branch 'master' into break-overlay-double-parallax
2018-08-24 15:10:28 +09:00
Dan Balasescu
2fee90dbd8
Merge branch 'master' into fix-notifications-too-early
2018-08-24 15:02:17 +09:00
smoogipoo
55370165c0
Compare with invariant culture
2018-08-24 10:12:30 +09:00
smoogipoo
407968bb7e
Log the format line when a decoder isn't found
2018-08-24 10:03:56 +09:00
smoogipoo
90ebabd2db
Fix nullref
2018-08-23 15:21:36 +09:00
smoogipoo
c7db407832
Fix operation cancelled exception when changing visual settings
2018-08-23 14:53:16 +09:00
Dean Herbert
9f3f07df2e
Fix notifications appearing too early in load process
2018-08-23 11:21:56 +09:00
smoogipoo
8f261988f7
Log all files when no beatmap files in archive error occurs
2018-08-23 10:59:21 +09:00
Dean Herbert
9cbead55d6
Add a second parallax layer to break overlay arrows
2018-08-22 17:41:13 +09:00
Dean Herbert
1c3614d6e8
Merge branch 'master' into no-objects-logging
2018-08-22 16:42:21 +09:00
Dean Herbert
985528d08b
Merge branch 'master' into more-import-logging
2018-08-22 16:30:55 +09:00
Dean Herbert
f1c6dfd735
Change grammar slightly
2018-08-22 16:22:29 +09:00
Dean Herbert
c6df93c438
Merge branch 'master' into invalid-obj-types
2018-08-22 16:21:17 +09:00
smoogipoo
2fb62827e2
Soft-handle errors when beatmap contains no objects
2018-08-22 16:01:58 +09:00
smoogipoo
551581e5cd
Skip invalid hitobject types, log error instead
2018-08-22 15:59:58 +09:00
smoogipoo
bdd618a99d
Log the archive when failing to create model
2018-08-22 15:42:43 +09:00
smoogipoo
df84889646
Handle invalid origins as Anchor.TopLeft
2018-08-22 14:50:03 +09:00
smoogipoo
50b8daf939
Fix threads being cross-disposed from DatabaseContextFactory
2018-08-22 14:07:52 +09:00
smoogipoo
ce367bcc42
Fix invalid GC latency mode being set
2018-08-22 12:02:14 +09:00
Dean Herbert
859e2504c0
Merge pull request #3268 from peppy/update-framework
...
Update framework
2018-08-21 21:13:08 +09:00
Dean Herbert
4cd21fabf3
Remove extra newlines
2018-08-21 19:16:07 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button
2018-08-21 19:15:20 +09:00
Dean Herbert
c97548804e
Update framework
2018-08-21 18:46:44 +09:00
Dan Balasescu
c4264794e0
Merge branch 'master' into relax
2018-08-21 12:11:10 +09:00
smoogipoo
fcf98390f5
Cleanup
2018-08-21 12:10:00 +09:00
smoogipoo
541c4daa81
Use ordinal string comparison in hot paths
2018-08-21 11:10:54 +09:00
Dan Balasescu
1d50dacacd
Merge branch 'master' into catch-cancelled
2018-08-21 10:24:11 +09:00
Dan Balasescu
9d2c679f12
Merge branch 'master' into fix-logo-flying
2018-08-21 10:16:03 +09:00
Dean Herbert
4a68b14447
Fix crash when selecting mods after entering play mode
...
Closes #3260 .
2018-08-21 00:15:51 +09:00
Dean Herbert
7add4a8cc7
Update framework
2018-08-20 18:26:34 +09:00
Dean Herbert
295ccabf64
Expand out on to multiple lines
2018-08-20 16:06:12 +09:00
Dean Herbert
39aa98d12d
Fix logo flying off-screen when exiting game
2018-08-20 14:58:02 +09:00
Dean Herbert
65dc9f44e5
Catch OperationCanceledException in single file load sequence
2018-08-20 14:42:37 +09:00
Dean Herbert
18aa30fcb0
Unbind song select's ruleset to avoid test failures
2018-08-20 14:27:32 +09:00
Dean Herbert
e982901205
Merge remote-tracking branch 'smoogipoo/screenshot-fix' into update-framework
2018-08-20 13:38:07 +09:00
Dean Herbert
6b0ed4a68d
Update framework
2018-08-20 13:37:59 +09:00
Dean Herbert
6a4ff19c90
Merge branch 'master' into relax
2018-08-17 23:17:07 +09:00
smoogipoo
9a1e92800b
Adjust with framework-side screenchanges
2018-08-17 14:30:44 +09:00