Dean Herbert
|
2f53f2e248
|
Add license headers.
|
2017-04-18 22:35:21 +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
|
2bf560a371
|
Disable page three for now.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
e8d55b5bb5
|
Add back button.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
4a3fc710c4
|
Add temporary combo/accuracy display.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
f1bd64a74d
|
Adjust colour metrics.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
32df625d82
|
Adjust text size and padding.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
28835bd5bd
|
Add back comma separator to score display.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
782019e0c7
|
Make line gradient correct.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
886ac1fb40
|
Add progress graph background and update ruleset references.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
968d46a10f
|
whitespace.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
49fc91cf37
|
Add an exit transition.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
72fcc09a98
|
Add beatmap info and score date.
Also adjusts design metrics.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
7d32cc85c8
|
Make leaderboard scores clickable.
|
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
|
4a60e9299e
|
Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
|
2017-04-18 10:59:43 +09:00 |
|
Dean Herbert
|
8ef675d9b3
|
Add fallback to allow FilterCriteria to run without a ruleset being set.
|
2017-04-18 10:55:45 +09:00 |
|
smoogipooo
|
d5c5b7eb6b
|
Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
|
2017-04-18 10:09:36 +09:00 |
|
Dean Herbert
|
6b6690caf7
|
Fix filtering by ruleset.
|
2017-04-18 10:04:41 +09:00 |
|
Dean Herbert
|
f2174054ea
|
Fix song select.
|
2017-04-18 10:04:32 +09: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
|
928550b1a8
|
Merge branch 'master' into remove-playmode
|
2017-04-17 21:01:10 +09:00 |
|
Huo Yaoyuan
|
c235a14e3e
|
Don't block input in BeatmapInfoWedge.
|
2017-04-17 17:08:01 +08: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 |
|
ColdVolcano
|
ca1f89f2cf
|
Fix crash when there's no beatmaps
|
2017-04-14 17:48:27 -05:00 |
|
ColdVolcano
|
2c6327fca9
|
Build for real this time
|
2017-04-14 17:17:51 -05:00 |
|
Javier Flores
|
984c7092a6
|
Pls AppVeyor don't die
|
2017-04-14 16:33:58 -05:00 |
|
smoogipooo
|
ddce3c157f
|
Clean up a few remaining stragglers.
|
2017-04-15 06:15:55 +09:00 |
|
smoogipooo
|
4a149c4ab8
|
Better default values + don't set Mode from outside.
|
2017-04-15 06:14:31 +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 |
|
ColdVolcano
|
0a89e7deb8
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2017-04-14 13:32:55 -05:00 |
|
ColdVolcano
|
b7d61add45
|
Cleanup + AppVeyor fixes
|
2017-04-14 13:10:59 -05:00 |
|
ColdVolcano
|
b5fc84087f
|
Show song in MusicController and SongSelect
|
2017-04-14 12:59:15 -05:00 |
|
ColdVolcano
|
2eb73a7c70
|
More smoothness when MenuMusic is false
|
2017-04-14 12:58:47 -05:00 |
|
ColdVolcano
|
2a9f4e6950
|
Get MenuMusic and MenuVoice woking
|
2017-04-14 12:42:42 -05: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
|
7b240d84da
|
Merge branch 'master' into master
|
2017-04-12 15:04:27 -07:00 |
|
Dean Herbert
|
2c3fa30386
|
Metric -> Metrics.
|
2017-04-12 21:09:39 +09:00 |
|
ocboogie
|
32b87d12b5
|
Removed unneeded using
|
2017-04-12 04:54:24 -07:00 |
|
Dean Herbert
|
157ad17606
|
Merge branch 'master' into details
|
2017-04-12 20:25:51 +09: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 |
|
Jorolf
|
98ce9e0724
|
remove ??
|
2017-04-12 11:25:32 +02:00 |
|
Jorolf
|
e285d33f8c
|
fails, retries and size not enforced
|
2017-04-12 11:05:10 +02:00 |
|
Jorolf
|
d2affe6867
|
requested changes
|
2017-04-12 10:52:24 +02:00 |
|
ocboogie
|
8cad09370d
|
Fixed pause and fail screen overlap
|
2017-04-12 00:20:41 -07:00 |
|
ColdVolcano
|
50cb9e0fe7
|
Match stable search parameters
|
2017-04-11 18:07:54 -05:00 |
|
Jorolf
|
ed2f5d210e
|
condensed some commits because they were small or already reversed
|
2017-04-11 22:48:53 +02:00 |
|
Jorolf
|
50b6bcd574
|
Merge branch 'master' into details
|
2017-04-11 19:06:58 +02:00 |
|
Jorolf
|
d4e5f55091
|
the power of linq
|
2017-04-11 18:43:48 +02:00 |
|
Dan Balasescu
|
3b60ca3c1c
|
Merge branch 'master' into leaderboard-api
|
2017-04-12 00:14:24 +09:00 |
|
Dan Balasescu
|
bc98e53aff
|
I helped.
|
2017-04-12 00:09:45 +09:00 |
|
Jorolf
|
9026880495
|
fix
|
2017-04-11 14:40:12 +02:00 |
|
Jorolf
|
9dd8920c2c
|
🤔 I hope this works
|
2017-04-11 14:22:13 +02:00 |
|
Jorolf
|
bfebba3a20
|
null reference fixes
|
2017-04-11 14:12:23 +02:00 |
|
Jorolf
|
fb5952186c
|
changes and fixes
|
2017-04-11 14:02:56 +02: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
|
9732110bd9
|
Update TransformTo methods in line with framework changes.
|
2017-04-11 17:25:56 +09:00 |
|
Dean Herbert
|
dc3a2d45fe
|
Move API lookup from BeatmapDetailArea to Leaderboard.
|
2017-04-11 16:36:50 +09:00 |
|
Dean Herbert
|
ecfe68d6fb
|
Hide deprecated API storage variables and populate Score.User automatically.
|
2017-04-11 16:36:47 +09:00 |
|
Jorolf
|
ad41fd5c1a
|
more unnecessary stuff
|
2017-04-10 16:49:48 +02:00 |
|
Jorolf
|
a597149b7f
|
Merge branch 'details' of github.com:Jorolf/osu into details
|
2017-04-10 16:42:42 +02:00 |
|
Jorolf
|
24b4b3ad7d
|
update to everything
|
2017-04-10 16:42:23 +02:00 |
|
Dean Herbert
|
c6a24bb549
|
Merge branch 'master' into details
|
2017-04-10 20:07:13 +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
|
7366640b95
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry
|
2017-04-10 09:10:20 +03:00 |
|
Dean Herbert
|
bb4a909de5
|
Update UI control access in line with framework changes.
|
2017-04-10 14:54:23 +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 |
|
Jorolf
|
bcef1ce2b6
|
replace space in text with Spacing in FillFlowContainer
|
2017-04-08 13:59:22 +02:00 |
|
Jorolf
|
f7a9a11ae5
|
Bar uses AccentColour aswell
|
2017-04-08 13:53:11 +02:00 |
|
Dean Herbert
|
adc16b0727
|
Merge pull request #608 from Tom94/music-controller-button-animation
Music controller button animation
|
2017-04-08 20:48:39 +09:00 |
|
Jorolf
|
5e56e84c4a
|
change SRGBColour to Color4 and use IHasAccentColour in some places
|
2017-04-08 13:31:55 +02:00 |
|
Dean Herbert
|
b5431c496b
|
Fix osu! logo handling drags for no reason.
|
2017-04-08 19:34:04 +09:00 |
|
Jorolf
|
c60a55285c
|
updated TestCase and some null checks
|
2017-04-07 20:32:09 +02:00 |
|
Jorolf
|
6a87fd6112
|
retries and fails hide if they're not present
|
2017-04-07 20:19:03 +02:00 |
|
Jorolf
|
899e559b5c
|
ratings hide now + remove unnessary stuff
|
2017-04-07 19:58:49 +02:00 |
|
Jorolf
|
65d9f4fc45
|
hide MetadataSegments without content and remove fail/retry initialisations
|
2017-04-07 19:27:14 +02:00 |
|
Jorolf
|
9881889f88
|
removed some unused stuff
|
2017-04-07 18:24:36 +02:00 |
|
Jorolf
|
eb4b3772e9
|
put Bar into its own file and let it only add a background if BackgroundColour is changed
|
2017-04-07 18:13:55 +02: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 |
|
Jorolf
|
e59c0a770f
|
Merge branch 'master' into details
|
2017-04-06 15:42:00 +02:00 |
|
Jorolf
|
28193cbaaa
|
hide BeatmapDetails on entering the Select screen
|
2017-04-06 15:39:23 +02:00 |
|
Huo Yaoyuan
|
411988f038
|
Remove all trailing whitespaces in this repo.
|
2017-04-06 16:21:18 +08:00 |
|
Huo Yaoyuan
|
9b1e010dcc
|
Fix filename mismatch.
|
2017-04-06 16:05:41 +08:00 |
|
Dean Herbert
|
942699218a
|
Merge branch 'master' into details
|
2017-04-06 15:44:43 +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 |
|
Dean Herbert
|
4b1588a21d
|
Fix correct mode filter not being applied when first entering song select.
|
2017-04-05 17:33:19 +09:00 |
|
Dean Herbert
|
8173d01d78
|
Fix crash on changing play mode too early.
|
2017-04-05 17:26:45 +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 |
|
Jorolf
|
b2731bb0a1
|
some formatting
|
2017-04-04 17:27:08 +02:00 |
|
Jorolf
|
58f8dc8254
|
add direction to graphs
|
2017-04-04 17:17:22 +02: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 |
|
Dean Herbert
|
f6303d55ec
|
Upodate some tab usages.
|
2017-04-04 11:13:09 +09:00 |
|