|
|
41aaf5fee6
|
Merge branch 'master' into taiko_barlines
|
2017-03-23 10:40:27 +09:00 |
|
|
|
75a51fbcc7
|
Merge branch 'taiko_playfield_2' into taiko_barlines
|
2017-03-23 09:13:24 +09:00 |
|
|
|
2cb6757f14
|
Merge remote-tracking branch 'origin/master' into taiko_barlines
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-23 09:01:00 +09:00 |
|
|
|
790997db90
|
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
|
2017-03-23 08:49:20 +09:00 |
|
|
|
2b1d31e69c
|
Address linting issues
|
2017-03-22 06:25:49 -04:00 |
|
|
|
cc2b4c5c5b
|
Refactor WorkingBeatmap
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
|
2017-03-22 05:57:08 -04:00 |
|
|
|
8983bbcaad
|
Merge branch 'master' into leaderboards
|
2017-03-22 08:24:49 +09:00 |
|
|
|
8f6cee2544
|
Override is unnecessary.
|
2017-03-22 01:43:20 +09:00 |
|
|
|
e7a93073a4
|
Fix post-merge errors.
|
2017-03-22 01:42:40 +09:00 |
|
|
|
9f3def05ef
|
Add test case for bar lines.
|
2017-03-21 21:27:20 +09:00 |
|
|
|
b602b7a3ea
|
Add barline drawables.
|
2017-03-21 20:39:18 +09:00 |
|
|
|
aac4f24a2e
|
10% chance to get finisher hits in testcase.
|
2017-03-21 17:55:18 +09:00 |
|
|
|
60e866aebd
|
Increase RingExplosion base size for finishers.
Subtle but looks good imo (checked with flyte).
|
2017-03-21 17:49:22 +09:00 |
|
|
|
1ac9898a36
|
Add judgement texts.
|
2017-03-21 16:33:25 +09:00 |
|
|
|
4c398b106d
|
Add explosion rings.
|
2017-03-21 15:54:57 +09:00 |
|
|
|
10ed6ef10d
|
Move TaikoPlayfield to separate file.
|
2017-03-21 15:09:54 +09:00 |
|
|
|
27a21cd23d
|
Add taiko playfield.
|
2017-03-21 14:58:34 +09:00 |
|
|
|
edd9a22177
|
License headers.
|
2017-03-20 17:02:06 +09:00 |
|
|
|
f87f334dcd
|
Merge branch 'master' into taiko_note_circle
|
2017-03-20 16:55:08 +09:00 |
|
|
|
be1f28ad40
|
Move drum rolls to a new column in TestCaseTaikoHitObjects.
|
2017-03-20 16:53:31 +09:00 |
|
|
|
730824fa58
|
Move pieces out of the visual test, fix up comments, rewrite FinisherPiece.
|
2017-03-20 16:50:22 +09:00 |
|
|
|
051ef61d48
|
Make bashes not use textawesome.
|
2017-03-20 16:41:09 +09:00 |
|
|
|
29f303b4d0
|
Add finisher notes.
|
2017-03-20 15:09:27 +09:00 |
|
|
|
caf3ec1400
|
Fix colours.
|
2017-03-20 14:39:29 +09:00 |
|
|
|
090e8bbb79
|
Remove hit object types solution-wide.
|
2017-03-20 13:10:24 +09:00 |
|
|
|
5d0adc6454
|
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
|
2017-03-19 18:51:53 +09:00 |
|
|
|
b0e7296e25
|
-IHasDrawableRepresentation, User.Region -> Country
|
2017-03-19 00:09:58 -03:00 |
|
|
|
af82a49127
|
Fix test case not containing any buttons.
|
2017-03-19 02:33:28 +09:00 |
|
|
|
4aea06be22
|
Merge branch 'master' into leaderboards
|
2017-03-17 18:23:01 -03:00 |
|
|
|
0834b5b794
|
Made requested changes
|
2017-03-17 18:16:59 -03:00 |
|
|
|
b629766892
|
Add initial taiko note circles.
|
2017-03-17 22:01:06 +09:00 |
|
|
|
e78bcf8739
|
Update TabControl in line with framework changes.
|
2017-03-17 00:39:40 +09:00 |
|
|
|
e0a8c3b1e5
|
Rename BaseDifficulty -> Difficulty / BeatmapDifficulty.
|
2017-03-16 23:18:02 +09:00 |
|
|
|
64825c32c5
|
Add margin to testcase to better see edges.
|
2017-03-16 21:16:30 +09:00 |
|
|
|
bd5493fb25
|
Add back correct defaults.
|
2017-03-16 16:44:14 +09:00 |
|
|
|
95757ac420
|
Merge remote-tracking branch 'refs/remotes/2yangk23/master'
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
|
2017-03-16 16:38:42 +09:00 |
|
|
|
334e389518
|
Tidy up OsuTabControl and FilterControl.
|
2017-03-16 16:35:44 +09:00 |
|
|
|
58fc0a2622
|
Make TabControl test label more clear
|
2017-03-15 22:49:23 -07:00 |
|
|
|
da6b98db10
|
fixup! Filter doesn't need to be public, nor have a property.
|
2017-03-16 14:23:48 +09:00 |
|
|
|
a22b34817c
|
Merge branch 'master' into leaderboards
|
2017-03-16 11:12:53 +09:00 |
|
|
|
3aecbf5739
|
Rearrange things somewhat
|
2017-03-15 20:15:40 -04:00 |
|
|
|
cac6c42aac
|
Merge remote-tracking branch 'upstream/master' into tab-control
|
2017-03-15 20:15:28 -04:00 |
|
|
|
0a24a30b1d
|
Use DrawableOsuHitObject instead.
|
2017-03-15 21:48:01 +09:00 |
|
|
|
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 |
|
|
|
e0e0a2726d
|
Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo.
|
2017-03-15 19:23:42 +09:00 |
|
|
|
36e8618370
|
Make DrawableHitObjects have generic JudgementInfos.
|
2017-03-15 18:55:38 +09:00 |
|
|
|
d96a78459d
|
Rename ScoreRanks to be in line with current API.
|
2017-03-15 13:55:29 +09:00 |
|
|
|
6a31219781
|
Add further abstraction to Sliders/IHasCurve.
|
2017-03-15 12:52:25 +09:00 |
|
|
|
18afd8eabe
|
Fixed license headers
|
2017-03-14 20:30:42 -07:00 |
|
|
|
755fb260db
|
Updated TabControl Usage
|
2017-03-14 19:52:21 -07:00 |
|
