1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 17:17:26 +08:00
Commit Graph

65227 Commits

Author SHA1 Message Date
Dan Balasescu
460f260880 Merge pull request #19 from peppy/general-fixes
Update resolution handling logic.
2016-09-01 23:20:03 +09:30
Dean Herbert
6e836708bd Remove unnecessary file extension.
# Conflicts:
#	osu.Game/GameModes/Menu/MainMenu.cs
2016-09-01 22:47:48 +09:00
Dean Herbert
af3e024c7b Update SampleManager Get method call. 2016-09-01 22:47:48 +09:00
Dean Herbert
7d2f303e61 Update font logic to override framework default.
# Conflicts:
#	osu.Game/OsuGame.cs
2016-09-01 22:47:48 +09:00
Dean Herbert
56bdfae852 Add back DotSettings file. 2016-09-01 22:47:48 +09:00
Dean Herbert
9585a9105e Update resolution handling logic. 2016-09-01 22:47:48 +09:00
Dean Herbert
cb3dfe094e Add minimum resolution settings. 2016-09-01 22:47:48 +09:00
Dean Herbert
93ebe523d5 Update submodules. 2016-09-01 22:46:26 +09:00
Dean Herbert
a087658e80 Merge pull request #18 from peppy/master
Update submodules.
2016-09-01 14:23:00 +09:00
Dean Herbert
7e0c1a082b Update submodules. 2016-09-01 14:14:07 +09:00
Dean Herbert
b7ff37cd8a Merge pull request #17 from huoyaoyuan/master
Remove custom delegates references.
2016-09-01 02:34:03 +09:00
Huo Yaoyuan
6826391b7a Replace custom delegates by generic delegates. 2016-09-01 00:48:28 +08:00
Dan Balasescu
43d8dd8cf5 Merge pull request #15 from peppy/online_api
Basic networking / API authentication.
2016-08-31 20:49:17 +09:30
Dean Herbert
013cf1cf3f Fix broken namespaces. 2016-08-31 20:16:05 +09:00
Dean Herbert
8870935a4b Add basic online API support. 2016-08-31 20:14:01 +09:00
Dan Balasescu
6a588301ba Merge pull request #14 from peppy/transformation_rewrite
New style transformations.
2016-08-31 16:21:48 +09:30
Dean Herbert
5f78a10604 Merge branch 'master' into transformation_rewrite 2016-08-31 15:43:16 +09:00
Dean Herbert
e3ec485a9d New style transformations. 2016-08-31 12:23:44 +09:00
Dean Herbert
e59da1ad78 Merge pull request #13 from peppy/master
Bring submodules up-to-date (texture-based font rendering).
2016-08-30 18:04:08 +09:00
Dean Herbert
4bdbee5642 Bring submodules up-to-date (texture-based font rendering). 2016-08-30 17:08:59 +09:00
Dean Herbert
9b57c53976 Update submodules. 2016-08-26 17:52:39 +09:00
Dean Herbert
81f9ce657f License -> Licence. 2016-08-26 17:27:49 +09:00
Dean Herbert
155ad75045 Use more standardised .gitignore. 2016-08-26 17:22:22 +09:00
Dean Herbert
7a17877c3b Update submodules. 2016-08-26 17:18:56 +09:00
Dean Herbert
75ff2dee66 Update framework version. 2016-08-26 16:51:28 +09:00
Dean Herbert
91c6523755 Add build status badge. 2016-08-26 14:55:19 +09:00
Dean Herbert
6cbbeaaac0 Initial commit. 2016-08-26 14:41:47 +09:00