23466 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
  Dean Herbert · 2019-11-12 10:44:53 +09:00
  b37bf4ea01
• Implement stateful menu items (#6760)

  Implement stateful menu items
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-11-12 10:40:25 +09:00
  2a7761bd56
• Merge branch 'master' into stateful-menu-items
  Dean Herbert · 2019-11-12 10:31:50 +09:00
  52ab309295
• Merge pull request #6802 from smoogipoo/edit-fadeout-time

  Increase fade-out time of hitobjects in the editor

  Dean Herbert · 2019-11-12 10:30:50 +09:00
  5da4db6889
• Merge pull request #6809 from huoyaoyuan/code-style

  Port code style updates from framework

  Dan Balasescu · 2019-11-12 10:27:29 +09:00
  5818a362da
• Rename button class
  Dean Herbert · 2019-11-12 10:21:06 +09:00
  5bb65d0716
• Merge remote-tracking branch 'upstream/master' into code-style
  Dean Herbert · 2019-11-12 10:11:47 +09:00
  576b7b3f95
• Merge pull request #6811 from recapitalverb/master

  Fix capitalisation in README.md

  Dean Herbert · 2019-11-12 10:07:10 +09:00
  dbabecc449
• Move to const and add some xmldoc for future visitors
  Dean Herbert · 2019-11-12 10:02:42 +09:00
  8402fb1490
• Merge remote-tracking branch 'upstream/master' into edit-fadeout-time
  Dean Herbert · 2019-11-12 09:53:16 +09:00
  662318a635
• Fix remaining proper nouns
  Joseph Madamba · 2019-11-11 08:53:05 -08:00
  9efcc6addd
• Fix capitalisation and grammar in README.md
  recapitalverb · 2019-11-11 22:53:16 +07:00
  810cfab870
• Update README.md

  Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>

  recapitalverb · 2019-11-11 22:37:15 +07:00
  851b414e98
• Fix capitalisation in README.md
  recapitalverb · 2019-11-11 22:15:19 +07:00
  e690a8a301
• Turn off some more not applied styles.
  Huo Yaoyuan · 2019-11-11 21:02:48 +08:00
  1ef645a710
• Add dotnet format check.
  Huo Yaoyuan · 2019-11-11 20:32:32 +08:00
  d385862267
• Apply other styles.
  Huo Yaoyuan · 2019-11-11 20:27:04 +08:00
  e9b8cbb516
• Save iOS projects with BOM to avoid VS continuously changing them.
  Huo Yaoyuan · 2019-11-11 20:13:13 +08:00
  d8482448dc
• Apply brace style.
  Huo Yaoyuan · 2019-11-11 20:13:13 +08:00
  ccc8aa6fa4
• Copy configs from framework repo.
  Huo Yaoyuan · 2019-11-11 20:13:12 +08:00
  3d1c31f2ae
• Remove redundant package references in iOS props (#6808)

  Remove redundant package references in iOS props

  Dean Herbert · 2019-11-11 20:30:53 +09:00
  28afc9e162
• Remove redundant package references in iOS props.
  Huo Yaoyuan · 2019-11-11 19:00:19 +08:00
  9c1a9c29e4
• Combine similar tests
  Dean Herbert · 2019-11-11 19:09:38 +09:00
  54da8e4035
• Remove unused constructor
  Dean Herbert · 2019-11-11 19:00:14 +09:00
  82cc6aa0c5
• Bump Newtonsoft.Json from 12.0.2 to 12.0.3 (#6806)

  Bump Newtonsoft.Json from 12.0.2 to 12.0.3
  
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>

  Dean Herbert · 2019-11-11 18:58:47 +09:00
  1155f0b0de
• Rename ThreeState -> TernaryState and add basic tests
  Dean Herbert · 2019-11-11 18:56:18 +09:00
  bed62e0d2f
• Move tests to parent namespace for now
  Dean Herbert · 2019-11-11 18:42:32 +09:00
  ce4843be22
• Merge branch 'master' into stateful-menu-items
  Dean Herbert · 2019-11-11 18:33:50 +09:00
  c0f6e4687a
• Bump Newtonsoft.Json from 12.0.2 to 12.0.3

  Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.2 to 12.0.3.
  - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
  - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...12.0.3)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-11-11 09:26:56 +00:00
  a345fd8a86
• Merge pull request #6671 from huoyaoyuan/infrastructure

  Port merged tooling updates from framework

  Dan Balasescu · 2019-11-11 16:16:56 +09:00
  97075c49e9
• Merge branch 'master' into infrastructure
  Dan Balasescu · 2019-11-11 16:02:05 +09:00
  f27398e899
• Merge pull request #6801 from smoogipoo/edit-disable-input

  Disable ruleset input in the editor

  Dean Herbert · 2019-11-11 15:34:07 +09:00
  9a88b901eb
• Increase fade-out time of hitobjects in the editor
  smoogipoo · 2019-11-11 13:06:41 +09:00
  3b13ad480a
• Disable ruleset input in the editor
  smoogipoo · 2019-11-11 13:04:43 +09:00
  e924a5d51e
• Merge pull request #6769 from peppy/fix-broken-tourney-tests

  Fix incorrect DI usage in some tournament screen tests

  Dan Balasescu · 2019-11-11 12:46:02 +09:00
  cceb982f57
• Merge branch 'master' into fix-broken-tourney-tests
  Dan Balasescu · 2019-11-11 11:51:20 +09:00
  0396da2170
• Update readme
  Dean Herbert · 2019-11-11 11:32:06 +09:00
  990a82cd06
• Update rider configurations
  Dean Herbert · 2019-11-11 11:31:55 +09:00
  93f1c3c152
• Update .gitignore
  Dean Herbert · 2019-11-11 11:31:42 +09:00
  5e70e1e53f
• Merge remote-tracking branch 'upstream/master' into infrastructure
  Dean Herbert · 2019-11-11 11:11:59 +09:00
  fd7bdc03ab
• Remove horizontal padding on toolbar ruleset selector (#6780)

  Remove horizontal padding on toolbar ruleset selector

  Dean Herbert · 2019-11-11 10:02:30 +09:00
  9db73d33cc
• Merge pull request #6752 from smoogipoo/fix-mania-compose-crash

  Fix possible crash when loading mania compose screen

  Dean Herbert · 2019-11-10 17:42:27 +09:00
  7d5b6226a9
• Merge branch 'master' into infrastructure
  Dean Herbert · 2019-11-09 16:23:58 +09:00
  45e1501c02
• Disallow voting for own comments (#6663)

  Disallow voting for own comments
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-11-09 16:23:36 +09:00
  86963f430f
• Reorder conditional
  Dean Herbert · 2019-11-09 16:23:22 +09:00
  5c47641608
• Remove horizontal padding on toolbar ruleset selector
  Joehu · 2019-11-08 20:28:24 -08:00
  b675024161
• Merge branch 'master' into vote-pill-fix
  Dean Herbert · 2019-11-09 12:15:48 +09:00
  683916967c
• Merge pull request #6772 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-11-09 00:00:41 +09:00
  88d5749647
• Update framework
  Dean Herbert · 2019-11-08 23:28:22 +09:00
  2dd514012a
• Merge branch 'master' into infrastructure
  Huo Yaoyuan · 2019-11-08 21:19:59 +08:00
  6ebe02f409