smoogipoo
|
40ed3fdd05
|
Fix possible incorrect order of events due to threaded load
|
2018-06-21 18:45:32 +09:00 |
|
smoogipoo
|
b2066c5d73
|
Rework preview tracks to reduce usage complexities
|
2018-06-21 18:40:27 +09:00 |
|
Dean Herbert
|
5c63b3ddac
|
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-21 17:24:15 +09:00 |
|
Dean Herbert
|
6ec0aaee91
|
Split out logic for subsequent log message and apply action to only itself
|
2018-06-21 14:50:42 +09:00 |
|
Dean Herbert
|
87d94591e4
|
Start displaying notifications earlier
Also show important notifications and more in total.
|
2018-06-21 14:43:38 +09:00 |
|
Dean Herbert
|
ed17a241f5
|
Decrease notification font size
|
2018-06-21 14:43:02 +09:00 |
|
Dean Herbert
|
6aa0ca5cc9
|
Add (one-way) migration for existing users
|
2018-06-21 14:22:25 +09:00 |
|
smoogipoo
|
ab2889da1f
|
Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays
|
2018-06-21 13:24:02 +09:00 |
|
Dean Herbert
|
74f732038f
|
Add documentation for negative values of ParallaxAmount
|
2018-06-21 12:49:07 +09:00 |
|
Dean Herbert
|
5f2d1d4a1e
|
Dim TestCase background a bit
|
2018-06-21 12:48:44 +09:00 |
|
Dean Herbert
|
733b7d1177
|
Merge branch 'master' into ParallaxContainerImprovement
|
2018-06-21 12:10:10 +09:00 |
|
Dean Herbert
|
65487d1610
|
Merge branch 'master' into improve-volume-controls
|
2018-06-21 11:56:56 +09:00 |
|
Dean Herbert
|
2a42418dbf
|
Tidy up ReadyButton
|
2018-06-21 10:21:54 +09:00 |
|
Dean Herbert
|
4c068097c8
|
Change required child to use same structure as other use cases
|
2018-06-21 10:12:12 +09:00 |
|
Dean Herbert
|
96100a2200
|
Remove schedule logic (seems unnecessary)
|
2018-06-20 17:41:48 +09:00 |
|
Dean Herbert
|
39649747aa
|
Simplify and synchronise multiplayer screen transitions
|
2018-06-20 17:25:22 +09:00 |
|
Dean Herbert
|
f0c72438a3
|
Group ValueChanged attachment with bindings
|
2018-06-20 17:06:02 +09:00 |
|
Dean Herbert
|
3f020a2802
|
Merge branch 'master' into multiplayer-match
|
2018-06-20 14:49:32 +09:00 |
|
Dean Herbert
|
3eb0a17978
|
Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
|
2018-06-20 10:45:43 +09:00 |
|
Dean Herbert
|
d7f65d62e0
|
Use vertical/horizontal pair instead
|
2018-06-20 10:45:35 +09:00 |
|
Dan Balasescu
|
77e03a59a9
|
Merge branch 'master' into ruleset-container
|
2018-06-19 21:47:10 +09:00 |
|
Tom Arrow
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
Dean Herbert
|
b8f9caf418
|
Merge branch 'master' into multiplayer-match
|
2018-06-19 17:18:33 +09:00 |
|
Michael Manis
|
a0f1143287
|
Add padding to 'show more' button
|
2018-06-18 19:14:44 -04:00 |
|
smoogipoo
|
8c671f93fc
|
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-18 19:32:04 +09:00 |
|
smoogipoo
|
54e60d8bc2
|
Fix test appveyor tests failing due to lack of audio manager
|
2018-06-18 19:27:22 +09:00 |
|
smoogipoo
|
6d318d35ee
|
Fix not being able to seek by other means during flick-scroll
|
2018-06-18 18:56:54 +09:00 |
|
smoogipoo
|
dbc50e35d5
|
Fix the timeline and editor fighting over track seeking
|
2018-06-18 18:02:26 +09:00 |
|
Dean Herbert
|
c74c059044
|
Merge branch 'master' into multiple_previews_different_overlays
|
2018-06-18 05:05:27 +09:00 |
|
Dean Herbert
|
1d9d240454
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-18 04:41:17 +09:00 |
|
Dean Herbert
|
b1d059a67d
|
Add some colours to the compose-mode timeline
|
2018-06-18 04:31:47 +09:00 |
|
Dean Herbert
|
bec6e3083e
|
Remove scrollbar depth change as scrollbar is hidden now
|
2018-06-18 03:19:21 +09:00 |
|
Dean Herbert
|
d58ef96a23
|
Merge branch 'master' into timeline-markers
|
2018-06-18 03:14:04 +09:00 |
|
Dean Herbert
|
31f9d0161d
|
Add a comment about precision scroll behaviour
|
2018-06-18 03:03:09 +09:00 |
|
Dean Herbert
|
ae160baa6e
|
Merge branch 'master' into timeline-input-adjustment
|
2018-06-18 02:54:25 +09:00 |
|
Dean Herbert
|
48613ea1f6
|
Merge branch 'master' into timeline-markers
|
2018-06-18 02:09:20 +09:00 |
|
Dean Herbert
|
a20ec0d4cc
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:21 +09:00 |
|
Dean Herbert
|
e0ee5e2085
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:16 +09:00 |
|
HoutarouOreki
|
faff7feef1
|
Remove unnecessary white space change
|
2018-06-15 15:03:09 +02:00 |
|
HoutarouOreki
|
6938adc148
|
Unify join time text's visual format with the web
|
2018-06-15 15:00:41 +02:00 |
|
HoutarouOreki
|
38feb7651c
|
Set text at updateTime
|
2018-06-15 14:34:01 +02:00 |
|
HoutarouOreki
|
d122547c1e
|
DrawableJoinDate handles "Here since the beginning" text
|
2018-06-15 14:28:49 +02:00 |
|
HoutarouOreki
|
f0fbc04d92
|
Adjust formats to be EN-UK
|
2018-06-15 14:11:21 +02:00 |
|
Dean Herbert
|
57011ff13b
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-15 18:33:40 +09:00 |
|
Dean Herbert
|
a6437c005c
|
Merge branch 'master' into diffcalc-rework
|
2018-06-15 18:02:18 +09:00 |
|
Dean Herbert
|
5d105cd08d
|
Avoid errors being logged when importing beatmaps while logged out
|
2018-06-15 17:23:03 +09:00 |
|
Dan Balasescu
|
234ed04cdd
|
Merge branch 'master' into remove-migrate-exception
|
2018-06-15 17:22:34 +09:00 |
|
Dean Herbert
|
db9141a6cf
|
Merge branch 'master' into fix-music-controller-drag
|
2018-06-15 17:08:01 +09:00 |
|
Dan Balasescu
|
aaf3ef240e
|
Remove easily-confused comment
|
2018-06-15 17:07:07 +09:00 |
|
Dean Herbert
|
8b5a9c3236
|
Merge branch 'master' into fix-volume-pixellation
|
2018-06-15 16:45:15 +09:00 |
|
Dean Herbert
|
a2950b1d80
|
Fix incorrect comment
|
2018-06-15 16:12:18 +09:00 |
|
Dean Herbert
|
1c27ef644a
|
Fix music controller drag activating from anywhere on the screen
|
2018-06-15 16:12:11 +09:00 |
|
Dean Herbert
|
2ff7b4cdcf
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-15 14:34:01 +09:00 |
|
Dean Herbert
|
036c57833b
|
Merge branch 'master' into conversion-test-improvements
|
2018-06-15 14:26:37 +09:00 |
|
Joehu
|
069d939e29
|
Remove "from" prefix from sources on direct panels
|
2018-06-14 21:53:01 -07:00 |
|
Dan Balasescu
|
98cafa106f
|
Merge branch 'master' into fix-volume-pixellation
|
2018-06-15 13:44:18 +09:00 |
|
Dean Herbert
|
4a19f22b3d
|
Remove custom migration exception
This was hiding the true error message from ever hitting logs.
Made to help disagnose #2711.
|
2018-06-15 13:38:42 +09:00 |
|
smoogipoo
|
b63e9f29d4
|
Merge branch 'conversion-test-improvements' into catch-droplet-fix
|
2018-06-14 21:38:16 +09:00 |
|
Dean Herbert
|
d259b31893
|
Fix empty line
|
2018-06-14 21:38:08 +09:00 |
|
Dean Herbert
|
cb73f215ac
|
Add check for player screens too
|
2018-06-14 21:38:08 +09:00 |
|
Dean Herbert
|
caeddc861a
|
Add test for WorkingBeatmap leakage
|
2018-06-14 21:38:08 +09:00 |
|
smoogipoo
|
a4d2364083
|
Add one more newline
|
2018-06-14 21:29:08 +09:00 |
|
smoogipoo
|
b99b520656
|
Allow convertmapping to be extended
|
2018-06-14 21:25:33 +09:00 |
|
smoogipoo
|
024d2abfe0
|
Always generate mappings/convert values as soon as objects are converted
# Conflicts:
# osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
|
2018-06-14 21:25:23 +09:00 |
|
smoogipoo
|
8d0e7abdd6
|
Some rulesets don't have a beatmap processor
|
2018-06-14 21:23:11 +09:00 |
|
smoogipoo
|
5e66b02108
|
Process beatmap before generating mappings
|
2018-06-14 21:22:56 +09:00 |
|
smoogipoo
|
8f7334874c
|
Fix up performance calculators
|
2018-06-14 16:04:48 +09:00 |
|
smoogipoo
|
540b43313e
|
Remove PP test cases (osu-tools/osu-server should be used instead)
|
2018-06-14 15:57:06 +09:00 |
|
smoogipoo
|
b7a06b9594
|
Restructure of DifficultyCalculator to cleanup mod + attribute handling
|
2018-06-14 15:32:07 +09:00 |
|
smoogipoo
|
1431ee1867
|
Remove unused method
|
2018-06-14 14:46:25 +09:00 |
|
Dean Herbert
|
b318b770d4
|
Fix pixellation of volume meter progress bars
|
2018-06-13 19:22:39 +09:00 |
|
Dean Herbert
|
cee5be1d56
|
Improve precision wheel adjustment handling
|
2018-06-13 17:03:56 +09:00 |
|
Dean Herbert
|
e0b68e4e09
|
Fix hide re-schedule not triggering on noop state change
|
2018-06-13 16:47:10 +09:00 |
|
Dean Herbert
|
a55bf82fd9
|
Handle hover blocking in VolumeOverlay to ensure correct hide scheduling
|
2018-06-13 16:46:56 +09:00 |
|
Dean Herbert
|
2a18625b2c
|
Correctly block scroll events when hovering controls
|
2018-06-13 16:46:27 +09:00 |
|
Dean Herbert
|
2cc7953421
|
Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls
|
2018-06-13 16:14:20 +09:00 |
|
Dean Herbert
|
0fdb04f57d
|
Fix empty line
|
2018-06-13 15:43:18 +09:00 |
|
Dean Herbert
|
3ac90511c9
|
Merge branch 'master' into fix-memory-leak
|
2018-06-13 15:27:39 +09:00 |
|
Dean Herbert
|
39738a997e
|
Add check for player screens too
|
2018-06-13 15:26:23 +09:00 |
|
Dan Balasescu
|
cbb883614a
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-13 15:18:52 +09:00 |
|
Dean Herbert
|
14f5c814a6
|
Add test for WorkingBeatmap leakage
|
2018-06-13 15:12:10 +09:00 |
|
Dan Balasescu
|
0e0e64895a
|
Merge branch 'master' into mania-step-interval
|
2018-06-13 13:55:27 +09:00 |
|
Dean Herbert
|
a7ed3ea80b
|
Rename alwaysVisible to explain where it comes from
|
2018-06-13 11:38:15 +09:00 |
|
Dean Herbert
|
d9e7a324c0
|
Revert HudOverlay to private field
|
2018-06-13 11:30:22 +09:00 |
|
smoogipoo
|
ca3186f34c
|
Create dependencies before children are loaded
|
2018-06-12 19:51:35 +09:00 |
|
smoogipoo
|
67aa52fb1d
|
Use bindable binding
|
2018-06-12 19:34:49 +09:00 |
|
Dan Balasescu
|
126678c226
|
Merge branch 'master' into multiple_previews_different_overlays
|
2018-06-12 19:26:51 +09:00 |
|
Dean Herbert
|
bcfb092e53
|
Change step to 200
|
2018-06-12 18:03:45 +09:00 |
|
smoogipoo
|
c70c7a476b
|
Always display the key counter during replay/autoplay
|
2018-06-12 17:59:59 +09:00 |
|
smoogipoo
|
3b396e38ca
|
Hide the scrollbar
|
2018-06-12 15:51:48 +09:00 |
|
smoogipoo
|
aaf2f66594
|
Make scrolling only zoom the timeline
|
2018-06-12 15:51:36 +09:00 |
|
smoogipoo
|
6ceac8ab0a
|
Add a centre marker to the timeline
|
2018-06-12 14:34:28 +09:00 |
|
Dan Balasescu
|
f71b0456e8
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-12 14:23:05 +09:00 |
|
smoogipoo
|
30b7b7961f
|
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
|
2018-06-12 14:22:27 +09:00 |
|
Dan Balasescu
|
80ec0b1839
|
Merge branch 'master' into populate-missing-online-ids
|
2018-06-12 14:03:23 +09:00 |
|
Dean Herbert
|
ae136e89a4
|
Merge branch 'master' into ruleset-configs
|
2018-06-12 13:13:18 +09:00 |
|
Dan Balasescu
|
0a35a81c2d
|
Merge branch 'master' into populate-missing-online-ids
|
2018-06-12 13:11:21 +09:00 |
|
Dean Herbert
|
37ea4c273b
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
|
2018-06-11 20:17:41 +09:00 |
|
Dean Herbert
|
8092d70402
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
|
2018-06-11 20:17:33 +09:00 |
|