Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support.
2017-04-21 17:33:37 +09:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset).
2017-04-21 16:20:05 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
...
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
1707c2458e
Update exception name.
2017-04-20 12:11:03 +09:00
Dean Herbert
873599b359
Fix conversion regression.
2017-04-20 11:36:50 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation.
2017-04-20 11:16:08 +09:00
Dean Herbert
3e48a57e9a
Merge branch 'master' into score-statistics
2017-04-19 20:36:14 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!).
2017-04-19 16:29:27 +09:00
Dean Herbert
2783f49267
Fix incorrect EndTimes when processing has not been run on HitObjects before the SongProgressGraph is displayed.
2017-04-19 16:05:14 +09:00
Dean Herbert
49f4981f1c
Fix CI issues.
2017-04-18 22:28:16 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play.
2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen.
2017-04-18 22:22:14 +09:00
Dean Herbert
b0f1851e88
Adjust visuals slightly.
2017-04-18 20:52:57 +09:00
Dean Herbert
1071645dca
Flexible cube count (and thus graph height).
...
This also scaled the graph to the height of the maximum value. And much tidying.
2017-04-18 19:25:52 +09:00
Dean Herbert
3b21340e1b
Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.
2017-04-18 18:40:02 +09:00
Dean Herbert
417a5ca713
A bit of renaming.
2017-04-18 18:29:24 +09:00
Dean Herbert
66865c50ad
Remove explicit RelativeSize setting.
2017-04-18 18:10:13 +09:00
Dean Herbert
784ca2300b
Add safety check for when no objects have been assigned.
2017-04-18 18:09:37 +09:00
Dean Herbert
5ba85818db
Combine push logic and adjust transitions a bit more.
2017-04-18 17:07:02 +09:00
Dean Herbert
ddff26d167
Show metadata when loading between retries.
...
Also speeds up the display a bit.
2017-04-18 17:00:58 +09:00
Dean Herbert
edd71c0560
Tidy up and comment PlayerLoader logic.
2017-04-18 16:56:01 +09:00
Dean Herbert
2ccb8b154f
Change conditional ordering to allow player to always run its fadeOut sequence.
2017-04-18 16:47:30 +09:00
Dean Herbert
24deaf05b6
Merge branch 'master' into player-loader-restart
2017-04-18 16:36:25 +09:00
Dean Herbert
64a8992153
Merge branch 'master' into general-fixes
2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
ocboogie
1f7373db8f
Removed unneeded restarting variable
2017-04-17 23:52:38 -07:00
ocboogie
2bd89e922f
Removed unneeded newPlayer
2017-04-17 23:48:21 -07:00
ocboogie
c0f4cbcba6
Added back PlayerLoader overlays
2017-04-17 23:36:11 -07:00
Dean Herbert
727086c0b2
Updates in-line with framework.
2017-04-18 15:34:53 +09:00
ocboogie
be8d32688b
Fixed HotkeyRetryOverlay just going to a black screen
2017-04-17 22:36:03 -07:00
ocboogie
5c48fa6cb1
Removed testing line
2017-04-17 21:35:48 -07:00
ocboogie
aa466d0e84
PlayerLoader creates a new instance of the Player class on Restart
2017-04-17 21:32:38 -07:00
smoogipooo
786446354e
Fix post-rebase errors.
2017-04-18 09:00:53 +09:00
smoogipooo
2767fbd81a
Implement Beatmap conversion testing.
2017-04-18 08:57:09 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
ocboogie
78273d76e3
Added basic loading screen and test case
2017-04-16 20:18:41 -07:00
smoogipooo
3845ab2a72
Add comment.
2017-04-15 05:55:38 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be
Make BeatmapInfo expose Ruleset instead of PlayMode.
2017-04-15 05:01:36 +09:00
smoogipooo
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
Dean Herbert
9d753a7798
Merge branch 'master' into song-progress-graph
2017-04-14 19:24:13 +09:00
Dean Herbert
ea0631ede8
Encapsulate progress update logic better.
2017-04-14 18:23:34 +09:00
Dean Herbert
acd7a5b254
Hook up beatmap object density to progress display.
2017-04-14 17:58:37 +09:00
Dean Herbert
6421f040dd
Fix SongProgress handling escape.
2017-04-14 15:27:24 +09:00
Dean Herbert
8c41707ac7
Fix incorrect default state. Handle input better.
2017-04-14 14:40:52 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
Dean Herbert
9bf861d0a4
Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up
...
# Conflicts:
# osu.Game/Screens/Play/FailOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
2017-04-14 01:07:34 +09:00
Dean Herbert
262a2c9f0e
Add exception for failing.
2017-04-13 19:13:09 +09:00
Dean Herbert
5f8baf874d
Use interpolatedSourceClock's IsRunning value for consistency.
2017-04-13 18:31:23 +09:00
Dean Herbert
1f4e0b0251
Fix MosueUp and HighResolution events not being handled by MenuOverlays.
2017-04-13 13:03:07 +09:00
Dean Herbert
359fea7e25
Improve "escape" pressing logic in pause/fail menus.
2017-04-13 12:40:00 +09:00
Dean Herbert
94bf1d65b6
Fix thread race conditions on pausing close to a fail.
2017-04-13 11:41:08 +09:00
ocboogie
32b87d12b5
Removed unneeded using
2017-04-12 04:54:24 -07:00
ocboogie
6c6ef946bd
Some more clean up
2017-04-12 04:01:52 -07:00
ocboogie
d250dde537
Fixed repeat keys working for retrying
2017-04-12 02:50:03 -07:00
ocboogie
348dd71406
Fixed repeat keys working for resuming
2017-04-12 02:43:42 -07:00
ocboogie
8cad09370d
Fixed pause and fail screen overlap
2017-04-12 00:20:41 -07:00
Dan Balasescu
bc98e53aff
I helped.
2017-04-12 00:09:45 +09:00
Dean Herbert
1a1607aaaa
Improve the look of the transition on hotkey retry (and retry in general).
2017-04-11 19:58:57 +09:00
Dean Herbert
43a4657540
Remove unnecessary AlwaysPresent.
2017-04-10 17:26:05 +09:00
Dean Herbert
3a01cfccee
Adjust fade length and easing.
2017-04-10 17:25:56 +09:00
Dean Herbert
15c1013f5b
Don't schedule event, it's unreliable and doesn't match the fade.
2017-04-10 17:25:46 +09:00
Andrey Zavadskiy
1879a05c7b
Removed using
2017-04-10 06:10:12 +03:00
Andrey Zavadskiy
e73f543c4f
Applied suggestions
2017-04-10 06:06:10 +03:00
Andrey Zavadskiy
a7264aa84c
Warning fix
2017-04-09 17:53:16 +03:00
Andrey Zavadskiy
425e96c45c
Moved logic to it's own class
2017-04-09 17:44:19 +03:00
Andrey Zavadskiy
4ab4f65c83
Retry on Tilde key
2017-04-09 16:26:31 +03:00
Dean Herbert
0d4f457265
Improve transitions when exiting play mode.
2017-04-07 20:46:35 +09:00
Dean Herbert
54d1afb655
Fade in HitRenderer post entering animation.
2017-04-07 20:38:57 +09:00
Dean Herbert
39175905e4
Fix crashes on completing a taiko map (where a strong his is the last hit in the map).
2017-04-07 16:56:09 +09:00
Dean Herbert
7e99fc47e2
wip
2017-04-07 16:54:54 +09:00
Dean Herbert
1842d80e28
Update test case.
2017-04-07 09:43:08 +09:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Modes/UI/HudOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
Dean Herbert
7c63c8394b
Remove unnecessary depth setting.
2017-04-06 15:36:03 +09:00
Dean Herbert
a18367454d
InGameOverlay -> MenuOverlay.
2017-04-06 15:34:52 +09:00
Dean Herbert
856696b17e
Fix incorrect verbatim strings.
2017-04-06 15:31:21 +09:00
Dean Herbert
6285f3eea8
Merge branch 'master' into pause_buttons_refactor
2017-04-06 15:00:48 +09:00
Andrey Zavadskiy
0946e42363
removed useless stuff
2017-04-05 22:51:43 +03:00
Andrey Zavadskiy
6a510097df
InGameOverlay fixes
2017-04-05 22:36:03 +03:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not.
2017-04-05 17:38:57 +09:00
Andrey Zavadskiy
f2a9ec0f24
Converted constructor to protected
2017-04-04 19:02:36 +03:00
Andrey Zavadskiy
7b95f2d46a
InGameOverlay now is abstract
2017-04-04 18:53:13 +03:00
Andrey Zavadskiy
62655b70c9
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-04-04 18:41:37 +03:00
Dean Herbert
7c74951454
Update bindables.
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseResults.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
smoogipooo
27132958c8
Merge remote-tracking branch 'origin/master' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-03 14:19:31 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Andrey Zavadskiy
1ecff1b32c
Fix naming and testcase
2017-04-01 21:50:25 +03:00
Andrey Zavadskiy
f70de7439b
Moved title and description to each class
2017-04-01 21:42:12 +03:00
Andrey Zavadskiy
bd123fa906
Better inheritance
2017-04-01 21:29:17 +03:00
Andrey Zavadskiy
e3a8a14281
Removed unnecessary using
2017-04-01 21:19:49 +03:00
Andrey Zavadskiy
ebc814f06a
Typos fix
2017-04-01 21:17:24 +03:00
Andrey Zavadskiy
3574dac780
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-04-01 21:03:19 +03:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility.
2017-03-31 15:59:53 +09:00
smoogipooo
eed50784ba
Make player work with TaikoHitRenderer.
2017-03-29 11:35:57 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
Andrey Zavadskiy
91e18cc63e
Fix usings
2017-03-28 12:12:35 +03:00
Andrey Zavadskiy
cf3db49631
Inherit Pause/Fail overlay from InGameOverlay
2017-03-28 12:09:26 +03:00
Andrey Zavadskiy
687f71e410
Fixes
2017-03-28 11:45:48 +03:00
Andrey Zavadskiy
60be69d3b0
Fixes
2017-03-28 11:41:08 +03:00
Andrey Zavadskiy
85c2184170
Fixes
2017-03-28 11:33:56 +03:00
Andrey Zavadskiy
62693a6a59
Again separate classes
2017-03-28 10:49:58 +03:00
Andrey Zavadskiy
9774f826ab
Pause and fail overlays -> StopOverlay
2017-03-28 06:08:31 +03:00
Andrey Zavadskiy
c4500fa270
fixes
2017-03-28 05:19:32 +03:00
Andrey Zavadskiy
110d43bc25
fixes
2017-03-28 05:12:04 +03:00
Andrey Zavadskiy
457f5c6a89
Removed unised using statement
2017-03-28 04:58:30 +03:00
Andrey Zavadskiy
5461c6516a
Refactor PauseOverlay, FailDialog -> FailOverlay
2017-03-28 04:53:57 +03:00
Andrey Zavadskiy
2f9a15092b
Refactor pause buttons
2017-03-28 04:52:11 +03:00
DrabWeb
f0035659db
Unused using
2017-03-24 00:45:19 -03:00
DrabWeb
a6dfed9668
Formatting
2017-03-24 00:41:56 -03:00
DrabWeb
0edee04200
Use OsuColour instead of static colours
2017-03-24 00:41:14 -03:00
DrabWeb
f1f6f2041f
Null track handling in player
2017-03-23 23:57:33 -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
b429d8f1b3
More proper fix
2017-03-23 09:05:53 -03:00
DrabWeb
3364801221
Fix for the fix
2017-03-23 08:32:24 -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
ca2816f9c8
Formatting
2017-03-23 07:24:43 -03:00
DrabWeb
3923892863
Delete SongProgressGraphColumn.cs
2017-03-23 07:20:16 -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
DrabWeb
0337f18fb9
Cleaning
2017-03-23 06:37:12 -03: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
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
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
340ddb59cd
License headers
2017-03-22 08:54:21 -03:00
DrabWeb
29c54d4d8b
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-22 08:50:17 -03:00
Dean Herbert
f9f31ca092
Add statefulness to MenuCursor.
2017-03-17 20:45:27 +09:00
Dean Herbert
7110ab8e17
Stop cursor moving when paused.
2017-03-17 20:45:27 +09:00
smoogipooo
9a4af8f194
GetScore -> CreateScore.
2017-03-17 02:03:12 +09:00
smoogipooo
2394e7ff78
Make CheckFailed not actually trigger internal things, and make private.
2017-03-17 01:36:30 +09:00
Dean Herbert
ea642e5ef4
Merge branch 'master' into scoreprocessor_failing_improvements
2017-03-17 00:52:30 +09:00
smoogipooo
b13340c3c8
Move CheckFailed outside of Schedule().
2017-03-17 00:30:23 +09:00
Dean Herbert
271dddc9a7
Merge branch 'master' into generic_scoreprocessor
2017-03-16 23:04:19 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files.
2017-03-16 21:17:14 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
smoogipooo
2a2caeba32
Add better failing support to ScoreProcessor.
2017-03-16 13:39:57 +09:00
smoogipooo
c82ae011fb
Make ScoreProcessors take generic judgements.
2017-03-16 12:45:23 +09:00
Dean Herbert
14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes
...
# Conflicts:
# osu.Game/Modes/UI/HitRenderer.cs
2017-03-14 16:15:26 +09:00
Dean Herbert
1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
2017-03-14 16:00:35 +09:00
Dan Balasescu
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
Dean Herbert
0da950beac
Fix KeyCounter M1 M2 display.
2017-03-14 12:31:09 +09:00
Dean Herbert
4fa037c0b2
Update framework.
2017-03-14 12:01:58 +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
529cabb001
Make HudOverlay not dependent on Ruleset.
2017-03-10 16:16:07 +09:00
smoogipooo
4015b87965
General fixes.
2017-03-10 13:09:50 +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
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09: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
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
Dean Herbert
57cbecba83
Required changes for framework merge ( https://github.com/ppy/osu-framework/pull/554 ).
2017-03-06 22:08:02 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support.
2017-03-06 14:52:37 +09:00
Dean Herbert
faf07ab51a
Use generics everywhere.
2017-03-06 13:59:11 +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
Thomas Müller
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers).
2017-03-04 23:24:13 +09:00
Dean Herbert
7a6a614358
Don't show pause menu when watching replays.
2017-03-04 21:35:26 +09:00
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01: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
Seth
1891bdf51e
Merge branch 'master' into mod-overlay
2017-03-03 01:11:15 -04:00
Dean Herbert
3a8246f56d
Move PauseOverlay to correct namespace.
2017-03-03 10:17:39 +09:00
DrabWeb
223962121e
Refactor not just rename
2017-03-02 09:26:29 -04:00
DrabWeb
1eeb4aa875
Missed some
2017-03-02 09:21:16 -04:00
DrabWeb
536925c77a
Comply to naming conventions
2017-03-02 09:15:53 -04: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
c4ca18eeba
Remove references to PassThrough.
2017-03-02 16:28:51 +09:00
DrabWeb
367d6d694c
Merge https://github.com/ppy/osu into mod-overlay
2017-03-02 01:44:18 -04:00
Thomas Müller
4d28696479
FlowDirection -> FillDirection
2017-03-01 20:15:38 +01: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
Jorolf
522034020e
Moved Bindable init
2017-02-28 11:44:12 +01:00
DrabWeb
570c95cb98
Merge https://github.com/ppy/osu into mod-overlay
2017-02-28 02:22:59 -04:00
Jorolf
8b3477820f
Disable mousewheel while playing
2017-02-28 00:08:34 +01:00
default0
03889e6ca6
Update References to FlowStrategies
...
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Dean Herbert
68dd3c02aa
Fix failing testcase (nullref).
2017-02-27 17:05:12 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith.
2017-02-27 12:24:53 +09:00
default0
8d91519d59
Update usage of FlowContainer and its subclasses
2017-02-26 21:32:43 +01:00
Dean Herbert
bc231c6bd4
Remove dispose which is no longer necessary.
2017-02-26 22:08:29 +09:00
Dean Herbert
c227eb1be5
Welded bindables.
2017-02-26 22:08:21 +09:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Dean Herbert
17a28cd3b6
Don't push Player if we aren't still current.
2017-02-25 11:46:19 +09:00
Dean Herbert
7483b69477
Remove unnecessary Dispose logic.
2017-02-25 10:44:19 +09:00
Dean Herbert
c4fbfb5a8f
Update comment with new knowledge.
2017-02-24 21:46:34 +09:00
Dean Herbert
5096f6b83d
Fix memory leak from Player's InputManager.
2017-02-24 21:01:05 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings
2017-02-24 11:29:34 +09:00
Thomas Müller
0264c44a20
Do not shadow Colour in TwoLayerButton
...
Renames Colour to BackgroundColour instead.
2017-02-23 22:33:37 +01:00
Thomas Müller
37bc75a7b6
Remove unused variables
2017-02-23 22:32:49 +01: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
f812641696
Merge pull request #383 from peppy/player-loading-screen
...
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
Dean Herbert
9746877903
Merge remote-tracking branch 'upstream/master' into mod-overlay
2017-02-23 11:11:52 +09:00
Dean Herbert
7e7bf07d03
Remove unused whitebox.
2017-02-23 11:11:46 +09:00
Dean Herbert
aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
Dean Herbert
7cda82d016
Space to skip.
2017-02-22 21:28:40 +09:00
Dean Herbert
2d2660c1c5
Improve transition when retrying a beatmap.
2017-02-22 14:14:37 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
Dean Herbert
9a2beb5979
Update Key Counter font.
2017-02-16 22:43:49 +09:00
Dean Herbert
d570a6d308
Handle cases where HitObjects were not parsed.
2017-02-15 12:38:10 +09:00
Dean Herbert
343e48c195
Merge branch 'master' into followpoints
2017-02-13 22:23:57 +09:00
Dean Herbert
1aeb48b920
Merge remote-tracking branch 'upstream/master' into osb_loading
2017-02-13 18:22:29 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Damnae
2d155f6a5c
Bring back the delay to what it was before.
2017-02-10 10:48:25 +01:00
Damnae
6f37c02868
Fix followpoints needing a DelayReset.
2017-02-10 10:07:52 +01:00
DrabWeb
c61052d62e
Added toggling the progress bar, added buttons to the visual test
2017-02-09 20:12:15 -04:00
DrabWeb
0327c46d36
Fixed columns not being able to have zero fill
2017-02-09 19:29:12 -04:00
DrabWeb
843b58c8f4
Moved random graph values to test case, added null handling for graph values
2017-02-09 19:08:23 -04:00
DrabWeb
ac6726ee2e
Fixed setting column filled values not updating visually, added gray background to visual test
2017-02-09 18:56:50 -04:00
DrabWeb
4d7766b92b
Added displaying given values to the graph
2017-02-09 18:51:05 -04:00
DrabWeb
7fea233181
Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar
2017-02-09 16:28:40 -04:00
Damnae
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
Andrey Zavadskiy
e06aa44c4c
Warning Fixes
2017-02-09 16:18:08 +03:00
Damnae
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
DrabWeb
50f93bc215
Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class
2017-02-08 16:22:31 -04:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing.
2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
16a01abc4d
Merge remote-tracking branch 'upstream/master' into options-refactor
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Dean Herbert
4f89cc0784
Merge pull request #298 from peppy/skip-button
...
Make skip button work.
2017-02-03 12:47:53 +09:00
Drew DeVault
52fb345e79
Merge branch 'master' into song-select-filtering
2017-02-02 09:25:27 -08:00
Drew DeVault
c88a2fbf8a
Replace incorrectly removed background logic
...
I had earlier thought that removing this would solve the weirdness with
starting the beatmap on any but the first difficulty, and forgot to
replace it when I found the actual cause.
2017-02-01 19:32:30 -05:00
Dean Herbert
90fd9d9132
Merge branch 'master' into options-refactor
2017-02-01 14:07:49 +09:00
Dean Herbert
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
DrabWeb
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
Dean Herbert
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09:00
DrabWeb
c92418e000
Made Player.canPause one line
2017-01-31 21:02:58 -04:00
DrabWeb
13da75f149
Fixed a bug where the user can double press escape to exit the song
2017-01-31 20:44:59 -04:00
DrabWeb
bcd41a2c8f
Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
2017-01-31 20:28:50 -04:00
Drew DeVault
624d51204f
Fix issue with background on player
...
Not sure why this only happens on my branch, I didn't touch this code.
2017-01-31 19:14:54 -05:00
DrabWeb
91a5d0b3cf
Made requested changes
2017-01-31 09:17:47 -04:00
Dean Herbert
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
DrabWeb
740f6e5595
Moved delaying resuming to Player
2017-01-30 09:06:26 -04:00
DrabWeb
ad33ae9431
Removed unnecessary change
2017-01-30 06:24:44 -04:00
DrabWeb
015832f242
Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
2017-01-30 06:14:28 -04:00
DrabWeb
d70cbd37dd
Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player
2017-01-30 04:08:14 -04:00
