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 |
|
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
|
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
|
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
|
94bf1d65b6
|
Fix thread race conditions on pausing close to a fail.
|
2017-04-13 11:41:08 +09:00 |
|
ocboogie
|
6c6ef946bd
|
Some more clean up
|
2017-04-12 04:01:52 -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 |
|
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
|
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
|
6285f3eea8
|
Merge branch 'master' into pause_buttons_refactor
|
2017-04-06 15:00:48 +09: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
|
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
|
f70de7439b
|
Moved title and description to each class
|
2017-04-01 21:42:12 +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
|
687f71e410
|
Fixes
|
2017-03-28 11:45:48 +03:00 |
|
Andrey Zavadskiy
|
60be69d3b0
|
Fixes
|
2017-03-28 11:41:08 +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
|
5461c6516a
|
Refactor PauseOverlay, FailDialog -> FailOverlay
|
2017-03-28 04:53:57 +03:00 |
|
DrabWeb
|
f1f6f2041f
|
Null track handling in player
|
2017-03-23 23:57:33 -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
|
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
|
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
|
818bdd8e88
|
SongProgress in HudOverlay
|
2017-03-22 09:27:04 -03:00 |
|
Dean Herbert
|
f9f31ca092
|
Add statefulness to MenuCursor.
|
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 |
|
smoogipooo
|
b13340c3c8
|
Move CheckFailed outside of Schedule().
|
2017-03-17 00:30:23 +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 |
|
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
|
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
|
7a6a614358
|
Don't show pause menu when watching replays.
|
2017-03-04 21:35:26 +09: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
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
Dean Herbert
|
c4ca18eeba
|
Remove references to PassThrough.
|
2017-03-02 16:28:51 +09: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 |
|
Jorolf
|
8b3477820f
|
Disable mousewheel while playing
|
2017-02-28 00:08:34 +01:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
7483b69477
|
Remove unnecessary Dispose logic.
|
2017-02-25 10:44:19 +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
|
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 |
|
Dean Herbert
|
aef0eb49a1
|
Add loading screen.
|
2017-02-22 21:53:59 +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
|
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 |
|
Damnae
|
2d155f6a5c
|
Bring back the delay to what it was before.
|
2017-02-10 10:48:25 +01:00 |
|