61410 Commits

This Branch

This Branch

All Branches

• Update framework.
  Thomas Müller · 2016-10-16 15:34:30 +02:00
  d3fd16f209
• Merge branch 'master' of github.com:ppy/osu into unified_shader

  # Conflicts:
  #	osu-framework
  #	osu.Game/Overlays/Options.cs

  Thomas Müller · 2016-10-16 15:17:24 +02:00
  fec127eb8c
• Merge pull request #88 from peppy/general-fixes

  General fixes & framework updates.

  Thomas Müller · 2016-10-16 15:09:12 +02:00
  b514293004
• Update framework.
  Dean Herbert · 2016-10-16 22:00:55 +09:00
  d07aaba75b
• Change the way VolumeControl handles global input.
  Dean Herbert · 2016-10-16 21:57:15 +09:00
  02dc8dc167
• Remove implementation of WedgedBox and use Shear transformation instead.
  Thomas Müller · 2016-10-16 14:10:24 +02:00
  b3e531b98c
• Update framework.
  Thomas Müller · 2016-10-16 14:10:06 +02:00
  7751a85e14
• Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes
  Dean Herbert · 2016-10-16 18:24:10 +09:00
  620c4e6ab7
• Merge pull request #86 from huoyaoyuan/overlay

  Update overlay in framework.

  Dean Herbert · 2016-10-16 18:22:10 +09:00
  7d59f63ef7
• Use OverlayContainer in framework.
  Huo Yaoyuan · 2016-10-16 17:14:17 +08:00
  f4c381f745
• Update framework.
  Huo Yaoyuan · 2016-10-16 17:12:37 +08:00
  5e9d555309
• Improve the initialisation logic of OsuGameBase.
  Dean Herbert · 2016-10-16 17:33:53 +09:00
  4edefb935c
• Moved ComboResultCounter to right namespace
  Adonais Romero González · 2016-10-15 22:24:03 -05:00
  15c6a563be
• Tidying code and restricting methods
  Adonais Romero González · 2016-10-15 19:07:07 -05:00
  862dc1d7c7
• Changed ComboCounter format...

  ...to improve value management.

  Adonais Romero González · 2016-10-15 18:06:31 -05:00
  84dcb63ad2
• Delay order on StarCounter changed
  Adonais Romero González · 2016-10-15 18:04:00 -05:00
  10b47859c3
• More refactoring
  Adonais Romero González · 2016-10-15 15:16:02 -05:00
  0ceb72ba42
• Tidying
  Adonais Romero González · 2016-10-15 15:03:51 -05:00
  a15f4cda44
• Minor variable change
  Adonais Romero González · 2016-10-15 14:01:11 -05:00
  c268500f89
• Why calling StopAnimation() on StarCounter's ctor()?
  Adonais Romero González · 2016-10-15 13:53:39 -05:00
  2625d06553
• Merge branch 'master' into counters-a
  Adonais Romero González · 2016-10-15 13:45:55 -05:00
  9241287c79
• Merge pull request #80 from autismpp/logger

  Replace Console.WriteLine with Logger.Log.

  Dean Herbert · 2016-10-15 23:02:24 +09:00
  7a4bbb6921
• Merge pull request #85 from Tom94/make_osu_logo_circular

  Make osu logo circular

  Dean Herbert · 2016-10-15 23:01:56 +09:00
  9cfafceb34
• Use circular hover region for osu! logo.
  Thomas Müller · 2016-10-15 15:31:16 +02:00
  1d8ff5fe46
• Update framework.
  Thomas Müller · 2016-10-15 15:30:51 +02:00
  8f5de3040c
• Revert .gitattributes additions for now.
  Dean Herbert · 2016-10-15 20:43:42 +09:00
  01db512d77
• Replace Console.WriteLine with Logger.Log.
  autismpp · 2016-10-15 06:13:50 +03:00
  7276038ca7
• Changes according to review + Refactor
  Adonais Romero González · 2016-10-14 18:23:27 -05:00
  6bd3eaf37d
• Merge pull request #82 from SirCmpwn/vscode

  Add Visual Studio code meta files

  Dean Herbert · 2016-10-14 23:20:53 +09:00
  4fc681a8b8
• Merge pull request #81 from SirCmpwn/line-endings

  Fix .gitattributes

  Dean Herbert · 2016-10-14 23:19:45 +09:00
  bada1a2e11
• Fix .gitattributes

  This behavior should check out files in the native line ending depending
  on your platform.

  Drew DeVault · 2016-10-14 10:13:33 -04:00
  f27c0d9e91
• Add Visual Studio code meta files
  Drew DeVault · 2016-10-14 10:12:11 -04:00
  1dbf91eaaf
• Make sure *.cs has CRLF line endings.
  Dean Herbert · 2016-10-14 23:08:53 +09:00
  56f914ba47
• Merge pull request #71 from huoyaoyuan/tidy-up

  Strongly type specifications

  Dean Herbert · 2016-10-14 18:57:42 +09:00
  123d92f5b9
• Make converter instance per-convert.
  Huo Yaoyuan · 2016-10-14 17:48:07 +08:00
  cb54d33c6e
• Merge pull request #57 from UselessToucan/VolumeControl

  VolumeControl: add controls for Effects and Music

  Dean Herbert · 2016-10-14 15:50:45 +09:00
  c3b745bfef
• Set text position using Origin property
  TocoToucan · 2016-10-14 09:46:40 +03:00
  ade925937a
• Merge branch 'master' into counters-a
  Adonais Romero González · 2016-10-13 22:57:24 -05:00
  53cd698b3a
• Merge pull request #79 from peppy/general-fixes

  Update framework version.

  Dean Herbert · 2016-10-14 12:54:52 +09:00
  6597b09a55
• Delete unnecessary class attributes
  Adonais Romero González · 2016-10-13 22:54:02 -05:00
  edbbe8daef
• Update framework version.
  Dean Herbert · 2016-10-14 12:53:44 +09:00
  cc9bc9db93
• Fix regressions caused by overlay class.
  Dean Herbert · 2016-10-14 12:50:03 +09:00
  8c7ff58310
• Merge pull request #78 from ZLima12/master

  Converted all files that needed converting to use CRLF line endings.

  Dean Herbert · 2016-10-14 12:37:28 +09:00
  bc0559c972
• Converted all .cs files to use CRLF line endings.
  John Leuenhagen · 2016-10-13 23:33:58 -04:00
  fedfb8a22a
• Merge pull request #73 from huoyaoyuan/overlay

  Overlay proposals

  Dean Herbert · 2016-10-14 10:49:13 +09:00
  b425d14ea1
• Merge pull request #72 from SirCmpwn/improved-beatmaps

  Improved beatmaps

  Dean Herbert · 2016-10-14 10:47:43 +09:00
  a3dbb604b2
• Tidying up
  Adonais Romero González · 2016-10-13 19:50:06 -05:00
  9ccff6ec48
• Removed unneeded vars
  Adonais Romero González · 2016-10-13 18:07:06 -05:00
  0deb5b4e22
• Star animation delay micro fix
  Adonais Romero González · 2016-10-13 18:00:36 -05:00
  69621eb6d3
• Add score counter test again
  Adonais Romero González · 2016-10-13 17:33:26 -05:00
  c48e3a74f8