|
|
2d6e667c7c
|
Renaming + use IEnumerable.
|
2017-03-10 13:40:44 +09:00 |
|
|
|
4015b87965
|
General fixes.
|
2017-03-10 13:09:50 +09:00 |
|
|
|
75f004eeb9
|
Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud
|
2017-03-10 13:03:26 +09:00 |
|
|
|
7c1a3067e6
|
Oops o_o.
|
2017-03-10 13:03:13 +09:00 |
|
|
|
70d91e16d5
|
Merge branch 'master' into general_hud
|
2017-03-10 12:49:37 +09:00 |
|
|
|
617ceb8001
|
Rename to StandardComboCounter, add HealthDisplay abstraction.
|
2017-03-10 12:47:00 +09:00 |
|
|
|
31f6cbd8cf
|
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
|
2017-03-10 12:14:13 +09:00 |
|
|
|
69776d436f
|
Merge pull request #460 from smoogipooo/remove_custom_combocounters
Remove custom combo counters.
|
2017-03-10 11:43:00 +09:00 |
|
|
|
2b64de9dd8
|
Fix using statements.
|
2017-03-10 11:37:53 +09:00 |
|
|
|
fa9110ce6e
|
Remove custom combo counters.
|
2017-03-10 11:04:46 +09:00 |
|
|
|
a266add670
|
Merge pull request #450 from huoyaoyuan/modselect
Modselect refactor
|
2017-03-09 18:16:16 +09:00 |
|
|
|
9007409072
|
Follow appveyor's code style check.
|
2017-03-09 16:44:45 +08:00 |
|
|
|
115ebd4773
|
Merge branch 'master' into modselect
|
2017-03-09 17:31:25 +09:00 |
|
|
|
ca4c524fae
|
Merge pull request #456 from peppy/general-fixes
Update framework.
|
2017-03-09 17:30:51 +09:00 |
|
|
|
1b182b1361
|
Fix typo.
|
2017-03-09 15:55:40 +08:00 |
|
|
|
30de7aa59c
|
Remove duplicate reference to nunit.
|
2017-03-09 16:15:33 +09:00 |
|
|
|
dad6060149
|
Fix warnings not covered by resharper locally.
|
2017-03-09 16:07:34 +09:00 |
|
|
|
1b532b0741
|
Fix second mono regression.
|
2017-03-09 15:53:16 +09:00 |
|
|
|
d7497330b2
|
Reduce warning/suggestion count to zero.
|
2017-03-09 15:52:40 +09:00 |
|
|
|
a048e666d7
|
Fix autoproperty which doesn't work on mono.
|
2017-03-09 14:26:09 +09:00 |
|
|
|
da751804b6
|
Reduce error count.
|
2017-03-09 14:24:16 +09:00 |
|
|
|
149bf7b5fc
|
Bring dotsettings up-to-date.
|
2017-03-09 14:03:26 +09:00 |
|
|
|
01c379da19
|
User invariant culture sorting.
|
2017-03-09 14:02:20 +09:00 |
|
|
|
3eece390cb
|
Abstract constructors -> protected.
|
2017-03-09 14:01:08 +09:00 |
|
|
|
0976e205d8
|
Remove redundant parentheses.
|
2017-03-09 14:00:17 +09:00 |
|
|
|
dc5ac6e88f
|
Add missing access modifiers.
|
2017-03-09 13:55:29 +09:00 |
|
|
|
9772f2a042
|
Update framework.
|
2017-03-09 13:50:33 +09:00 |
|
|
|
0c4c1689b6
|
Merge branch 'master' into modselect
|
2017-03-09 12:51:40 +09:00 |
|
|
|
488cc87985
|
Merge pull request #454 from peppy/ci-improvements
CI improvements.
|
2017-03-08 16:06:20 +09:00 |
|
|
|
2821451d5b
|
Remove unused file.
|
2017-03-08 16:01:54 +09:00 |
|
|
|
954827aaf3
|
Update resources.
|
2017-03-08 15:56:51 +09:00 |
|
|
|
d06bbd5e20
|
Add appveyor.yml.
|
2017-03-08 15:53:09 +09:00 |
|
|
|
5a42035f88
|
Update license headers.
|
2017-03-08 15:50:52 +09:00 |
|
|
|
b810a43bba
|
Framework update.
|
2017-03-08 15:47:40 +09:00 |
|
|
|
abb653a763
|
Merge pull request #451 from peppy/replay
Make playfield scaling optional.
|
2017-03-08 11:55:14 +09:00 |
|
|
|
123c8f3489
|
Add comment.
|
2017-03-08 11:54:52 +09:00 |
|
|
|
b3b813c0ae
|
Follow current mod layout.
|
2017-03-07 20:05:50 +08:00 |
|
|
|
b19405c987
|
Allow null in mod list to generate a placeholder ModButton.
|
2017-03-07 19:52:51 +08:00 |
|
|
|
02cab41d34
|
Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
|
2017-03-07 19:30:48 +09:00 |
|
|
|
ffd79bee06
|
Remove inherited mods in incompatible list and add between Auto and NoFail.
|
2017-03-07 16:27:55 +08:00 |
|
|
|
8979b28496
|
Remove usages of the 'new' keyword.
|
2017-03-07 16:17:51 +08:00 |
|
|
|
b56d6c767b
|
Merge branch 'master' into modselect
|
2017-03-07 16:10:53 +08:00 |
|
|
|
1fb846e61d
|
Make playfield scaling optional.
|
2017-03-07 15:49:04 +09:00 |
|
|
|
533868a608
|
Fix other regression.
|
2017-03-07 15:18:15 +09:00 |
|
|
|
577601a90f
|
Fix regression in deployment tool
|
2017-03-07 14:57:58 +09:00 |
|
|
|
2fc72b370d
|
Merge pull request #436 from peppy/replay
Replay loading via drag-drop huzzah!
|
2017-03-07 14:41:23 +09:00 |
|
|
|
bff1179624
|
Merge branch 'master' into replay
# Conflicts:
# osu.Game/Modes/Mod.cs
|
2017-03-07 14:32:14 +09:00 |
|
|
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +09:00 |
|
|
|
95fb34ccfb
|
Merge pull request #448 from peppy/less-mods-enum
Remove Mods enum.
|
2017-03-07 14:19:01 +09:00 |
|
|
|
ecdbcb20cf
|
Fix error-level inspections.
|
2017-03-07 13:52:47 +09:00 |
|
