Commit Graph

38775 Commits

Author SHA1 Message Date
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
25d08c8e2c Improve beatmap loading and hydration 2016-10-13 10:29:30 -04:00
c93a440d3b Make Options:IStateful. 2016-10-13 22:27:37 +08:00
acd54d1ebc Single Visibility enum type. 2016-10-13 22:22:27 +08:00
fd10e6e582 Copy imported beatmaps into beatmap storage 2016-10-13 10:15:08 -04:00
ac66c08991 Make converter per-instance. 2016-10-13 21:55:49 +08:00
aad5c6a44d Use DateTimeOffset for message timestamp. 2016-10-13 21:42:51 +08:00
45a9249306 Move implementation of HitRender.Converter to base class using an abstract Converter property. 2016-10-13 21:14:18 +08:00
80d5fa7243 Specify HitObjectConvertException. 2016-10-13 20:53:42 +08:00
b7976dce46 Update framework version. 2016-10-13 15:12:16 +09:00
e37beafbed Merge pull request #65 from peppy/general-fixes
General fixes
2016-10-13 14:46:40 +09:00
5e3e949fd6 Revert all counter commits. Requires much further review. 2016-10-13 14:45:41 +09:00
1a9dede98c Remove unused Deploy build configuration. 2016-10-13 14:27:31 +09:00
fde3ab420a Merge branch 'master'
Conflicts:
	osu.Game/osu.Game.csproj
2016-10-13 12:23:36 +09:00
a6f7ccc080 Merge branch 'refs/heads/ipc' (rewritten to remove large file commit; original PR at https://github.com/ppy/osu/pull/60) 2016-10-13 12:21:48 +09:00
edd8f3871e Add TODO regarding parsing. 2016-10-13 12:19:20 +09:00
65e3e13aa2 Fix reference paths in osu.Game.csproj 2016-10-13 12:19:15 +09:00
deff5ad61e Use @strings where appropriate 2016-10-13 12:19:10 +09:00
dd86e75ea7 Minor fixes 2016-10-13 12:19:06 +09:00
10b5e2a89d Update osu-framework 2016-10-13 12:19:02 +09:00
2f8fbee364 Moved test osz file into osu-resources 2016-10-13 12:18:29 +09:00
ddac0e8c8f Update osu-framework 2016-10-13 12:18:23 +09:00
45c0bc5428 Import beatmaps into the database via IPC 2016-10-13 12:18:17 +09:00
3a163de0f7 Follow changes to osu-framework 2016-10-13 12:18:10 +09:00
94f2898f52 Implement beatmap sending/receiving over IPC 2016-10-13 12:18:04 +09:00
c7d12bc072 Remove unnecessary setters 2016-10-13 12:17:58 +09:00
880399f5a5 Fix casing on private properties 2016-10-13 12:17:52 +09:00