19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into Cakefy_osu!
  miterosan · 2018-10-05 15:13:09 +02:00
  760c88e335
• Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
  miterosan · 2018-10-05 14:57:51 +02:00
  b394f8c5ad
• Use the coreclr instead of caketool, hoping that the version fixes running it on linux
  miterosan · 2018-10-05 14:57:09 +02:00
  6977b2825f
• Add config file
  miterosan · 2018-10-05 14:54:11 +02:00
  74e89fd945
• Update bindable only if enabled
  Paul Teng · 2018-10-05 07:13:18 -04:00
  8264dd49de
• Make user profile graph use a smooth path
  smoogipoo · 2018-10-05 15:45:53 +09:00
  f7ebd063c3
• Make SliderBody use the new SmoothPath
  smoogipoo · 2018-10-05 15:45:45 +09:00
  42664f1c19
• Merge pull request #3545 from smoogipoo/fix-alpha-colours

  Fix colours with alpha components not being parsed

  Dean Herbert · 2018-10-05 15:15:15 +09:00
  4ea4a0797f
• Fix incorrect result of ternary
  smoogipoo · 2018-10-05 12:06:24 +09:00
  794501cc5a
• Remove ugly if-statement
  smoogipoo · 2018-10-05 11:55:59 +09:00
  40c17cfa5a
• Fix colours with alpha components not being parsed
  smoogipoo · 2018-10-05 11:19:01 +09:00
  cb1703c6e2
• 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

  smoogipoo · 2018-10-05 10:40:16 +09:00
  ff559a3a1b
• PlayfieldLayer -> PlayfieldAdjustmentContainer
  smoogipoo · 2018-10-05 10:39:18 +09:00
  d0007c047a
• Merge branch 'master' into Cakefy_osu!
  miterosan · 2018-10-04 19:07:32 +02:00
  12d30cec42
• Also rename the cake project in the bootstrap script
  miterosan · 2018-10-04 19:02:59 +02:00
  5abe3a0233
• 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.

  miterosan · 2018-10-04 18:57:14 +02:00
  0724b47334
• Merge pull request #3539 from peppy/fix-last-visit-regression

  Fix last visit not supporting null values

  Dean Herbert · 2018-10-05 00:39:43 +09:00
  2018.1004.1 9d518ff3ab
• Fix last visit not supporting null values

  Can now be null if a user chooses to hide their online status

  Dean Herbert · 2018-10-05 00:25:40 +09:00
  716eee9a5c
• Merge branch 'master' into Cakefy_osu!
  miterosan · 2018-10-04 16:38:10 +02:00
  e47be64f91
• Merge pull request #3536 from ekrctb/3533-followup

  Remove duplicated code

  Dean Herbert · 2018-10-04 18:28:16 +09:00
  2018.1004.0 a4c4622070
• Remove duplicated code
  ekrctb · 2018-10-04 18:03:34 +09:00
  b9d0fc927b
• Merge pull request #3533 from peppy/fix-button-disable-regression

  Fix gameplay mouse button disable setting no longer having any effect

  Dan Balasescu · 2018-10-04 16:31:30 +09:00
  5fd0b29d9d
• Merge branch 'master' into fix-button-disable-regression
  Dan Balasescu · 2018-10-04 15:43:50 +09:00
  20391fd28c
• Merge pull request #3318 from cl8n/update-user-api

  Update LastVisit JSON property name

  Dean Herbert · 2018-10-04 13:56:37 +09:00
  d801ce7afb
• Move positional modifications to HitCirclePlacementMask
  smoogipoo · 2018-10-04 13:43:50 +09:00
  e931aa3d9e
• Fix hitcircle selections not responding to stacking changes
  smoogipoo · 2018-10-04 12:19:11 +09:00
  6a65802528
• Fix gameplay mouse button disable setting no longer having any effect

  Regressed at https://github.com/ppy/osu/commit/50091252e272564807e046b699d6619382a44891#diff-20562da8cde558aacafa9540b97b7975

  Dean Herbert · 2018-10-04 03:07:00 +09:00
  593dee202c
• Merge pull request #3521 from smoogipoo/fix-screenshot-cursor

  Fix cursor not hiding in screenshots

  Dean Herbert · 2018-10-04 02:48:11 +09:00
  62a51a9ff1
• Merge branch 'master' into fix-screenshot-cursor
  Dean Herbert · 2018-10-04 02:34:19 +09:00
  88bcc48204
• Fix StackHeight changes not causing position updates
  smoogipoo · 2018-10-03 17:06:18 +09:00
  1cd11a6e5b
• Fix 1-frame position discrepancy
  smoogipoo · 2018-10-03 17:05:22 +09:00
  7809ce9361
• Fix selection masks not being added for new objects
  smoogipoo · 2018-10-03 16:49:59 +09:00
  934b687965
• Keep the placement hitobject time up-to-date
  smoogipoo · 2018-10-03 16:44:37 +09:00
  34ed60830c
• Re-implement composition tools + implement placement masks
  smoogipoo · 2018-10-03 16:27:26 +09:00
  3420e0c7eb
• Implement an intermediary EditRulesetContainer
  smoogipoo · 2018-10-03 15:36:24 +09:00
  540a010fbb
• Fix up testcase
  smoogipoo · 2018-10-03 14:35:32 +09:00
  10d0e2fef1
• Split visuals of HitCircleSelectionMask into HitCircleMask
  smoogipoo · 2018-10-03 14:35:26 +09:00
  28b0ab6123
• Renamespace ruleset masks
  smoogipoo · 2018-10-03 13:45:41 +09:00
  1164108a95
• Rename HitObjectMask -> SelectionMask
  smoogipoo · 2018-10-03 13:28:00 +09:00
  4cdb6dcea5
• Merge pull request #3523 from ekrctb/handle-input-framework-update

  Update framework (UIEvent arg, HandleInput usage)

  Dan Balasescu · 2018-10-02 15:55:13 +09:00
  dbe055a877
• Adjust usage of Handle(Non)PositionalInput to follow framework update
  ekrctb · 2018-10-02 14:45:33 +09:00
  68980fc477
• Use UIEvent level getters for modifier keys.
  ekrctb · 2018-10-02 13:26:36 +09:00
  b7a2ad1aa5
• Adapt signature change of event handlers
  ekrctb · 2018-10-02 12:02:55 +09:00
  50091252e2
• Change signature to new event handler
  ekrctb · 2018-10-02 12:02:47 +09:00
  99fc04c8af
• Fix cursor not hiding in screenshots
  smoogipoo · 2018-10-02 10:12:07 +09:00
  97c585c54c
• Merge pull request #3505 from qwewqa/judgement-cleanup

  Move judgement text to internal container

  Dan Balasescu · 2018-10-02 09:50:30 +09:00
  0d70306794
• Merge branch 'master' into judgement-cleanup
  Dan Balasescu · 2018-10-02 09:37:04 +09:00
  0f51007867
• Merge pull request #3516 from AtomCrafty/fix-3514

  Hide resolution dropdown when starting in windowed mode

  Dan Balasescu · 2018-10-02 09:34:54 +09:00
  91a90ca34a
• Give the body a size
  Dan Balasescu · 2018-10-02 09:33:31 +09:00
  87d8945af9
• Merge branch 'master' into fix-3514
  Dan Balasescu · 2018-10-02 09:24:58 +09:00
  b1450b1f1a