22dce64d6d
Merge branch 'master' into circular-button
2018-08-21 19:15:20 +09:00
85dc42d47a
Re-namespace/rename CircularButton
2018-08-15 16:49:53 +09:00
6ee06602b8
Merge branch 'master' into mania-mask-container
2018-08-02 20:41:27 +09:00
4bd811bd2d
Merge branch 'master' into circular-button
2018-08-02 20:25:45 +09:00
10b8708d4e
Make SetupCircularButton adjust corner radius by height
2018-08-01 17:47:32 +09:00
9eb47ae691
Make SetupCircularButton inherit OsuButton
2018-08-01 17:02:52 +09:00
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
c9d4332846
size_x, size_y -> width, height
2018-07-31 16:44:20 +09:00
c5a772bbc8
Completely reuse TriangleButton
2018-07-31 15:49:04 +09:00
93cf063c97
Remove useless things
2018-07-27 12:52:33 +03:00
1962797e20
Remove unnecessary using directive
2018-07-27 12:40:38 +03:00
78cde95132
Privatise constants
2018-07-27 12:34:11 +03:00
3ee1353976
Remove whitespace
2018-07-27 12:28:47 +03:00
2a819a53c0
Prefer inheriting TriangleButton instead of Container
2018-07-27 12:26:37 +03:00
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
206e3686f2
Add back blue border
2018-07-25 18:38:50 +09:00
b60e4b0728
Cleanup
2018-07-25 18:34:47 +09:00
6675c455f3
Trim whitespace that magically appeared
2018-07-24 22:33:19 +03:00
3ca112aef0
Clean code and apply requested changes
2018-07-24 22:04:02 +03:00
ebf14c9c93
Update framework from current master
2018-07-24 11:32:24 +03:00
d304aca08f
Merge branch 'master' into circular-button
2018-07-24 11:30:56 +03:00
4d0d4523ca
Add test case, rename component
2018-07-24 11:23:38 +03:00
0e50e4ee34
Clean code
2018-07-24 10:10:17 +03:00
765c6e4ecc
Remove custom text box
2018-07-24 09:46:24 +03:00
2f452c162c
Make text colour white
2018-07-24 09:21:01 +03:00
a833fa3d92
Update framework and apply suggested changes
2018-07-24 09:19:45 +03:00
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
7b4616c6c1
Add circular button file
2018-07-20 14:02:02 +03:00
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
9f730dd784
Merge branch 'editor-composer-cleanup' into mania-mask-container
...
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +09:00
577ff4cc7f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
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
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
54e60d8bc2
Fix test appveyor tests failing due to lack of audio manager
2018-06-18 19:27:22 +09:00
6d318d35ee
Fix not being able to seek by other means during flick-scroll
2018-06-18 18:56:54 +09:00
dbc50e35d5
Fix the timeline and editor fighting over track seeking
2018-06-18 18:02:26 +09:00
