Dean Herbert
da8b838438
Merge branch 'master' into ArrangeMod
2018-09-14 17:20:04 +09:00
Dean Herbert
a1328fb4e5
Merge branch 'master' into fix-system-user
2018-09-14 17:19:17 +09:00
Dan Balasescu
7a9fe15a27
Merge pull request #3416 from Hanamuke/fix_hyperdash
...
Fixes hyperdash computation (for nested objects)
2018-09-14 11:36:42 +09:00
Dan Balasescu
e9a522023b
Merge branch 'master' into fix_hyperdash
2018-09-14 11:27:27 +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
f280e910bb
Bump squirrel version
2018-09-14 04:26:30 +09:00
Dean Herbert
e430a3dd6a
Merge pull request #3414 from smoogipoo/judgement-fixes
...
Fix hitobjects getting masked away before receiving a result
2018-09-14 04:25:09 +09:00
Dean Herbert
c6b909e4a5
Merge branch 'master' into judgement-fixes
2018-09-14 04:03:54 +09:00
Hanamuke
9b6f5c9097
Fix redundant paranthesis
2018-09-13 17:29:10 +02:00
Hanamuke
7e07a07c01
Fix HitObjects being out of order because of nested objects
2018-09-13 17:15:46 +02:00
Hanamuke
7d3380db66
Fixed comment. Created static CatchArea.GetCatcheWidth method
2018-09-13 17:01:33 +02:00
Hanamuke
623f8bfaf5
Merge branch 'master' into fix_hyperdash
2018-09-13 16:52:55 +02: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
Dean Herbert
40f7c1bd99
Merge pull request #3411 from smoogipoo/texture-dispose-fix
...
Reference whether texture is available rather than disposed
2018-09-13 13:15:27 +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
dbcbd82554
Merge pull request #3397 from peppy/fix-collection-modified
...
Fix thread-safety of queued events list in ArchiveModelManager
2018-09-13 11:53:56 +09:00
Dan Balasescu
04f49200e2
Merge branch 'master' into fix-collection-modified
2018-09-13 11:43:48 +09:00
Dan Balasescu
9a590d5621
Merge pull request #3412 from peppy/fix-leaked-player-failures
...
Wait longer before confirming test players are cleaned up
2018-09-13 11:41:50 +09:00
Hanamuke
a3c3bfb1a8
Fixes hyperdash computation (for nested objects)
2018-09-12 19:48:35 +02: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
5e5a74293e
Merge pull request #3405 from peppy/update-framework
...
Update framework
2018-09-11 00:45:05 +09:00
Dean Herbert
144779c698
Update framework
2018-09-11 00:30:13 +09:00
Dean Herbert
591ce67e24
Merge pull request #3403 from smoogipoo/results-auto-scaling
...
Scale the results screen score to keep it in view
2018-09-10 18:40:49 +09:00
smoogipoo
92386edb32
Scale the results screen score to keep it in view
2018-09-10 18:13:44 +09:00
Dan Balasescu
f0a9801944
Merge pull request #3392 from peppy/online-texture-improvements
...
Use LargeTextureStore for all online texture retrieval
2018-09-10 12:02:16 +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
b14d5e9fdc
Merge pull request #3368 from peppy/framework-image-changes
...
Update in line with framework Image changes
2018-09-07 20:05:46 +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
20719439c6
Merge pull request #3339 from peppy/add-skin-import-delete
...
Add skin import and mass delete options
2018-09-07 18:27:47 +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
