1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 05:33:21 +08:00
Commit Graph

3031 Commits

Author SHA1 Message Date
Dean Herbert
2b64de9dd8 Fix using statements. 2017-03-10 11:37:53 +09:00
smoogipooo
fa9110ce6e Remove custom combo counters. 2017-03-10 11:04:46 +09:00
Jorolf
9dd835e256 didn't see this was unnecessary after my changes 2017-03-09 21:43:11 +01:00
Jorolf
d9a4a677fd Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Lahvuun
427a0dd0f5 Options sidebar flickering fix. 2017-03-09 22:29:39 +02:00
Alex Amadori
faecaa297a Fix warnings 2017-03-09 21:07:21 +01:00
Alex Amadori
f969c3b7b3 Fix test 2017-03-09 21:00:13 +01:00
Alex Amadori
c60353faf7 Merge branch 'archive-reader' of https://github.com/tacchinotacchi/osu into archive-reader 2017-03-09 17:07:37 +01:00
Alex Amadori
7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert
a266add670 Merge pull request from huoyaoyuan/modselect
Modselect refactor
2017-03-09 18:16:16 +09:00
Huo Yaoyuan
9007409072 Follow appveyor's code style check. 2017-03-09 16:44:45 +08:00
Dean Herbert
115ebd4773 Merge branch 'master' into modselect 2017-03-09 17:31:25 +09:00
Dean Herbert
ca4c524fae Merge pull request from peppy/general-fixes
Update framework.
2017-03-09 17:30:51 +09:00
Huo Yaoyuan
1b182b1361 Fix typo. 2017-03-09 15:55:40 +08:00
Dean Herbert
30de7aa59c
Remove duplicate reference to nunit. 2017-03-09 16:15:33 +09:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert
1b532b0741
Fix second mono regression. 2017-03-09 15:53:16 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
a048e666d7
Fix autoproperty which doesn't work on mono. 2017-03-09 14:26:09 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
149bf7b5fc
Bring dotsettings up-to-date. 2017-03-09 14:03:26 +09:00
Dean Herbert
01c379da19
User invariant culture sorting. 2017-03-09 14:02:20 +09:00
Dean Herbert
3eece390cb
Abstract constructors -> protected. 2017-03-09 14:01:08 +09:00
Dean Herbert
0976e205d8
Remove redundant parentheses. 2017-03-09 14:00:17 +09:00
Dean Herbert
dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Dean Herbert
9772f2a042
Update framework. 2017-03-09 13:50:33 +09:00
Dean Herbert
0c4c1689b6 Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Alex Amadori
9f40a888ec Update BeatmapArchiveReader's test 2017-03-08 21:55:38 +01:00
Alex Amadori
1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
Dean Herbert
488cc87985 Merge pull request from peppy/ci-improvements
CI improvements.
2017-03-08 16:06:20 +09:00
Dean Herbert
2821451d5b
Remove unused file. 2017-03-08 16:01:54 +09:00
Dean Herbert
954827aaf3
Update resources. 2017-03-08 15:56:51 +09:00
Dean Herbert
d06bbd5e20
Add appveyor.yml. 2017-03-08 15:53:09 +09:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Dean Herbert
b810a43bba
Framework update. 2017-03-08 15:47:40 +09:00
Dean Herbert
abb653a763 Merge pull request from peppy/replay
Make playfield scaling optional.
2017-03-08 11:55:14 +09:00
Dean Herbert
123c8f3489
Add comment. 2017-03-08 11:54:52 +09:00
Huo Yaoyuan
b3b813c0ae Follow current mod layout. 2017-03-07 20:05:50 +08:00
Huo Yaoyuan
b19405c987 Allow null in mod list to generate a placeholder ModButton. 2017-03-07 19:52:51 +08:00
Dean Herbert
02cab41d34
Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
Huo Yaoyuan
ffd79bee06 Remove inherited mods in incompatible list and add between Auto and NoFail. 2017-03-07 16:27:55 +08:00
Huo Yaoyuan
8979b28496 Remove usages of the 'new' keyword. 2017-03-07 16:17:51 +08:00
Huo Yaoyuan
b56d6c767b Merge branch 'master' into modselect 2017-03-07 16:10:53 +08:00
Alex Amadori
2c7a9d2f77 Remove unnecessary using 2017-03-07 08:47:50 +01:00
Alex Amadori
309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert
1fb846e61d
Make playfield scaling optional. 2017-03-07 15:49:04 +09:00
Dean Herbert
533868a608
Fix other regression. 2017-03-07 15:18:15 +09:00
Dean Herbert
577601a90f
Fix regression in deployment tool 2017-03-07 14:57:58 +09:00
Dean Herbert
2fc72b370d Merge pull request from peppy/replay
Replay loading via drag-drop huzzah!
2017-03-07 14:41:23 +09:00
Dean Herbert
bff1179624
Merge branch 'master' into replay
# Conflicts:
#	osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00