19824 Commits

This Branch

This Branch

All Branches

• getter on single line.
  Dean Herbert · 2016-10-12 15:22:03 +09:00
  9276244d6a
• Merge remote-tracking branch 'refs/remotes/upstream/master'

  Conflicts:
  	osu-framework
  	osu.Desktop.VisualTests/Program.cs

  Dean Herbert · 2016-10-12 15:20:23 +09:00
  79b62d4373
• Fix some display regressions in ChatConsole.
  Dean Herbert · 2016-10-12 13:35:21 +09:00
  05031d18ef
• Update framework; amend ToolbarButton to use padding and Children initialiser.
  Dean Herbert · 2016-10-12 12:24:07 +09:00
  c0ea061bd4
• Merge pull request #49 from NeoAdonis/counters

  Rolling counters (initial)

  Drew DeVault · 2016-10-11 15:04:46 -04:00
  5306141f5f
• Change volume in VolumeMeter
  TocoToucan · 2016-10-10 17:19:05 +03:00
  f3c1c60ab7
• Merge pull request #59 from peppy/general-fixes

  Update framework to fix draw order.

  Thomas Müller · 2016-10-10 08:16:52 +02:00
  48bd998f46
• Update framework to fix draw order.
  Dean Herbert · 2016-10-10 15:12:21 +09:00
  4ac2c9ad90
• Merge pull request #54 from SirCmpwn/specify-game-name

  Update osu-framework and specify game name

  Dean Herbert · 2016-10-10 15:03:01 +09:00
  8706027155
• Bring framework up-to-date with upstream master.
  Dean Herbert · 2016-10-10 14:36:27 +09:00
  3f83ffcb99
• Merge remote-tracking branch 'upstream/master' into SirCmpwn/specify-game-name

  Conflicts:
  	osu-framework

  Dean Herbert · 2016-10-10 14:35:43 +09:00
  0b0e79d29f
• Merge pull request #56 from Tom94/general-improvements

  General improvements

  Dean Herbert · 2016-10-10 14:20:17 +09:00
  8b06778746
• Update framework.
  Dean Herbert · 2016-10-10 14:18:06 +09:00
  0b08c8ba15
• Misc. fixes
  Adonais Romero González · 2016-10-09 15:19:35 -05:00
  2954c19345
• StarAnimationEasing
  Adonais Romero González · 2016-10-09 14:55:50 -05:00
  4d0c8ed441
• Hide VisibleCount from transformStar
  Adonais Romero González · 2016-10-09 14:53:06 -05:00
  fd1cbfd8fa
• More line wrapping
  Adonais Romero González · 2016-10-09 14:48:24 -05:00
  01da3ca474
• Not animate stars over MaxStars
  Adonais Romero González · 2016-10-09 14:09:07 -05:00
  841707b61f
• Completed StarCounter

  More complex than the other counters, but hopefully functional.
  I subestimated you and your silly bouncing animations.
  >.>

  Adonais Romero González · 2016-10-09 14:02:44 -05:00
  707effb591
• VolumeControl: add controls for Effects and Music
  TocoToucan · 2016-10-09 20:45:34 +03:00
  89d7de31ee
• Merge pull request #2 from ppy/master

  Actualize fork

  UselessToucan · 2016-10-09 20:34:18 +03:00
  b004961d07
• Merge branch 'master' of github.com:ppy/osu into general-improvements
  Thomas Müller · 2016-10-09 16:02:35 +02:00
  c62f29dcae
• Update Framework version.
  Thomas Müller · 2016-10-09 16:02:25 +02:00
  5861e782e5
• No need to enforce scheduling of task anymore.
  Thomas Müller · 2016-10-09 15:40:32 +02:00
  9ed0748d73
• Post-merge fixes.
  Dean Herbert · 2016-10-09 22:21:44 +09:00
  cb5e4287e2
• Merge branch 'master' into stateful-drawables

  Conflicts:
  	osu.Game/GameModes/Menu/Intro.cs

  Dean Herbert · 2016-10-09 22:08:32 +09:00
  25de055802
• Update framework version.
  Thomas Müller · 2016-10-09 13:31:16 +02:00
  934523e347
• Merge pull request #55 from Tom94/better-addtarget

  Better addtarget

  Dean Herbert · 2016-10-09 20:13:30 +09:00
  de24c86c81
• Use AddInternal instead of AddTopLevel.
  Thomas Müller · 2016-10-09 20:06:23 +09:00
  dd04b33232
• Don't rely on return value of Container.Add.
  Thomas Müller · 2016-10-09 20:06:20 +09:00
  bcb5a02221
• Don't call Container.Add within KeyCounterCollection.Reset.
  Thomas Müller · 2016-10-09 20:06:15 +09:00
  36bb4a3988
• Update framework.
  Dean Herbert · 2016-10-09 20:06:07 +09:00
  0a10bf9a51
• Use AddInternal instead of AddTopLevel.
  Thomas Müller · 2016-10-09 11:56:41 +02:00
  d9486e790a
• Don't rely on return value of Container.Add.
  Thomas Müller · 2016-10-09 11:55:52 +02:00
  99c8f618af
• Don't call Container.Add within KeyCounterCollection.Reset.
  Thomas Müller · 2016-10-09 11:55:38 +02:00
  916bb742da
• Update Framework.
  Thomas Müller · 2016-10-09 11:55:11 +02:00
  c997e16cfb
• Merge pull request #53 from Tom94/use_drawable_scheduler

  Use drawable scheduler

  Dean Herbert · 2016-10-09 15:25:22 +09:00
  76f1653090
• Update framework version.
  Thomas Müller · 2016-10-09 08:16:51 +02:00
  9d54d4f9bb
• Minor fix with StarCounter width
  Adonais Romero González · 2016-10-08 22:15:25 -05:00
  67d3d772f6
• Merge branch 'master' into counters
  Adonais Romero González · 2016-10-08 22:02:43 -05:00
  37115c8c9f
• More styling.
  Adonais Romero González · 2016-10-08 21:58:53 -05:00
  accf365fd1
• StarCounter styling using absolute positioning.
  Adonais Romero González · 2016-10-08 21:45:01 -05:00
  0d18680eeb
• Refactor + Stars Counter (initial)

  Moved a few things to allow using common transforms
  for a star counter. This implementation is basic and
  hacky, but good enough as proof of concept.

  Adonais Romero González · 2016-10-08 19:11:01 -05:00
  5ebb2fc289
• Code formatting and slight changes to transitions.
  Dean Herbert · 2016-10-08 23:27:53 +09:00
  926c46dbd4
• Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem
  Dean Herbert · 2016-10-08 23:27:46 +09:00
  9594b7193c
• Update osu-framework and specify game name
  Drew DeVault · 2016-10-08 10:26:35 -04:00
  eb7486f109
• Use PaddingContainer for better layout.
  Dean Herbert · 2016-10-08 23:25:38 +09:00
  97c2dcf590
• Add in-game chat display, along with a global hotkey handling method.
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  47faf8f40d
• osuLogo handles less keys.
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  1e9e52aecc
• Toolbar stores its current state locally (just for conformity).
  Dean Herbert · 2016-10-08 19:23:21 +09:00
  adba72d293