Commit Graph

13801 Commits

Author SHA1 Message Date
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
5e9d555309 Update framework. 2016-10-16 17:12:37 +08:00
4edefb935c Improve the initialisation logic of OsuGameBase. 2016-10-16 17:33:53 +09:00
15c6a563be Moved ComboResultCounter to right namespace 2016-10-15 22:24:03 -05:00
862dc1d7c7 Tidying code and restricting methods 2016-10-15 19:07:07 -05:00
84dcb63ad2 Changed ComboCounter format...
...to improve value management.
2016-10-15 18:06:31 -05:00
10b47859c3 Delay order on StarCounter changed 2016-10-15 18:04:00 -05:00
0ceb72ba42 More refactoring 2016-10-15 15:16:02 -05:00
a15f4cda44 Tidying 2016-10-15 15:03:51 -05:00
c268500f89 Minor variable change 2016-10-15 14:01:11 -05:00
2625d06553 Why calling StopAnimation() on StarCounter's ctor()? 2016-10-15 13:53:39 -05:00
9241287c79 Merge branch 'master' into counters-a 2016-10-15 13:45:55 -05:00
7a4bbb6921 Merge pull request #80 from autismpp/logger
Replace Console.WriteLine with Logger.Log.
2016-10-15 23:02:24 +09:00
9cfafceb34 Merge pull request #85 from Tom94/make_osu_logo_circular
Make osu logo circular
2016-10-15 23:01:56 +09:00
1d8ff5fe46 Use circular hover region for osu! logo. 2016-10-15 15:31:16 +02:00
8f5de3040c Update framework. 2016-10-15 15:30:51 +02:00
01db512d77 Revert .gitattributes additions for now. 2016-10-15 20:43:42 +09:00
7276038ca7 Replace Console.WriteLine with Logger.Log. 2016-10-15 06:13:50 +03:00
6bd3eaf37d Changes according to review + Refactor 2016-10-14 18:23:27 -05:00
4fc681a8b8 Merge pull request #82 from SirCmpwn/vscode
Add Visual Studio code meta files
2016-10-14 23:20:53 +09:00
bada1a2e11 Merge pull request #81 from SirCmpwn/line-endings
Fix .gitattributes
2016-10-14 23:19:45 +09:00
f27c0d9e91 Fix .gitattributes
This behavior should check out files in the native line ending depending
on your platform.
2016-10-14 10:13:33 -04:00
1dbf91eaaf Add Visual Studio code meta files 2016-10-14 10:12:11 -04:00
56f914ba47 Make sure *.cs has CRLF line endings. 2016-10-14 23:08:53 +09:00
123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up
Strongly type specifications
2016-10-14 18:57:42 +09:00
cb54d33c6e Make converter instance per-convert. 2016-10-14 17:48:07 +08:00
c3b745bfef Merge pull request #57 from UselessToucan/VolumeControl
VolumeControl: add controls for Effects and Music
2016-10-14 15:50:45 +09:00
ade925937a Set text position using Origin property 2016-10-14 09:46:40 +03:00
53cd698b3a Merge branch 'master' into counters-a 2016-10-13 22:57:24 -05:00
6597b09a55 Merge pull request #79 from peppy/general-fixes
Update framework version.
2016-10-14 12:54:52 +09:00
edbbe8daef Delete unnecessary class attributes 2016-10-13 22:54:02 -05:00
cc9bc9db93 Update framework version. 2016-10-14 12:53:44 +09:00
8c7ff58310 Fix regressions caused by overlay class. 2016-10-14 12:50:03 +09:00
bc0559c972 Merge pull request #78 from ZLima12/master
Converted all files that needed converting to use CRLF line endings.
2016-10-14 12:37:28 +09:00
fedfb8a22a Converted all .cs files to use CRLF line endings. 2016-10-13 23:33:58 -04:00
b425d14ea1 Merge pull request #73 from huoyaoyuan/overlay
Overlay proposals
2016-10-14 10:49:13 +09:00
a3dbb604b2 Merge pull request #72 from SirCmpwn/improved-beatmaps
Improved beatmaps
2016-10-14 10:47:43 +09:00
9ccff6ec48 Tidying up 2016-10-13 19:50:06 -05:00
0deb5b4e22 Removed unneeded vars 2016-10-13 18:07:06 -05:00
69621eb6d3 Star animation delay micro fix 2016-10-13 18:00:36 -05:00
c48e3a74f8 Add score counter test again 2016-10-13 17:33:26 -05:00
f10a03dcef Merge with master 2016-10-13 17:20:35 -05:00
ce07a45456 Improved code 2016-10-13 17:13:20 -05:00
254cc87578 Use name ToggleVisibility. 2016-10-14 05:02:13 +08:00
8cca8861fa Fix formatting 2016-10-13 19:11:51 +03:00
7d27406131 Fix merge conflict in osu.Game/osu.Game.csproj 2016-10-13 18:23:50 +03:00
c243a9719d Merge branch 'master' into VolumeControl 2016-10-13 18:05:16 +03:00
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
e79d5c8e14 Merge pull request #5 from ppy/master
Update master
2016-10-13 18:02:58 +03:00
d5cb331eb3 Unsubscribe from ValueChanged events 2016-10-13 17:52:49 +03:00