h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 23:13:34 +08:00
Code Issues Releases Wiki Activity
2,309 Commits 3 Branches 653 Tags 354 MiB
fa9110ce6e
Commit Graph

2309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipooo
fa9110ce6e Remove custom combo counters. 2017-03-10 11:04:46 +09:00
Dean Herbert
a266add670 Merge pull request #450 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 #456 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
Dean Herbert
488cc87985 Merge pull request #454 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 #451 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
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 #436 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
Dean Herbert
5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +09:00
Dean Herbert
95fb34ccfb Merge pull request #448 from peppy/less-mods-enum 
Remove Mods enum.
 2017-03-07 14:19:01 +09:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections. 2017-03-07 13:52:47 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
 2017-03-07 13:50:08 +09:00
Dean Herbert
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum 
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
 2017-03-07 13:42:50 +09:00
Dean Herbert
688388333b Merge pull request #449 from peppy/increase-ci-strictness 
Raise warnings on unnecessary using statements.
 2017-03-07 13:37:54 +09:00
Dean Herbert
1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +09:00
Dean Herbert
0199181cce
Update framework. 2017-03-07 13:17:55 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert
12c316aba4 Fix int truncation. 2017-03-07 11:29:55 +09:00
Dean Herbert
9106c45858
Fix remaining errors. 2017-03-07 10:42:59 +09:00