1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 08:32:54 +08:00

Commit Graph

  • 18f4d4ed1c Update framework. Dean Herbert 2016-10-17 12:09:05 +0900
  • bfbc26738c Merged branch master into round_masking Dean Herbert 2016-10-17 12:08:31 +0900
  • 9576a7c0e7 Merge pull request #90 from Lunar-Dust/patch-1 Dean Herbert 2016-10-17 10:09:34 +0900
  • 8e47d72f93 Reorder ToolbarButton instantiation for consistency Lunar Dust 2016-10-16 18:42:40 -0500
  • 72c4dc344e Misc. fixes and improvements Adonais Romero González 2016-10-16 18:30:25 -0500
  • a671765a4f Modified ManiaComboCounter behavior Adonais Romero González 2016-10-16 17:45:37 -0500
  • 2c06764b79 Better safe than sorry Adonais Romero González 2016-10-16 17:10:08 -0500
  • 53076f6446 Modify osu! logo to use new CircularContainer. Thomas Müller 2016-10-16 19:25:08 +0200
  • 96095f34e2 Merge pull request #87 from Tom94/unified_shader Dean Herbert 2016-10-16 22:34:50 +0900
  • d3fd16f209 Update framework. Thomas Müller 2016-10-16 15:34:30 +0200
  • fec127eb8c Merge branch 'master' of github.com:ppy/osu into unified_shader Thomas Müller 2016-10-16 15:15:28 +0200
  • b514293004 Merge pull request #88 from peppy/general-fixes Thomas Müller 2016-10-16 15:09:12 +0200
  • d07aaba75b Update framework. Dean Herbert 2016-10-16 22:00:55 +0900
  • 02dc8dc167 Change the way VolumeControl handles global input. Dean Herbert 2016-10-16 18:39:10 +0900
  • b3e531b98c Remove implementation of WedgedBox and use Shear transformation instead. Thomas Müller 2016-10-16 14:10:24 +0200
  • 7751a85e14 Update framework. Thomas Müller 2016-10-16 14:10:06 +0200
  • 620c4e6ab7 Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes Dean Herbert 2016-10-16 18:24:10 +0900
  • 7d59f63ef7 Merge pull request #86 from huoyaoyuan/overlay Dean Herbert 2016-10-16 18:22:10 +0900
  • f4c381f745 Use OverlayContainer in framework. Huo Yaoyuan 2016-10-16 17:14:17 +0800
  • 5e9d555309 Update framework. Huo Yaoyuan 2016-10-16 17:12:37 +0800
  • 4edefb935c Improve the initialisation logic of OsuGameBase. Dean Herbert 2016-10-16 17:33:53 +0900
  • 15c6a563be Moved ComboResultCounter to right namespace Adonais Romero González 2016-10-15 22:24:03 -0500
  • 862dc1d7c7 Tidying code and restricting methods Adonais Romero González 2016-10-15 19:07:07 -0500
  • 84dcb63ad2 Changed ComboCounter format... ...to improve value management. Adonais Romero González 2016-10-15 18:06:31 -0500
  • 10b47859c3 Delay order on StarCounter changed Adonais Romero González 2016-10-15 18:04:00 -0500
  • 0ceb72ba42 More refactoring Adonais Romero González 2016-10-15 15:16:02 -0500
  • a15f4cda44 Tidying Adonais Romero González 2016-10-15 15:03:51 -0500
  • c268500f89 Minor variable change Adonais Romero González 2016-10-15 14:01:11 -0500
  • 2625d06553 Why calling StopAnimation() on StarCounter's ctor()? Adonais Romero González 2016-10-15 13:53:39 -0500
  • 9241287c79 Merge branch 'master' into counters-a Adonais Romero González 2016-10-15 13:45:55 -0500
  • 7a4bbb6921 Merge pull request #80 from autismpp/logger Dean Herbert 2016-10-15 23:02:24 +0900
  • 9cfafceb34 Merge pull request #85 from Tom94/make_osu_logo_circular Dean Herbert 2016-10-15 23:01:56 +0900
  • 1d8ff5fe46 Use circular hover region for osu! logo. Thomas Müller 2016-10-15 15:31:16 +0200
  • 8f5de3040c Update framework. Thomas Müller 2016-10-15 15:30:51 +0200
  • 01db512d77 Revert .gitattributes additions for now. Dean Herbert 2016-10-15 20:43:42 +0900
  • 7276038ca7
    Replace Console.WriteLine with Logger.Log. autismpp 2016-10-14 14:09:35 +0300
  • 6bd3eaf37d Changes according to review + Refactor Adonais Romero González 2016-10-14 18:23:27 -0500
  • 4fc681a8b8 Merge pull request #82 from SirCmpwn/vscode Dean Herbert 2016-10-14 23:20:53 +0900
  • bada1a2e11 Merge pull request #81 from SirCmpwn/line-endings Dean Herbert 2016-10-14 23:19:45 +0900
  • f27c0d9e91 Fix .gitattributes Drew DeVault 2016-10-14 10:13:33 -0400
  • 1dbf91eaaf Add Visual Studio code meta files Drew DeVault 2016-10-14 10:11:41 -0400
  • 56f914ba47 Make sure *.cs has CRLF line endings. Dean Herbert 2016-10-14 23:08:53 +0900
  • 08245351b5
    Fit the identation of peppy's code. autismpp 2016-10-14 00:00:52 +0300
  • 123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up Dean Herbert 2016-10-14 18:57:42 +0900
  • cb54d33c6e Make converter instance per-convert. Huo Yaoyuan 2016-10-14 17:48:07 +0800
  • c3b745bfef Merge pull request #57 from UselessToucan/VolumeControl Dean Herbert 2016-10-14 15:50:45 +0900
  • ade925937a Set text position using Origin property TocoToucan 2016-10-14 09:46:40 +0300
  • 53cd698b3a Merge branch 'master' into counters-a Adonais Romero González 2016-10-13 22:57:24 -0500
  • 6597b09a55 Merge pull request #79 from peppy/general-fixes Dean Herbert 2016-10-14 12:54:52 +0900
  • edbbe8daef Delete unnecessary class attributes Adonais Romero González 2016-10-13 22:54:02 -0500
  • cc9bc9db93 Update framework version. Dean Herbert 2016-10-14 12:53:44 +0900
  • 8c7ff58310 Fix regressions caused by overlay class. Dean Herbert 2016-10-14 12:50:03 +0900
  • 7f0218d91b Merge 5c6d535832 into bc0559c972 autismpp 2016-10-14 03:47:03 +0000
  • bc0559c972 Merge pull request #78 from ZLima12/master Dean Herbert 2016-10-14 12:37:28 +0900
  • fedfb8a22a
    Converted all .cs files to use CRLF line endings. John Leuenhagen 2016-10-13 23:33:58 -0400
  • b425d14ea1 Merge pull request #73 from huoyaoyuan/overlay Dean Herbert 2016-10-14 10:49:13 +0900
  • a3dbb604b2 Merge pull request #72 from SirCmpwn/improved-beatmaps Dean Herbert 2016-10-14 10:47:43 +0900
  • 9ccff6ec48 Tidying up Adonais Romero González 2016-10-13 19:50:06 -0500
  • 0deb5b4e22 Removed unneeded vars Adonais Romero González 2016-10-13 18:07:06 -0500
  • 69621eb6d3 Star animation delay micro fix Adonais Romero González 2016-10-13 18:00:36 -0500
  • c48e3a74f8 Add score counter test again Adonais Romero González 2016-10-13 17:33:26 -0500
  • f10a03dcef Merge with master Adonais Romero González 2016-10-13 17:20:35 -0500
  • ce07a45456 Improved code Adonais Romero González 2016-10-13 17:13:20 -0500
  • 254cc87578 Use name ToggleVisibility. Huo Yaoyuan 2016-10-14 05:02:13 +0800
  • 5c6d535832
    Fit the identation of peppy's code. autismpp 2016-10-14 00:00:52 +0300
  • f2496d33d2
    Update submodules. autismpp 2016-10-13 23:57:05 +0300
  • f7681f8f52
    Replace Console.WriteLine with Logger.Log. autismpp 2016-10-13 23:29:39 +0300
  • 5f854cc346 Merge 4edd9b0cb3 into b7976dce46 ZLima12 2016-10-13 20:42:31 +0000
  • 4edd9b0cb3
    Converted all files to use CRLF line endings. John Leuenhagen 2016-10-13 16:39:56 -0400
  • 8cca8861fa Fix formatting TocoToucan 2016-10-13 19:11:51 +0300
  • 7d27406131 Fix merge conflict in osu.Game/osu.Game.csproj TocoToucan 2016-10-13 18:23:50 +0300
  • c243a9719d Merge branch 'master' into VolumeControl TocoToucan 2016-10-13 18:05:16 +0300
  • 1c97edaac2 Base class for overlays. Huo Yaoyuan 2016-10-13 22:57:05 +0800
  • e79d5c8e14 Merge pull request #5 from ppy/master UselessToucan 2016-10-13 18:02:58 +0300
  • d5cb331eb3 Unsubscribe from ValueChanged events TocoToucan 2016-10-13 17:52:49 +0300
  • 25d08c8e2c Improve beatmap loading and hydration Drew DeVault 2016-10-13 10:29:30 -0400
  • c93a440d3b Make Options:IStateful. Huo Yaoyuan 2016-10-13 22:27:37 +0800
  • acd54d1ebc Single Visibility enum type. Huo Yaoyuan 2016-10-13 22:21:15 +0800
  • fd10e6e582 Copy imported beatmaps into beatmap storage Drew DeVault 2016-10-13 10:15:08 -0400
  • ac66c08991 Make converter per-instance. Huo Yaoyuan 2016-10-13 21:55:49 +0800
  • aad5c6a44d Use DateTimeOffset for message timestamp. Huo Yaoyuan 2016-10-13 21:42:51 +0800
  • 45a9249306 Move implementation of HitRender.Converter to base class using an abstract Converter property. Huo Yaoyuan 2016-10-13 21:14:18 +0800
  • 80d5fa7243 Specify HitObjectConvertException. Huo Yaoyuan 2016-10-13 20:53:42 +0800
  • b7976dce46 Update framework version. Dean Herbert 2016-10-13 15:12:16 +0900
  • e37beafbed Merge pull request #65 from peppy/general-fixes Dean Herbert 2016-10-13 14:46:40 +0900
  • 5e3e949fd6 Revert all counter commits. Requires much further review. Dean Herbert 2016-10-13 14:45:41 +0900
  • 1a9dede98c Remove unused Deploy build configuration. Dean Herbert 2016-10-13 14:27:31 +0900
  • 6ff6fbb85a Merge 1d8d2fa9c9 into a6f7ccc080 Adonais Romero González 2016-10-13 03:52:18 +0000
  • fde3ab420a Merge branch 'master' Dean Herbert 2016-10-13 12:23:36 +0900
  • a6f7ccc080 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:20:58 +0900
  • edd8f3871e Add TODO regarding parsing. Dean Herbert 2016-10-13 11:41:11 +0900
  • 65e3e13aa2 Fix reference paths in osu.Game.csproj Drew DeVault 2016-10-12 13:49:30 -0400
  • deff5ad61e Use @strings where appropriate Drew DeVault 2016-10-12 13:36:10 -0400
  • dd86e75ea7 Minor fixes Drew DeVault 2016-10-12 13:26:09 -0400
  • 10b5e2a89d Update osu-framework Drew DeVault 2016-10-12 12:45:49 -0400
  • 2f8fbee364 Moved test osz file into osu-resources Drew DeVault 2016-10-12 11:38:43 -0400
  • ddac0e8c8f Update osu-framework Drew DeVault 2016-10-12 11:31:44 -0400
  • 45c0bc5428 Import beatmaps into the database via IPC Drew DeVault 2016-10-11 10:53:16 -0400
  • 3a163de0f7 Follow changes to osu-framework Drew DeVault 2016-10-11 09:47:50 -0400
  • 94f2898f52 Implement beatmap sending/receiving over IPC Drew DeVault 2016-10-10 16:56:01 -0400