miterosan
|
760c88e335
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-05 15:13:09 +02:00 |
|
miterosan
|
b394f8c5ad
|
Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
|
2018-10-05 14:57:51 +02:00 |
|
miterosan
|
6977b2825f
|
Use the coreclr instead of caketool, hoping that the version fixes running it on linux
|
2018-10-05 14:57:09 +02:00 |
|
miterosan
|
74e89fd945
|
Add config file
|
2018-10-05 14:54:11 +02:00 |
|
Paul Teng
|
8264dd49de
|
Update bindable only if enabled
|
2018-10-05 07:13:18 -04:00 |
|
smoogipoo
|
f7ebd063c3
|
Make user profile graph use a smooth path
|
2018-10-05 15:45:53 +09:00 |
|
smoogipoo
|
42664f1c19
|
Make SliderBody use the new SmoothPath
|
2018-10-05 15:45:45 +09:00 |
|
Dean Herbert
|
4ea4a0797f
|
Merge pull request #3545 from smoogipoo/fix-alpha-colours
Fix colours with alpha components not being parsed
|
2018-10-05 15:15:15 +09:00 |
|
smoogipoo
|
794501cc5a
|
Fix incorrect result of ternary
|
2018-10-05 12:06:24 +09:00 |
|
smoogipoo
|
40c17cfa5a
|
Remove ugly if-statement
|
2018-10-05 11:55:59 +09:00 |
|
smoogipoo
|
cb1703c6e2
|
Fix colours with alpha components not being parsed
|
2018-10-05 11:19:01 +09:00 |
|
smoogipoo
|
ff559a3a1b
|
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-10-05 10:40:16 +09:00 |
|
smoogipoo
|
d0007c047a
|
PlayfieldLayer -> PlayfieldAdjustmentContainer
|
2018-10-05 10:39:18 +09:00 |
|
miterosan
|
12d30cec42
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-04 19:07:32 +02:00 |
|
miterosan
|
5abe3a0233
|
Also rename the cake project in the bootstrap script
|
2018-10-04 19:02:59 +02:00 |
|
miterosan
|
0724b47334
|
Minify the buildscript and update to cake.0.30.0
Also remove the dependency on Cake.CoreCLR
cake.tool does not use the packages.config.
|
2018-10-04 18:57:14 +02:00 |
|
Dean Herbert
|
9d518ff3ab
|
Merge pull request #3539 from peppy/fix-last-visit-regression
Fix last visit not supporting null values
|
2018-10-05 00:39:43 +09:00 |
|
Dean Herbert
|
716eee9a5c
|
Fix last visit not supporting null values
Can now be null if a user chooses to hide their online status
|
2018-10-05 00:25:40 +09:00 |
|
miterosan
|
e47be64f91
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-04 16:38:10 +02:00 |
|
Dean Herbert
|
a4c4622070
|
Merge pull request #3536 from ekrctb/3533-followup
Remove duplicated code
|
2018-10-04 18:28:16 +09:00 |
|
ekrctb
|
b9d0fc927b
|
Remove duplicated code
|
2018-10-04 18:03:34 +09:00 |
|
Dan Balasescu
|
5fd0b29d9d
|
Merge pull request #3533 from peppy/fix-button-disable-regression
Fix gameplay mouse button disable setting no longer having any effect
|
2018-10-04 16:31:30 +09:00 |
|
Dan Balasescu
|
20391fd28c
|
Merge branch 'master' into fix-button-disable-regression
|
2018-10-04 15:43:50 +09:00 |
|
Dean Herbert
|
d801ce7afb
|
Merge pull request #3318 from cl8n/update-user-api
Update LastVisit JSON property name
|
2018-10-04 13:56:37 +09:00 |
|
smoogipoo
|
e931aa3d9e
|
Move positional modifications to HitCirclePlacementMask
|
2018-10-04 13:43:50 +09:00 |
|
smoogipoo
|
6a65802528
|
Fix hitcircle selections not responding to stacking changes
|
2018-10-04 12:19:11 +09:00 |
|
Dean Herbert
|
593dee202c
|
Fix gameplay mouse button disable setting no longer having any effect
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
|
2018-10-04 03:07:00 +09:00 |
|
Dean Herbert
|
62a51a9ff1
|
Merge pull request #3521 from smoogipoo/fix-screenshot-cursor
Fix cursor not hiding in screenshots
|
2018-10-04 02:48:11 +09:00 |
|
Dean Herbert
|
88bcc48204
|
Merge branch 'master' into fix-screenshot-cursor
|
2018-10-04 02:34:19 +09:00 |
|
smoogipoo
|
1cd11a6e5b
|
Fix StackHeight changes not causing position updates
|
2018-10-03 17:06:18 +09:00 |
|
smoogipoo
|
7809ce9361
|
Fix 1-frame position discrepancy
|
2018-10-03 17:05:22 +09:00 |
|
smoogipoo
|
934b687965
|
Fix selection masks not being added for new objects
|
2018-10-03 16:49:59 +09:00 |
|
smoogipoo
|
34ed60830c
|
Keep the placement hitobject time up-to-date
|
2018-10-03 16:44:37 +09:00 |
|
smoogipoo
|
3420e0c7eb
|
Re-implement composition tools + implement placement masks
|
2018-10-03 16:27:26 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
smoogipoo
|
10d0e2fef1
|
Fix up testcase
|
2018-10-03 14:35:32 +09:00 |
|
smoogipoo
|
28b0ab6123
|
Split visuals of HitCircleSelectionMask into HitCircleMask
|
2018-10-03 14:35:26 +09:00 |
|
smoogipoo
|
1164108a95
|
Renamespace ruleset masks
|
2018-10-03 13:45:41 +09:00 |
|
smoogipoo
|
4cdb6dcea5
|
Rename HitObjectMask -> SelectionMask
|
2018-10-03 13:28:00 +09:00 |
|
Dan Balasescu
|
dbe055a877
|
Merge pull request #3523 from ekrctb/handle-input-framework-update
Update framework (UIEvent arg, HandleInput usage)
|
2018-10-02 15:55:13 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +09:00 |
|
ekrctb
|
b7a2ad1aa5
|
Use UIEvent level getters for modifier keys.
|
2018-10-02 13:26:36 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
smoogipoo
|
97c585c54c
|
Fix cursor not hiding in screenshots
|
2018-10-02 10:12:07 +09:00 |
|
Dan Balasescu
|
0d70306794
|
Merge pull request #3505 from qwewqa/judgement-cleanup
Move judgement text to internal container
|
2018-10-02 09:50:30 +09:00 |
|
Dan Balasescu
|
0f51007867
|
Merge branch 'master' into judgement-cleanup
|
2018-10-02 09:37:04 +09:00 |
|
Dan Balasescu
|
91a90ca34a
|
Merge pull request #3516 from AtomCrafty/fix-3514
Hide resolution dropdown when starting in windowed mode
|
2018-10-02 09:34:54 +09:00 |
|
Dan Balasescu
|
87d8945af9
|
Give the body a size
|
2018-10-02 09:33:31 +09:00 |
|
Dan Balasescu
|
b1450b1f1a
|
Merge branch 'master' into fix-3514
|
2018-10-02 09:24:58 +09:00 |
|