RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 17:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
363 Commits 6 Branches 0 Tags 363 MiB
4fc681a8b8
Commit Graph

363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
4fc681a8b8 Merge pull request #82 from SirCmpwn/vscode 
Add Visual Studio code meta files
 2016-10-14 23:20:53 +09:00
Dean Herbert
bada1a2e11 Merge pull request #81 from SirCmpwn/line-endings 
Fix .gitattributes
 2016-10-14 23:19:45 +09:00
Drew DeVault
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
Drew DeVault
1dbf91eaaf Add Visual Studio code meta files 2016-10-14 10:12:11 -04:00
Dean Herbert
56f914ba47 Make sure *.cs has CRLF line endings. 2016-10-14 23:08:53 +09:00
Dean Herbert
123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up 
Strongly type specifications
 2016-10-14 18:57:42 +09:00
Huo Yaoyuan
cb54d33c6e Make converter instance per-convert. 2016-10-14 17:48:07 +08:00
Dean Herbert
c3b745bfef Merge pull request #57 from UselessToucan/VolumeControl 
VolumeControl: add controls for Effects and Music
 2016-10-14 15:50:45 +09:00
TocoToucan
ade925937a Set text position using Origin property 2016-10-14 09:46:40 +03:00
Dean Herbert
6597b09a55 Merge pull request #79 from peppy/general-fixes 
Update framework version.
 2016-10-14 12:54:52 +09:00
Dean Herbert
cc9bc9db93 Update framework version. 2016-10-14 12:53:44 +09:00
Dean Herbert
8c7ff58310 Fix regressions caused by overlay class. 2016-10-14 12:50:03 +09:00
Dean Herbert
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
John Leuenhagen
fedfb8a22a
Converted all .cs files to use CRLF line endings. 2016-10-13 23:33:58 -04:00
Dean Herbert
b425d14ea1 Merge pull request #73 from huoyaoyuan/overlay 
Overlay proposals
 2016-10-14 10:49:13 +09:00
Dean Herbert
a3dbb604b2 Merge pull request #72 from SirCmpwn/improved-beatmaps 
Improved beatmaps
 2016-10-14 10:47:43 +09:00
Huo Yaoyuan
254cc87578 Use name ToggleVisibility. 2016-10-14 05:02:13 +08:00
TocoToucan
8cca8861fa Fix formatting 2016-10-13 19:11:51 +03:00
TocoToucan
7d27406131 Fix merge conflict in osu.Game/osu.Game.csproj 2016-10-13 18:23:50 +03:00
TocoToucan
c243a9719d Merge branch 'master' into VolumeControl 2016-10-13 18:05:16 +03:00
Huo Yaoyuan
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
UselessToucan
e79d5c8e14 Merge pull request #5 from ppy/master 
Update master
 2016-10-13 18:02:58 +03:00
TocoToucan
d5cb331eb3 Unsubscribe from ValueChanged events 2016-10-13 17:52:49 +03:00
Drew DeVault
25d08c8e2c Improve beatmap loading and hydration 2016-10-13 10:29:30 -04:00
Huo Yaoyuan
c93a440d3b Make Options:IStateful. 2016-10-13 22:27:37 +08:00
Huo Yaoyuan
acd54d1ebc Single Visibility enum type. 2016-10-13 22:22:27 +08:00
Drew DeVault
fd10e6e582 Copy imported beatmaps into beatmap storage 2016-10-13 10:15:08 -04:00
Huo Yaoyuan
ac66c08991 Make converter per-instance. 2016-10-13 21:55:49 +08:00
Huo Yaoyuan
aad5c6a44d Use DateTimeOffset for message timestamp. 2016-10-13 21:42:51 +08:00
Huo Yaoyuan
45a9249306 Move implementation of HitRender.Converter to base class using an abstract Converter property. 2016-10-13 21:14:18 +08:00
Huo Yaoyuan
80d5fa7243 Specify HitObjectConvertException. 2016-10-13 20:53:42 +08:00
Dean Herbert
b7976dce46 Update framework version. 2016-10-13 15:12:16 +09:00
Dean Herbert
e37beafbed Merge pull request #65 from peppy/general-fixes 
General fixes
 2016-10-13 14:46:40 +09:00
Dean Herbert
5e3e949fd6 Revert all counter commits. Requires much further review. 2016-10-13 14:45:41 +09:00
Dean Herbert
1a9dede98c Remove unused Deploy build configuration. 2016-10-13 14:27:31 +09:00
Dean Herbert
fde3ab420a Merge branch 'master' 
Conflicts:
	osu.Game/osu.Game.csproj
 2016-10-13 12:23:36 +09:00
Dean Herbert
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
Dean Herbert
edd8f3871e Add TODO regarding parsing. 2016-10-13 12:19:20 +09:00
Drew DeVault
65e3e13aa2 Fix reference paths in osu.Game.csproj 2016-10-13 12:19:15 +09:00
Drew DeVault
deff5ad61e Use @strings where appropriate 2016-10-13 12:19:10 +09:00
Drew DeVault
dd86e75ea7 Minor fixes 2016-10-13 12:19:06 +09:00
Drew DeVault
10b5e2a89d Update osu-framework 2016-10-13 12:19:02 +09:00
Drew DeVault
2f8fbee364 Moved test osz file into osu-resources 2016-10-13 12:18:29 +09:00
Drew DeVault
ddac0e8c8f Update osu-framework 2016-10-13 12:18:23 +09:00
Drew DeVault
45c0bc5428 Import beatmaps into the database via IPC 2016-10-13 12:18:17 +09:00
Drew DeVault
3a163de0f7 Follow changes to osu-framework 2016-10-13 12:18:10 +09:00
Drew DeVault
94f2898f52 Implement beatmap sending/receiving over IPC 2016-10-13 12:18:04 +09:00
Drew DeVault
c7d12bc072 Remove unnecessary setters 2016-10-13 12:17:58 +09:00
Drew DeVault
880399f5a5 Fix casing on private properties 2016-10-13 12:17:52 +09:00
Drew DeVault
dc4bd48f29 Fix casing issues 
Cheers @RemieRichards
 2016-10-13 12:17:46 +09:00