smoogipooo
3c21e6538b
Merge branch 'taiko_drumroll_drawing' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 11:15:10 +09:00
smoogipooo
24c6ee620f
Merge branch 'taiko_hit_drawing' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-03-29 11:12:39 +09:00
smoogipooo
9da28d372a
Merge branch 'taiko_swell_drawing' into taiko-drawable-generation
2017-03-29 11:09:51 +09:00
Dan Balasescu
d7674e2367
Merge branch 'master' into dynamic-recompile
2017-03-29 10:12:48 +09:00
smoogipooo
762cbfc997
Merge remote-tracking branch 'peppy/dynamic-recompile' into taiko_drumroll_drawing
2017-03-29 09:57:25 +09:00
Dean Herbert
ab97967237
Update references and framework.
2017-03-29 09:54:00 +09:00
smoogipooo
7b479ac737
Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing
2017-03-29 09:12:48 +09:00
smoogipooo
c478c74227
Merge remote-tracking branch 'origin/master' into taiko_hit_drawing
2017-03-29 09:03:19 +09:00
smoogipooo
eabcae82c6
Merge remote-tracking branch 'origin/master' into taiko_swell_drawing
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 08:30:30 +09:00
Dan Balasescu
bca18ce209
Merge branch 'master' into move-easingtypes
2017-03-29 08:14:13 +09:00
Jorolf
199c70ff95
Added fails and retries
2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c
Added ratings and different bar rotations
2017-03-28 17:12:54 +02:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
Andrey Zavadskiy
1c166bdf32
Edited pause visual test
2017-03-28 15:03:12 +03:00
Andrey Zavadskiy
60be69d3b0
Fixes
2017-03-28 11:41:08 +03:00
smoogipooo
c14759ebad
Use new circle piece in test case.
2017-03-28 17:24:14 +09:00
smoogipooo
2ff213d2c8
Fix resharper warning.
2017-03-28 17:19:27 +09:00
smoogipooo
6b1dab5b83
Implement drawable drumroll.
2017-03-28 17:08:34 +09:00
Andrey Zavadskiy
62693a6a59
Again separate classes
2017-03-28 10:49:58 +03:00
Andrey Zavadskiy
c1009c2a3c
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-03-28 10:20:06 +03:00
smoogipooo
3f6b17c0bf
Add drawable Swell.
2017-03-28 15:05:45 +09:00
Andrey Zavadskiy
9774f826ab
Pause and fail overlays -> StopOverlay
2017-03-28 06:08:31 +03:00
smoogipooo
ec9a027b59
ZZZZZZZzzzzzzzz.
2017-03-28 11:21:01 +09:00
Andrey Zavadskiy
c4500fa270
fixes
2017-03-28 05:19:32 +03:00
smoogipooo
b7d9de57a2
Add rim hits.
2017-03-28 11:18:12 +09:00
smoogipooo
1faff828d1
Move piece to Pieces/.
2017-03-28 11:01:35 +09:00
Andrey Zavadskiy
5461c6516a
Refactor PauseOverlay, FailDialog -> FailOverlay
2017-03-28 04:53:57 +03:00
smoogipooo
3f1e8ddcd1
License headers + general fixes.
2017-03-28 10:51:22 +09:00
smoogipooo
621bcaed59
Add drawable Hits/StrongHits.
2017-03-28 10:33:23 +09:00
smoogipooo
4c7e523d18
Rename Accented to Strong.
2017-03-28 10:02:41 +09:00
Jorolf
775fd63d0f
Added difficulty container
2017-03-25 23:33:03 +01:00
Jorolf
d8724e5e3e
Add metadata details
2017-03-24 23:02:24 +01:00
smoogipooo
7a220e7348
Using.
2017-03-24 22:17:18 +09:00
smoogipooo
c03bf4a5c3
Use less scaling factors.
2017-03-24 22:11:11 +09:00
smoogipooo
e079263205
Remove unused texture.
2017-03-24 20:54:09 +09:00
smoogipooo
2ee68ae75a
Make CirclePiece use relative width (leaving length control to DrawableDrumRoll).
2017-03-24 20:10:17 +09:00
smoogipooo
fdd17c1575
Rewrite circle pieces to use custom graphics again.
...
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
2017-03-24 20:08:40 +09:00
smoogipooo
df46d0f446
Cleanup.
2017-03-24 18:49:10 +09:00
smoogipooo
5281842965
Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
2017-03-24 18:37:56 +09:00
smoogipooo
20e80a758a
Merge branch 'master' into taiko_drawable_drawing
...
Conflicts:
osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +09:00
DrabWeb
befbc63c35
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-23 23:42:06 -03:00
DrabWeb
b56fb310bf
More cleanup
2017-03-23 23:38:23 -03:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
DrabWeb
0a11d035fe
Formatting
2017-03-23 09:07:13 -03:00
DrabWeb
bbca6cf602
Fix bottom square being clipped
2017-03-23 08:13:03 -03:00
DrabWeb
938f5eaf58
Dragging
2017-03-23 07:38:08 -03:00
DrabWeb
546a3d0914
Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph
2017-03-23 07:15:53 -03:00
Dean Herbert
2cb801317d
JudgementInfo -> Judgement.
...
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
2017-03-23 19:00:18 +09:00
Dean Herbert
b5d661b53a
some fixing and restyling.
2017-03-23 18:20:00 +09:00
Dean Herbert
4d61424abd
Merge branch 'master' into song-progress-graph
2017-03-23 17:44:22 +09:00
Dan Balasescu
e9a061c709
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 17:13:02 +09:00
Dean Herbert
43032ef694
Fix missing class renames.
2017-03-23 16:56:42 +09:00
Dean Herbert
d441114011
Merge branch 'master' into taiko_playfield_2
2017-03-23 14:28:42 +09:00
Dean Herbert
e77229b34b
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
DrabWeb
67421cdf1c
Even though it was 5 minutes ago what was I thinking
2017-03-23 01:34:06 -03:00
DrabWeb
8c99a8b103
Remove visual test(pretty useless)
2017-03-23 01:25:30 -03:00
DrabWeb
c173c4b7ee
Tab control
2017-03-23 00:22:31 -03:00
Dan Balasescu
2c580f43e9
Merge branch 'master' into taiko_playfield_2
2017-03-23 11:10:23 +09:00
Dan Balasescu
e3bc837b61
Merge branch 'master' into taiko_drawable_drawing
2017-03-23 10:44:00 +09:00
Dan Balasescu
41aaf5fee6
Merge branch 'master' into taiko_barlines
2017-03-23 10:40:27 +09:00
smoogipooo
75a51fbcc7
Merge branch 'taiko_playfield_2' into taiko_barlines
2017-03-23 09:13:24 +09:00
smoogipooo
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
smoogipooo
790997db90
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
2017-03-23 08:49:20 +09:00
DrabWeb
5ebbc2c0ba
Formatting
2017-03-22 09:33:01 -03:00
DrabWeb
818bdd8e88
SongProgress in HudOverlay
2017-03-22 09:27:04 -03:00
DrabWeb
333008e26d
Formatting
2017-03-22 08:59:44 -03:00
DrabWeb
29c54d4d8b
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-22 08:50:17 -03:00
Drew DeVault
2b1d31e69c
Address linting issues
2017-03-22 06:25:49 -04:00
Drew DeVault
267238dc27
Simplify derived classes of WorkingBeatmap
2017-03-22 06:15:32 -04:00
Drew DeVault
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
Dean Herbert
8983bbcaad
Merge branch 'master' into leaderboards
2017-03-22 08:24:49 +09:00
smoogipooo
8f6cee2544
Override is unnecessary.
2017-03-22 01:43:20 +09:00
smoogipooo
e7a93073a4
Fix post-merge errors.
2017-03-22 01:42:40 +09:00
smoogipooo
9f3def05ef
Add test case for bar lines.
2017-03-21 21:27:20 +09:00
smoogipooo
b602b7a3ea
Add barline drawables.
2017-03-21 20:39:18 +09:00
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 6f20473e65c76a495d3d
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
Dean Herbert
1c5b918f9e
Add osu! autoplay generation.
...
Doesn't work on complex sliders yet.
2017-03-05 17:46:00 +09:00
Dean Herbert
7afcac3660
Move PreferredPlayMode to WorkingBeatmap.
2017-03-05 17:45:40 +09:00
Dean Herbert
4e4408cd20
Merge branch 'master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
DrabWeb
269c139d2a
Flags(redoing later), glowing text, proper Score and User usage
2017-03-04 22:29:52 -04:00
Thomas Müller
73fef85b12
Remove unnecessary usings
2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
Dean Herbert
95e2e2b027
Replay loading via drag-drop huzzah!
2017-03-04 19:02:43 +09:00
DrabWeb
d1bad34434
Enter animation, remove testing mod icons
2017-03-04 05:01:55 -04:00
DrabWeb
d6f53c8b77
Moved test data to visual test
2017-03-04 04:05:31 -04:00
DrabWeb
a112b354f0
Basic implementation of score UI
2017-03-04 03:37:34 -04:00
Dean Herbert
adb6f01e39
Create class hierarchy for Score/Replay storage.
2017-03-04 15:32:41 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
Dean Herbert
6f3b59268a
Merge pull request #385 from DrabWeb/mod-overlay
...
Mod select
2017-03-03 21:09:08 +09:00
Dean Herbert
dc6a728cce
Merge branch 'master' into tournament_drawings
2017-03-03 20:48:07 +09:00
Dean Herbert
bc01935a89
Move around some namespaces.
2017-03-03 20:42:22 +09:00
Dean Herbert
4a109fcc55
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.
2017-03-03 20:21:11 +09:00
Dean Herbert
9789d1e602
Add missing acronyms in TestCaseDrawings.
2017-03-03 20:07:36 +09:00
smoogipooo
5a4d07d770
Better way to initialize team lists.
2017-03-03 18:47:56 +09:00
Seth
fde509ab1d
Merge branch 'master' into mod-overlay
2017-03-03 04:12:42 -04:00
smoogipooo
7cac2680b1
Make test case add test drawings file.
2017-03-03 16:33:40 +09:00
Dean Herbert
b0ee728528
Remove full-screen background layer and add half-height holder.
...
Doesn't interact well with dialog popups. May add back later with complementing logic.
2017-03-03 16:11:23 +09:00
Seth
1891bdf51e
Merge branch 'master' into mod-overlay
2017-03-03 01:11:15 -04:00
Seth
2e74b4be60
Merge branch 'master' into beatmap-options
2017-03-03 00:52:45 -04:00
Dan Balasescu
09a2d39e3e
Merge branch 'master' into tournament_drawings
2017-03-03 13:06:18 +09:00
DrabWeb
b4091eff30
Fixed visual test
2017-03-02 21:24:34 -04:00
Dean Herbert
3a8246f56d
Move PauseOverlay to correct namespace.
2017-03-03 10:17:39 +09:00
DrabWeb
b856fb5991
Implemented beatmap options overlay
2017-03-02 08:40:55 -04:00
Dean Herbert
e399d6c6d1
Use bindable for PlayMode.
2017-03-02 21:16:58 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
Dean Herbert
435e845067
Merge branch 'master' into DrabWeb/song-progress-graph
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Overlays/Pause/PauseProgressBar.cs
# osu.Game/Overlays/Pause/PauseProgressGraph.cs
# osu.Game/osu.Game.csproj
2017-03-02 20:20:27 +09:00
Dean Herbert
51950eef43
Merge branch 'master' into master
2017-03-02 18:06:31 +09:00
Dean Herbert
ff5f0af2d3
Merge branch 'master' into popup-dialog
2017-03-02 16:42:20 +09:00
Dean Herbert
4bd85fe5cb
Fix audio disposal issues and share more code between visualtests.
2017-03-02 16:08:37 +09:00
Thomas Müller
9c853b0465
Update framewörk
2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
Dean Herbert
b6e7e054c3
wankoz
2017-03-01 22:56:20 +09:00
Dean Herbert
58ae9e888d
Basic partial replay support.
2017-03-01 22:04:20 +09:00
smoogipooo
35d246b59d
Merge remote-tracking branch 'origin/master' into tournament_drawings
2017-03-01 19:32:33 +09:00
DrabWeb
d5d8352b62
Testing build
2017-02-28 17:09:31 -04:00
DrabWeb
570c95cb98
Merge https://github.com/ppy/osu into mod-overlay
2017-02-28 02:22:59 -04:00
DrabWeb
ce1798b8bc
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
2017-02-28 02:09:36 -04:00
DrabWeb
50d172be39
Added DialogManager(not wired up for desktop project yet)
2017-02-28 00:59:36 -04:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes
2017-02-28 13:49:19 +09:00
DrabWeb
b3a231185b
Conform to naming conventions
2017-02-27 20:55:10 -04:00
DrabWeb
3094c01a40
Merge https://github.com/ppy/osu into popup-dialog
2017-02-27 16:40:04 -04:00
Andrey Zavadskiy
3487dfe236
Removed unused variables and parameters
2017-02-27 17:32:32 +03:00
Alex Amadori
8b336156f0
Merge remote-tracking branch 'upstream/master'
2017-02-27 14:55:44 +01:00
Dean Herbert
a22216d0b0
Update nuget packages.
2017-02-27 20:38:30 +09:00
Dean Herbert
21c6f66017
Fix TestCaseGamefield.
2017-02-27 18:30:10 +09:00
smoogipooo
25a1c7a8ad
Initial groups implementation.
2017-02-27 14:19:07 +09:00
DrabWeb
d78dca3d85
New design
2017-02-26 23:35:13 -04:00
default0
1b92519a86
Update usages of AddToggle in Tests
2017-02-26 21:31:40 +01:00
Dean Herbert
686372a7f9
Update with framework structural changes.
2017-02-26 20:54:32 +09:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
DrabWeb
a009268370
Merge https://github.com/ppy/osu into popup-dialog
2017-02-25 21:22:47 -04:00
Alex Amadori
51b6075210
Merge remote-tracking branch 'upstream/master'
2017-02-24 16:54:37 +01:00
Alex Amadori
e2ae03e798
Merge with upstream/master
2017-02-24 16:54:27 +01:00
Dean Herbert
12db33ad4b
Visual and readability improvements to StarCounter.
2017-02-24 19:30:56 +09:00
Dean Herbert
3a89348413
Centralise access to WorkingBeatmaps.
...
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
2017-02-24 13:43:21 +09:00
DrabWeb
c94da4fcf0
Added popup dialog
2017-02-24 00:05:37 -04:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings
2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c
Update framework and add "Async" suffix to asynchronous methods
2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Seth
b4b88712ad
Merge branch 'master' into mod-overlay
2017-02-23 08:00:24 -04:00
Dean Herbert
6701cd9016
Merge branch 'master' into general-fixes
2017-02-23 17:04:53 +09:00
Dean Herbert
011d2cc7cc
oops
2017-02-23 16:44:59 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
Dean Herbert
aec5fa9d72
Remove unused local variable.
2017-02-23 12:17:42 +09:00
DrabWeb
416772e96f
Update to work with latest framework
2017-02-22 12:46:38 -04:00
DrabWeb
99f1f88c75
Merge https://github.com/ppy/osu into mod-overlay
2017-02-22 12:35:55 -04:00
Dean Herbert
d19a7813f3
Fix TestCasePlayer regression.
2017-02-22 23:27:29 +09:00
Dean Herbert
aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
