6229 Commits

This Branch

This Branch

All Branches

• 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
• Merge with master
  Adonais Romero González · 2016-10-13 17:20:35 -05:00
  f10a03dcef
• Improved code
  Adonais Romero González · 2016-10-13 17:13:20 -05:00
  ce07a45456
• Use name ToggleVisibility.
  Huo Yaoyuan · 2016-10-14 05:02:13 +08:00
  254cc87578
• Fix formatting
  TocoToucan · 2016-10-13 19:11:51 +03:00
  8cca8861fa
• Fix merge conflict in osu.Game/osu.Game.csproj
  TocoToucan · 2016-10-13 18:23:50 +03:00
  7d27406131
• Merge branch 'master' into VolumeControl
  TocoToucan · 2016-10-13 18:05:16 +03:00
  c243a9719d
• Base class for overlays.
  Huo Yaoyuan · 2016-10-13 23:04:57 +08:00
  1c97edaac2
• Merge pull request #5 from ppy/master

  Update master

  UselessToucan · 2016-10-13 18:02:58 +03:00
  e79d5c8e14
• Unsubscribe from ValueChanged events
  TocoToucan · 2016-10-13 17:52:49 +03:00
  d5cb331eb3
• Improve beatmap loading and hydration
  Drew DeVault · 2016-10-13 10:29:30 -04:00
  25d08c8e2c
• Make Options:IStateful.
  Huo Yaoyuan · 2016-10-13 22:27:37 +08:00
  c93a440d3b
• Single Visibility enum type.
  Huo Yaoyuan · 2016-10-13 22:22:27 +08:00
  acd54d1ebc
• Copy imported beatmaps into beatmap storage
  Drew DeVault · 2016-10-13 10:15:08 -04:00
  fd10e6e582
• Make converter per-instance.
  Huo Yaoyuan · 2016-10-13 21:55:49 +08:00
  ac66c08991
• Use DateTimeOffset for message timestamp.
  Huo Yaoyuan · 2016-10-13 21:42:51 +08:00
  aad5c6a44d
• Move implementation of HitRender.Converter to base class using an abstract Converter property.
  Huo Yaoyuan · 2016-10-13 21:14:18 +08:00
  45a9249306
• Specify HitObjectConvertException.
  Huo Yaoyuan · 2016-10-13 20:53:42 +08:00
  80d5fa7243
• Update framework version.
  Dean Herbert · 2016-10-13 15:12:16 +09:00
  b7976dce46
• Merge pull request #65 from peppy/general-fixes

  General fixes

  Dean Herbert · 2016-10-13 14:46:40 +09:00
  e37beafbed
• Revert all counter commits. Requires much further review.
  Dean Herbert · 2016-10-13 14:45:41 +09:00
  5e3e949fd6
• Remove unused Deploy build configuration.
  Dean Herbert · 2016-10-13 14:27:31 +09:00
  1a9dede98c
• Merge branch 'master'

  Conflicts:
  	osu.Game/osu.Game.csproj

  Dean Herbert · 2016-10-13 12:23:36 +09:00
  fde3ab420a
• Merge branch 'refs/heads/ipc' (rewritten to remove large file commit; original PR at https://github.com/ppy/osu/pull/60)
  Dean Herbert · 2016-10-13 12:21:48 +09:00
  a6f7ccc080
• Add TODO regarding parsing.
  Dean Herbert · 2016-10-13 12:19:20 +09:00
  edd8f3871e
• Fix reference paths in osu.Game.csproj
  Drew DeVault · 2016-10-13 12:19:15 +09:00
  65e3e13aa2
• Use @strings where appropriate
  Drew DeVault · 2016-10-13 12:19:10 +09:00
  deff5ad61e
• Minor fixes
  Drew DeVault · 2016-10-13 12:19:06 +09:00
  dd86e75ea7
• Update osu-framework
  Drew DeVault · 2016-10-13 12:19:02 +09:00
  10b5e2a89d
• Moved test osz file into osu-resources
  Drew DeVault · 2016-10-13 12:18:29 +09:00
  2f8fbee364
• Update osu-framework
  Drew DeVault · 2016-10-13 12:18:23 +09:00
  ddac0e8c8f
• Import beatmaps into the database via IPC
  Drew DeVault · 2016-10-13 12:18:17 +09:00
  45c0bc5428