Dean Herbert
|
325af333b9
|
Update API responses for chat.
|
2017-04-19 18:46:48 +09:00 |
|
Dean Herbert
|
1f7ed72dc6
|
Update font/size.
|
2017-04-19 17:32:30 +09:00 |
|
Dean Herbert
|
3b95fbab7d
|
Add score statistic tracking (osu!).
|
2017-04-19 16:29:27 +09:00 |
|
Dean Herbert
|
662544e04f
|
Merge branch 'master' into results-screen
# Conflicts:
# osu.Game/Rulesets/Replays/Replay.cs
|
2017-04-19 16:25:31 +09:00 |
|
Dean Herbert
|
afcd7d7fa0
|
Format accuracy better in LeaderboardScores.
|
2017-04-19 16:05:17 +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
|
83fa143e17
|
Bring API request structure up-to-date.
|
2017-04-19 16:05:06 +09:00 |
|
Dean Herbert
|
2f53f2e248
|
Add license headers.
|
2017-04-18 22:35:21 +09:00 |
|
Dean Herbert
|
cef6a014d5
|
Add a simulated key-up delay to auto replays.
Fixes key counter display looking odd.
|
2017-04-18 22:31:52 +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
|
15d62a0c76
|
Add temporary ScoreRank assignment.
|
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
|
77dbbe6f34
|
Add a placeholder cover URL for users.
|
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 |
|
smoogipooo
|
7a6b062e72
|
Fix adding duplicate hitobjects in the case where a hit object doesn't need to be converted.
|
2017-04-18 14:48:18 +09:00 |
|
smoogipooo
|
cf404b4bcf
|
We shouldn't be adding null hitobjects.
|
2017-04-18 14:46:56 +09:00 |
|
ocboogie
|
be8d32688b
|
Fixed HotkeyRetryOverlay just going to a black screen
|
2017-04-17 22:36:03 -07:00 |
|
Dan Balasescu
|
0dd97c433f
|
Trim whitespace.
|
2017-04-18 14:34:39 +09:00 |
|
smoogipooo
|
27ddf4b475
|
Refactor beatmap converters.
|
2017-04-18 14:31:06 +09: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
|
ef5d50e7d8
|
mode -> ruleset.
|
2017-04-18 11:29:27 +09:00 |
|
smoogipooo
|
8844ff7ab7
|
CI fixes.
|
2017-04-18 11:20:39 +09:00 |
|
smoogipooo
|
d04353aed0
|
Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter.
|
2017-04-18 11:13:11 +09: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 |
|
Dean Herbert
|
5939ba9143
|
Fix ruleset not always being initialised correctly.
|
2017-04-18 10:55:33 +09:00 |
|
smoogipooo
|
5a78ce15a1
|
Fix CanConvert not returning correctly.
|
2017-04-18 10:23:49 +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
|
1be1683a4f
|
Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
|
2017-04-18 09:58:39 +09:00 |
|
smoogipooo
|
0cef14ca63
|
CI fixes.
|
2017-04-18 09:51:02 +09:00 |
|
Dean Herbert
|
d3c1520a2d
|
Fix beatmaps not getting the correct ruleset on import.
|
2017-04-18 09:47:29 +09:00 |
|
Dean Herbert
|
2734983564
|
Add unique constraints on RulesetInfo table to ensure things stay sane.
|
2017-04-18 09:47:16 +09:00 |
|
smoogipooo
|
0e1ce333e3
|
Make IBeatmapProcessor a class with virtual methods.
|
2017-04-18 09:43:43 +09:00 |
|
smoogipooo
|
efc050a95a
|
Make IBeatmapConverter an abstract class instead of an interface.
|
2017-04-18 09:38:52 +09:00 |
|
smoogipooo
|
456aee63ca
|
Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace.
|
2017-04-18 09:36:08 +09:00 |
|
smoogipooo
|
c61e3265bb
|
A few xmldoc additions/fixes.
|
2017-04-18 09:20:38 +09:00 |
|
smoogipooo
|
786446354e
|
Fix post-rebase errors.
|
2017-04-18 09:00:53 +09:00 |
|
smoogipooo
|
04973ae65e
|
Fix conversion types for Catch and Mania.
|
2017-04-18 08:58:21 +09:00 |
|
smoogipooo
|
09208adf81
|
Re-implement legacy hit object conversion.
|
2017-04-18 08:58:21 +09:00 |
|
smoogipooo
|
2767fbd81a
|
Implement Beatmap conversion testing.
|
2017-04-18 08:57:09 +09:00 |
|
Jorolf
|
095b6fded6
|
removed unused stuff and change the tooltip y coordinate
|
2017-04-17 19:50:34 +02:00 |
|
Jorolf
|
906d68936a
|
Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips
|
2017-04-17 17:43:54 +02:00 |
|
Jorolf
|
25fd1d2b72
|
made method into property
|
2017-04-17 17:43:44 +02:00 |
|
Jorolf
|
d4ac3c5e9c
|
Update MenuCursor.cs
|
2017-04-17 17:10:55 +02:00 |
|
Jorolf
|
773e6a2911
|
moved tooltip stuff to Tooltip instead of MenuCursor
|
2017-04-17 17:04:48 +02:00 |
|
Jorolf
|
dd26f9fcac
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
|
2017-04-17 14:45:46 +02:00 |
|
Dean Herbert
|
928550b1a8
|
Merge branch 'master' into remove-playmode
|
2017-04-17 21:01:10 +09:00 |
|
Dean Herbert
|
af13f97435
|
Fix regressions and test cases.
|
2017-04-17 19:44:03 +09:00 |
|
Huo Yaoyuan
|
c235a14e3e
|
Don't block input in BeatmapInfoWedge.
|
2017-04-17 17:08:01 +08:00 |
|
Dean Herbert
|
db6556a0f9
|
Index DeletePending for better performance.
|
2017-04-17 17:44:02 +09:00 |
|
Dean Herbert
|
a4e2f34ee7
|
Make a RulesetDatabase.
|
2017-04-17 17:43:48 +09:00 |
|
Dean Herbert
|
83b083ce64
|
Move SQLite connections out of database classes; make abstract Database.
|
2017-04-17 14:37:52 +09:00 |
|
Dean Herbert
|
ce12cc20bd
|
Merge remote-tracking branch 'upstream/master' into remove-playmode
|
2017-04-17 13:00:53 +09:00 |
|
ocboogie
|
78273d76e3
|
Added basic loading screen and test case
|
2017-04-16 20:18:41 -07:00 |
|
Adrian Kaz Scherzinger
|
60f7879875
|
Explicitly set C# 6.0 for now.
|
2017-04-16 06:44:08 +09: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
|
0333e1a050
|
Remove unused usings.
|
2017-04-15 05:57:18 +09:00 |
|
smoogipooo
|
3845ab2a72
|
Add comment.
|
2017-04-15 05:55:38 +09:00 |
|
smoogipooo
|
6dbc75283c
|
Re-implement config value.
|
2017-04-15 05:52:58 +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 |
|
Dan Balasescu
|
31ce66bfdc
|
Trim whitespace.
|
2017-04-15 01:31:42 +09:00 |
|
Dan Balasescu
|
3de3b94978
|
Merge branch 'master' into song-progress-graph
|
2017-04-15 01:29:02 +09:00 |
|
Dean Herbert
|
52ddc414d5
|
Fix errors.
|
2017-04-14 20:17:17 +09:00 |
|
Dean Herbert
|
ed3956eca5
|
Make comma separators optional.
|
2017-04-14 20:09:01 +09:00 |
|
Dean Herbert
|
ac3b435f00
|
Merge remote-tracking branch 'upstream/master' into hud-improvements
# Conflicts:
# osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
|
2017-04-14 19:29:59 +09:00 |
|
Dean Herbert
|
9d753a7798
|
Merge branch 'master' into song-progress-graph
|
2017-04-14 19:24:13 +09:00 |
|
Dean Herbert
|
98544a8077
|
Fix unsynchronised tweening.
|
2017-04-14 19:20:07 +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 |
|
Jorolf
|
7f08c3c417
|
add IHasOverhangingTooltip
|
2017-04-14 00:18:17 +02:00 |
|
Jorolf
|
f6f75fac74
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
# Conflicts:
# osu.Game/Graphics/Cursor/MenuCursor.cs
|
2017-04-13 23:12:07 +02:00 |
|
Jorolf
|
c2b2e5ec19
|
changed way the tool tip is found and displayed
|
2017-04-13 23:00:49 +02: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
|
13f057f900
|
Give CursorTrail its own clock for the time being.
|
2017-04-13 14:14:12 +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 |
|
smoogipooo
|
3054697f98
|
Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.
|
2017-04-13 10:04:12 +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 |
|
Dean Herbert
|
00cd2c8372
|
Better comments.
|
2017-04-12 21:08:28 +09:00 |
|
ocboogie
|
32b87d12b5
|
Removed unneeded using
|
2017-04-12 04:54:24 -07:00 |
|
smoogipooo
|
2987a57588
|
Use formatter to add zeroes.
|
2017-04-12 20:28:04 +09:00 |
|
Dean Herbert
|
157ad17606
|
Merge branch 'master' into details
|
2017-04-12 20:25:51 +09:00 |
|
Dan Balasescu
|
5bf71aae9c
|
Remove unused using.
|
2017-04-12 20:14:12 +09:00 |
|
Dean Herbert
|
1d1b291efc
|
Merge branch 'master' into sliderbar-improvements
|
2017-04-12 20:04:36 +09:00 |
|
ocboogie
|
6c6ef946bd
|
Some more clean up
|
2017-04-12 04:01:52 -07:00 |
|
Dan Balasescu
|
ce269eaebb
|
Merge branch 'master' into dependency-updates
|
2017-04-12 19:56:18 +09:00 |
|
Dean Herbert
|
ec6267c5b2
|
switch -> if.
|
2017-04-12 19:41:11 +09:00 |
|
Dean Herbert
|
c0338a82e7
|
Update nuget packages.
Includes fix in OpenTK for focus issues.
|
2017-04-12 19:35:16 +09: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 |
|
Dean Herbert
|
5676541173
|
Merge pull request #623 from smoogipooo/general-fixes
General fixes
|
2017-04-12 15:19:21 +09:00 |
|
Dan Balasescu
|
6ab274abc0
|
Trim whitespace
|
2017-04-12 15:06:46 +09:00 |
|
smoogipooo
|
f8076ec792
|
Better comment.
|
2017-04-12 15:04:11 +09:00 |
|
smoogipooo
|
0c90ef79fa
|
Make TestCaseTaikoPlayfield work again.
|
2017-04-12 12:37:02 +09:00 |
|
Dean Herbert
|
9eb4802e83
|
Merge pull request #621 from ColdVolcano/better-beatmap-search
Match stable search parameters when searching beatmaps
|
2017-04-12 12:12:04 +09:00 |
|
Dean Herbert
|
2964c04c14
|
Add special SliderBar sound behaviour when at extents.
|
2017-04-12 12:07:29 +09:00 |
|
Dean Herbert
|
d6fa51dc5c
|
Update SliderBar to use OnUserChange method.
|
2017-04-12 12:07:27 +09:00 |
|
smoogipooo
|
a922e67754
|
Because Ruleset only exposes HitRenderer, we need to have AspectAdjust in the base class.
|
2017-04-12 12:06:56 +09:00 |
|
Poliwrath
|
dffdb100ab
|
Small fix to the chat overlay to prevent crashing on the test
|
2017-04-11 21:35:49 -04: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 |
|