smoogipooo
|
aac4f24a2e
|
10% chance to get finisher hits in testcase.
|
2017-03-21 17:55:18 +09:00 |
|
smoogipooo
|
60e866aebd
|
Increase RingExplosion base size for finishers.
Subtle but looks good imo (checked with flyte).
|
2017-03-21 17:49:22 +09:00 |
|
smoogipooo
|
1ac9898a36
|
Add judgement texts.
|
2017-03-21 16:33:25 +09:00 |
|
smoogipooo
|
4c398b106d
|
Add explosion rings.
|
2017-03-21 15:54:57 +09:00 |
|
smoogipooo
|
10ed6ef10d
|
Move TaikoPlayfield to separate file.
|
2017-03-21 15:09:54 +09:00 |
|
smoogipooo
|
27a21cd23d
|
Add taiko playfield.
|
2017-03-21 14:58:34 +09:00 |
|
smoogipooo
|
edd9a22177
|
License headers.
|
2017-03-20 17:02:06 +09:00 |
|
smoogipooo
|
f87f334dcd
|
Merge branch 'master' into taiko_note_circle
|
2017-03-20 16:55:08 +09:00 |
|
smoogipooo
|
be1f28ad40
|
Move drum rolls to a new column in TestCaseTaikoHitObjects.
|
2017-03-20 16:53:31 +09:00 |
|
smoogipooo
|
730824fa58
|
Move pieces out of the visual test, fix up comments, rewrite FinisherPiece.
|
2017-03-20 16:50:22 +09:00 |
|
smoogipooo
|
051ef61d48
|
Make bashes not use textawesome.
|
2017-03-20 16:41:09 +09:00 |
|
smoogipooo
|
29f303b4d0
|
Add finisher notes.
|
2017-03-20 15:09:27 +09:00 |
|
smoogipooo
|
caf3ec1400
|
Fix colours.
|
2017-03-20 14:39:29 +09:00 |
|
smoogipooo
|
090e8bbb79
|
Remove hit object types solution-wide.
|
2017-03-20 13:10:24 +09:00 |
|
Dean Herbert
|
5d0adc6454
|
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
|
2017-03-19 18:51:53 +09:00 |
|
Thomas Müller
|
44f71b3975
|
Merge branch 'master' into fix-beatmap-options
|
2017-03-19 09:34:53 +01:00 |
|
DrabWeb
|
b0e7296e25
|
-IHasDrawableRepresentation, User.Region -> Country
|
2017-03-19 00:09:58 -03:00 |
|
Dean Herbert
|
af82a49127
|
Fix test case not containing any buttons.
|
2017-03-19 02:33:28 +09:00 |
|
Dean Herbert
|
f56b84a1ca
|
Fix mouse cursor in VisualTestGame.
|
2017-03-19 02:32:21 +09:00 |
|
Seth
|
4aea06be22
|
Merge branch 'master' into leaderboards
|
2017-03-17 18:23:01 -03:00 |
|
DrabWeb
|
0834b5b794
|
Made requested changes
|
2017-03-17 18:16:59 -03:00 |
|
smoogipooo
|
b629766892
|
Add initial taiko note circles.
|
2017-03-17 22:01:06 +09:00 |
|
Dean Herbert
|
e78bcf8739
|
Update TabControl in line with framework changes.
|
2017-03-17 00:39:40 +09:00 |
|
smoogipooo
|
e0a8c3b1e5
|
Rename BaseDifficulty -> Difficulty / BeatmapDifficulty.
|
2017-03-16 23:18:02 +09:00 |
|
Dean Herbert
|
64825c32c5
|
Add margin to testcase to better see edges.
|
2017-03-16 21:16:30 +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
|
da6b98db10
|
fixup! Filter doesn't need to be public, nor have a property.
|
2017-03-16 14:23:48 +09:00 |
|
Dean Herbert
|
a22b34817c
|
Merge branch 'master' into leaderboards
|
2017-03-16 11:12:53 +09: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 |
|
smoogipooo
|
0a24a30b1d
|
Use DrawableOsuHitObject instead.
|
2017-03-15 21:48:01 +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
|
e0e0a2726d
|
Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo.
|
2017-03-15 19:23:42 +09:00 |
|
smoogipooo
|
36e8618370
|
Make DrawableHitObjects have generic JudgementInfos.
|
2017-03-15 18:55:38 +09:00 |
|
Dean Herbert
|
d96a78459d
|
Rename ScoreRanks to be in line with current API.
|
2017-03-15 13:55:29 +09:00 |
|
smoogipooo
|
6a31219781
|
Add further abstraction to Sliders/IHasCurve.
|
2017-03-15 12:52:25 +09:00 |
|
Kelvin
|
18afd8eabe
|
Fixed license headers
|
2017-03-14 20:30:42 -07:00 |
|
Kelvin
|
755fb260db
|
Updated TabControl Usage
|
2017-03-14 19:52:21 -07:00 |
|
Kelvin
|
40bcc63a90
|
Added and styled FilterTabControls
|
2017-03-14 19:49:40 -07:00 |
|
Kelvin
|
2629f78afc
|
Add FilterControl and FilterTabControl
|
2017-03-14 19:49:40 -07:00 |
|
DrabWeb
|
55187a8380
|
Warnings, accuracy formatting
|
2017-03-14 11:55:19 -03:00 |
|
DrabWeb
|
78aedb4518
|
Test case usings
|
2017-03-14 11:17:06 -03:00 |
|
DrabWeb
|
ebe48b7c24
|
Removed D rank
|
2017-03-14 11:14:27 -03:00 |
|
Dean Herbert
|
8176b4ef77
|
Fix merge errors.
|
2017-03-14 22:11:38 +09:00 |
|
Seth
|
21a9996225
|
Merge branch 'master' into leaderboards
|
2017-03-14 10:07:33 -03:00 |
|
smoogipooo
|
4c7f0fcb73
|
Fix unit tests.
|
2017-03-14 18:46:34 +09:00 |
|
smoogipooo
|
d6ccc66b23
|
Attempt to fix nullref warning.
|
2017-03-14 17:46:35 +09:00 |
|
smoogipooo
|
6cddd95734
|
Cleanup.
|
2017-03-14 17:02:20 +09:00 |
|
smoogipooo
|
e52d5181f7
|
Fix a few visual tests failing.
|
2017-03-14 17:01:46 +09:00 |
|
smoogipooo
|
7141bc86d3
|
Rework beatmap post-processing into HitRenderer.
|
2017-03-14 17:01:21 +09:00 |
|
smoogipooo
|
854212a7aa
|
Merge branch 'master' into beatmap_parsing
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
|
2017-03-14 13:39:19 +09:00 |
|
smoogipooo
|
bbd81dbc47
|
Add license headers.
|
2017-03-14 13:02:42 +09:00 |
|
smoogipooo
|
a502ff2c87
|
Fix post-merge issues.
|
2017-03-14 12:47:29 +09:00 |
|
Dan Balasescu
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
Dean Herbert
|
ba10c3a8db
|
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
|
2017-03-14 11:46:34 +09:00 |
|
DrabWeb
|
6bd9e3cac1
|
+Score ranks
|
2017-03-13 18:34:43 -03:00 |
|
Huo Yaoyuan
|
db104d04d3
|
Use AutoGenerateBindingRedirects instead of explicit app.config.
|
2017-03-14 03:20:33 +08:00 |
|
DrabWeb
|
8e90e05f23
|
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
|
2017-03-13 12:31:46 -03:00 |
|
Dean Herbert
|
980807d91e
|
Fix post-merge issues.
|
2017-03-13 22:33:41 +09:00 |
|
Dean Herbert
|
b2981fb729
|
Merge branch 'master' into mod_application
|
2017-03-13 22:15:26 +09:00 |
|
DrabWeb
|
442a2c97db
|
Merge conflicts
|
2017-03-13 09:44:22 -03:00 |
|
DrabWeb
|
dbc8d513f9
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-13 09:36:16 -03:00 |
|
DrabWeb
|
9912f5f9e1
|
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
|
2017-03-13 09:33:25 -03:00 |
|
smoogipooo
|
f50e0bbf3c
|
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
|
2017-03-13 19:15:25 +09:00 |
|
Alex Amadori
|
971d8eb7c5
|
Merge remote-tracking branch 'upstream/master' into archive-reader
|
2017-03-13 10:56:31 +01:00 |
|
smoogipooo
|
7d129ebd6d
|
Attempt to fix things.
|
2017-03-12 22:38:50 +09:00 |
|
smoogipooo
|
c0e29652a6
|
Initial attempt at making mods apply better.
|
2017-03-12 22:13:43 +09:00 |
|
smoogipooo
|
64aab090d5
|
Instantiate HitRenderer with WorkingBeatmap.
|
2017-03-12 18:03:13 +09:00 |
|
smoogipooo
|
59b62b8fd4
|
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
|
2017-03-12 01:20:11 +09:00 |
|
smoogipooo
|
75ed7406e4
|
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
Conflicts:
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Taiko/TaikoRuleset.cs
|
2017-03-11 14:22:59 +09:00 |
|
smoogipooo
|
02281d8a2a
|
Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
|
2017-03-10 15:19:36 +09:00 |
|
smoogipooo
|
c0bb2685bf
|
Fix post-merge errors.
|
2017-03-10 14:44:38 +09:00 |
|
smoogipooo
|
aed89b7c0f
|
Merge branch 'general_hud' into counter_bindables
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
osu.Game/Modes/UI/HUDOverlay.cs
|
2017-03-10 14:44:29 +09:00 |
|
smoogipooo
|
605326e8f6
|
More ComboCounter fixups + refactorings.
|
2017-03-10 14:34:08 +09:00 |
|
smoogipooo
|
7a68e46366
|
Merge remote-tracking branch 'origin/master' into combocounter_bindable
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
|
2017-03-10 14:15:06 +09:00 |
|
smoogipooo
|
cd1717c42f
|
More bindables!
|
2017-03-10 13:49:51 +09:00 |
|
smoogipooo
|
4015b87965
|
General fixes.
|
2017-03-10 13:09:50 +09:00 |
|
smoogipooo
|
4cc032e1d7
|
Make ComboCounter count a bindable, and properly bind it to the processor.
|
2017-03-10 12:55:10 +09:00 |
|
Dan Balasescu
|
70d91e16d5
|
Merge branch 'master' into general_hud
|
2017-03-10 12:49:37 +09:00 |
|
smoogipooo
|
617ceb8001
|
Rename to StandardComboCounter, add HealthDisplay abstraction.
|
2017-03-10 12:47:00 +09:00 |
|
smoogipooo
|
31f6cbd8cf
|
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
|
2017-03-10 12:14:13 +09:00 |
|
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 |
|
Alex Amadori
|
7374839923
|
Merge remote-tracking branch 'upstream/master' into archive-reader
|
2017-03-09 17:07:00 +01:00 |
|
Dean Herbert
|
dad6060149
|
Fix warnings not covered by resharper locally.
|
2017-03-09 16:07:34 +09:00 |
|
Dean Herbert
|
d7497330b2
|
Reduce warning/suggestion count to zero.
|
2017-03-09 15:52:40 +09:00 |
|
Dean Herbert
|
dc5ac6e88f
|
Add missing access modifiers.
|
2017-03-09 13:55:29 +09:00 |
|
Alex Amadori
|
1acd51cc90
|
Merge remote-tracking branch 'upstream/master' into archive-reader
|
2017-03-08 21:54:17 +01:00 |
|
Dean Herbert
|
5a42035f88
|
Update license headers.
|
2017-03-08 15:50:52 +09:00 |
|
Alex Amadori
|
309019aab3
|
Merge remote tracking branch 'upstream/master' into archive-reader
|
2017-03-07 08:41:44 +01:00 |
|
Dean Herbert
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +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
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Alex Amadori
|
a297489151
|
Fix test
|
2017-03-07 00:03:04 +01:00 |
|
Dean Herbert
|
faf07ab51a
|
Use generics everywhere.
|
2017-03-06 13:59:11 +09:00 |
|
Dean Herbert
|
5b4424d4fa
|
CreateAutoplayReplay -> CreateAutoplayScore.
|
2017-03-06 10:06:14 +09:00 |
|
Dean Herbert
|
54945415c0
|
Remove unnecessary usings.
|
2017-03-06 10:05:42 +09:00 |
|