h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 03:57:25 +08:00
Code Issues Releases Wiki Activity
2,548 Commits 3 Branches 653 Tags 367 MiB
e78bcf8739
Commit Graph

2548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
Dean Herbert
296a3cd1e9 Merge pull request #494 from smoogipooo/beatmap_timinginfo 
Replace List<ControlPoint> with TimingInfo in Beatmap.
 2017-03-16 23:30:14 +09:00
smoogipooo
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
smoogipooo
28e006eeb9 Move MapDifficultyRange into BaseDifficulty. 2017-03-16 23:17:27 +09:00
Dean Herbert
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
Dean Herbert
c8bd86fabd Merge pull request #490 from smoogipooo/generic_scoreprocessor 
Generic scoreprocessor
 2017-03-16 23:08:00 +09:00
Dean Herbert
271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
Dean Herbert
3d1556c7f2 Merge pull request #455 from 2yangk23/master 
Add FilterControl implementation
 2017-03-16 22:41:47 +09:00
Dean Herbert
c07cba7f88
Update framework. 2017-03-16 22:19:47 +09:00
Dean Herbert
8cd1353d74
Fix serious input regression. 2017-03-16 22:09:35 +09:00
Dean Herbert
2cf6ed423e
Disallow duplicate active changes. 2017-03-16 21:33:08 +09:00
Dean Herbert
84b080a060
Make transition logic a bit more sane. 2017-03-16 21:26:03 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
Dean Herbert
64825c32c5
Add margin to testcase to better see edges. 2017-03-16 21:16:30 +09:00
Dean Herbert
3b77fcd5d5
Update framework. 2017-03-16 19:15:18 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
Dean Herbert
e17f728282
Fix CI. 2017-03-16 17:04:03 +09:00
Dean Herbert
93c0fe5140
Remove unnecessary set. 2017-03-16 17:02:37 +09:00
Dean Herbert
1a7c2eda5e
Size FilterControl relatively now that we can. 2017-03-16 17:01:02 +09:00
Dean Herbert
1156e76c28
Don't directly access Header. 2017-03-16 17:00:49 +09:00
Dean Herbert
bd5493fb25
Add back correct defaults. 2017-03-16 16:44:14 +09:00
Dean Herbert
95757ac420
Merge remote-tracking branch 'refs/remotes/2yangk23/master' 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
 2017-03-16 16:38:42 +09:00
Dean Herbert
334e389518
Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
Kelvin
58fc0a2622 Make TabControl test label more clear 2017-03-15 22:49:23 -07:00
Dean Herbert
4bedd4d2d7
Block input behind FilterControl. 2017-03-16 14:33:31 +09:00
Dean Herbert
da6b98db10
fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
Dean Herbert
269c1a5e5c
Reword some comments. 2017-03-16 14:08:37 +09:00
Dean Herbert
352de22590
Filter doesn't need to be public, nor have a property. 2017-03-16 14:08:29 +09:00
Dean Herbert
4d84bf7350
Change difficulty sort to be based on MaxStarDifficulty. 2017-03-16 13:59:23 +09:00
smoogipooo
5cafec3b6a Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase. 2017-03-16 13:13:45 +09:00
smoogipooo
7b66faab9e Fix filename. 2017-03-16 12:59:09 +09:00
smoogipooo
82033faaab Warning/error fixing. 2017-03-16 12:57:50 +09:00
smoogipooo
c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +09:00
Drew DeVault
360340c61d Fix linter issues 2017-03-15 22:39:09 -04:00
Drew DeVault
0000cf1bee Update framework 2017-03-15 21:44:27 -04:00
Drew DeVault
01cca1a4d2 Refactor color handling 
colour*
 2017-03-15 20:52:31 -04:00
Drew DeVault
db5a1e241a Don't crash on unimplemented sorts 2017-03-15 20:18:20 -04:00
Drew DeVault
3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
Drew DeVault
cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04:00
Dean Herbert
a7ba6bbcfe Merge pull request #489 from smoogipooo/generic_judgements_2 
Generic judgements part 1/?
 2017-03-15 22:13:38 +09:00
Dean Herbert
2e8ffd9cb7 Merge branch 'master' into generic_judgements_2 2017-03-15 22:09:33 +09:00
smoogipooo
418189effd Adjust/improve a few comments. 2017-03-15 21:58:00 +09:00
smoogipooo
afefde7ecf Remove old comments. 2017-03-15 21:53:01 +09:00
Dean Herbert
0ec166f701
Remove broken dependency. 2017-03-15 21:50:28 +09:00
smoogipooo
0a24a30b1d Use DrawableOsuHitObject instead. 2017-03-15 21:48:01 +09:00
smoogipooo
4de3dde44d Fix post-merge error. 2017-03-15 21:40:19 +09:00
smoogipooo
42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
 2017-03-15 21:36:43 +09:00
smoogipooo
3a8d1d3619 Add license headers. 2017-03-15 21:32:47 +09:00
Dean Herbert
b5edcf864b
Update framework. 2017-03-15 21:10:00 +09:00