15172 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence
  smoogipoo · 2018-11-22 13:04:32 +09:00
  d1ec9fc294
• Merge pull request #3754 from peppy/match-framework-inspections

  Change for-loop inspection to match framework

  Dan Balasescu · 2018-11-22 11:15:23 +09:00
  304a731d2e
• Change for-loop inspection to match framework
  Dean Herbert · 2018-11-22 10:26:05 +09:00
  bbb36198a4
• Fix join process for PMs being incorrect
  Dean Herbert · 2018-11-21 20:44:41 +09:00
  2126cf0d9a
• Fix PM channel type
  Dean Herbert · 2018-11-21 20:34:36 +09:00
  b31efb7bb9
• Merge pull request #3743 from smoogipoo/osuTK

  OpenTK -> osuTK everywhere

  Dean Herbert · 2018-11-21 19:18:33 +09:00
  65f4a01081
• Remove excess newline
  Dean Herbert · 2018-11-21 18:53:50 +09:00
  d677921680
• Merge branch 'master' into osuTK
  Dean Herbert · 2018-11-21 18:53:11 +09:00
  7755242a43
• Merge pull request #3746 from smoogipoo/fix-threaded-callback-crashes

  Fix crashes when importing/deleting from model managers

  Dean Herbert · 2018-11-21 18:52:20 +09:00
  ecd7deaf1e
• Fix instabilities in channel join logic
  Dean Herbert · 2018-11-21 17:15:15 +09:00
  88f82eb722
• Fix default channels not being joined
  Dean Herbert · 2018-11-21 17:15:15 +09:00
  4cde66240d
• Fix a crash on leaving the selected channel
  Dean Herbert · 2018-11-21 17:15:15 +09:00
  eab2776755
• Merge pull request #3748 from smoogipoo/add-private-channels

  Add private channel types

  Dean Herbert · 2018-11-21 13:12:48 +09:00
  68621fbd0e
• Add private channel types
  smoogipoo · 2018-11-21 12:58:45 +09:00
  ab2c969122
• Fix crashes when importing/deleting from model managers
  smoogipoo · 2018-11-20 18:09:23 +09:00
  5ad96afea0
• Update package
  smoogipoo · 2018-11-20 17:30:03 +09:00
  2a41c38294
• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Merge pull request #3742 from peppy/support-all-channels

  Add support for all channel types

  Dan Balasescu · 2018-11-20 16:00:19 +09:00
  2018.1120.0 51c192d4b7
• Add support for all channel types
  Dean Herbert · 2018-11-20 15:03:55 +09:00
  23a446bab2
• Merge pull request #3741 from peppy/increase-squirrel-logging

  Add squirrel update log output

  Dan Balasescu · 2018-11-20 14:29:22 +09:00
  1b86318ab4
• Trim newline
  Dan Balasescu · 2018-11-20 13:36:50 +09:00
  777b33b30e
• Add squirrel update log output

  Also updates squirrel to latest version.

  Dean Herbert · 2018-11-20 13:29:24 +09:00
  375543c644
• Merge pull request #3726 from smoogipoo/fix-taiko-lifetimes

  Fix taiko proxies not receiving the correct lifetimes

  Dean Herbert · 2018-11-20 04:16:11 +09:00
  6c9d1e6cf8
• Merge branch 'master' into fix-taiko-lifetimes
  Dean Herbert · 2018-11-20 04:05:05 +09:00
  ed26d8ebec
• Merge pull request #3737 from smoogipoo/revert-idletracker

  Revert idletracker changes

  Dean Herbert · 2018-11-19 19:08:58 +09:00
  12e0d8761d
• Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"

  This reverts commit 3e2e2a7000, reversing
  changes made to d94801b6c6.

  smoogipoo · 2018-11-19 17:52:31 +09:00
  bcdaee7d39
• Fix nullref
  smoogipoo · 2018-11-19 17:05:51 +09:00
  08ffa18936
• Merge pull request #3735 from peppy/fix-hold-menu-disappearing

  Fix hold for menu button occasionally disappearing

  Dan Balasescu · 2018-11-19 12:24:41 +09:00
  11b13d1a5f
• Fix hold for menu button occasionally disappearing
  Dean Herbert · 2018-11-19 12:06:47 +09:00
  970ea928ae
• Merge branch 'master' into fix-taiko-lifetimes
  Dean Herbert · 2018-11-19 08:41:19 +09:00
  a57f98ed4d
• Merge pull request #3729 from UselessToucan/improve_hud_overlay_colour_setting

  Set AccentColour in concrete counters

  Dean Herbert · 2018-11-19 08:30:44 +09:00
  eb5cb44a60
• Merge branch 'master' into improve_hud_overlay_colour_setting
  Dean Herbert · 2018-11-19 08:14:51 +09:00
  72c9c66461
• Merge pull request #3699 from smoogipoo/fix-mask-disposal

  Use bindables for hitobject events

  Dean Herbert · 2018-11-18 22:42:21 +09:00
  5ec28c31ca
• Merge branch 'master' into fix-mask-disposal
  Dean Herbert · 2018-11-18 21:18:00 +09:00
  dd21daa635
• Set AccentColour and GlowColour in StandardHealthDisplay
  Roman Kapustin · 2018-11-16 19:30:58 +03:00
  ecf8a89f26
• Merge pull request #3688 from jorolf/flashlight-mod

  Add flashlight mod

  Dan Balasescu · 2018-11-16 18:57:14 +09:00
  974873f5b4
• Merge branch 'master' into flashlight-mod
  Dan Balasescu · 2018-11-16 18:45:15 +09:00
  57c1ddb1e0
• Update osu-resources
  smoogipoo · 2018-11-16 18:31:37 +09:00
  92b1c56aed
• Set AccentColour in concrete counters
  Roman Kapustin · 2018-11-15 23:37:21 +03:00
  37b19f78ae
• apply suggestions
  jorolf · 2018-11-15 17:38:38 +01:00
  80bd98bb9d
• Fix taiko proxies not receiving the correct lifetimes
  smoogipoo · 2018-11-15 20:26:12 +09:00
  e207dd728b
• Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle

  Return to large logo after idle period

  Dan Balasescu · 2018-11-15 15:40:15 +09:00
  3e2e2a7000
• Merge branch 'master' into return_to_large_logo_after_idle
  Dan Balasescu · 2018-11-15 15:16:10 +09:00
  e8f34ddff0
• Merge pull request #3720 from HoLLy-HaCKeR/fix-settingstextbox

  Fix SettingsTextBox having width of 0

  Dan Balasescu · 2018-11-15 12:15:11 +09:00
  d94801b6c6
• remove unused using
  jorolf · 2018-11-15 00:45:27 +01:00
  f0f7b15edc
• Merge branch 'master' into flashlight-mod
  jorolf · 2018-11-15 00:35:42 +01:00
  41a0f9896e
• split shader, remove unnecessary clutter and fix some bugs
  jorolf · 2018-11-15 00:33:13 +01:00
  7d2958b7b0
• Fix SettingsTextBox having width of 0
  HoLLy · 2018-11-14 22:29:11 +01:00
  9dd3d28436
• Merge branch 'master' into fix-mask-disposal
  Dean Herbert · 2018-11-14 21:27:37 +09:00
  1501e05c04
• Merge pull request #3719 from smoogipoo/dropdown-updates

  Update with osu!-side dropdown changes

  Dean Herbert · 2018-11-14 21:27:16 +09:00
  92adcb7613