1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 05:17:25 +08:00
Commit Graph

3097 Commits

Author SHA1 Message Date
EVAST9919
698ae0832f Move string formatting inside the class 2017-05-01 07:00:44 +03:00
EVAST9919
ba0fbacda0 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-01 06:33:04 +03:00
Dean Herbert
47e4a5b9cb Merge branch 'master' into metadata_additions 2017-05-01 12:02:35 +09:00
EVAST9919
0386e96573 applied requested changes 2017-05-01 05:38:51 +03:00
Dean Herbert
96a4388b20 Merge branch 'master' into song-select-performance 2017-05-01 11:01:10 +09:00
EVAST9919
668262ed06 Applied requested changes 2017-05-01 04:53:46 +03:00
EVAST9919
e9094bac51 Added suggested changes 2017-04-30 17:05:00 +03:00
EVAST9919
e522a8c433 Merge remote-tracking branch 'refs/remotes/ppy/master' into metadata_additions 2017-04-30 16:57:57 +03:00
Jorolf
6b08f485b4 fix typo 2017-04-30 14:45:23 +02:00
Dean Herbert
1e3847c73c Cancel the existing scheduled task when running it ahead of time. 2017-04-29 20:28:56 +09:00
Dean Herbert
2dcb4e9b93 Fix race condition when attempting to start a beatmap during debounce. 2017-04-29 20:12:09 +09:00
Dean Herbert
589e89fed3 Merge remote-tracking branch 'upstream/master' into song-select-performance 2017-04-29 19:52:55 +09:00
Thomas Tan
9c6c017411 Merge branch 'master' into autoreplay-refactor-squashed 2017-04-29 17:47:38 +08:00
DrabWeb
9bdf462dd1 Possible null reference exception 2017-04-29 06:36:06 -03:00
DrabWeb
067b572245 Formatting 2017-04-29 06:28:57 -03:00
DrabWeb
ef811f3cf3 More formatting 2017-04-29 06:17:50 -03:00
DrabWeb
3f73799975 Formatting 2017-04-29 06:10:12 -03:00
DrabWeb
c193a90a16 Merge https://github.com/ppy/osu into playlist 2017-04-29 05:39:52 -03:00
Dean Herbert
f202aee2a9 Fix input not being propagated to the playfield when outside its bounds. 2017-04-29 16:59:23 +09:00
Thomas Tan
d742092d9d CI fixes 2017-04-29 02:30:34 +08:00
Thomas Tan
27632434c6 Add license header 2017-04-29 02:23:07 +08:00
EVAST9919
a8c918f7bf Removed empty line 2017-04-28 21:12:48 +03:00
Thomas Tan
9b8b88601f Create "AutoGenerator" base class and interface. 2017-04-29 02:08:48 +08:00
EVAST9919
d5c56aab7a Initial commit 2017-04-28 21:05:00 +03:00
Dean Herbert
2ece1cbd07 CI Fixes. 2017-04-28 22:26:51 +09:00
Dean Herbert
a681e3e380 Remove unused method. 2017-04-28 22:17:42 +09:00
Dean Herbert
4e65da0fd1 Fix regression in panel select animation.
Currently we are required to update computeYPositions twice per selection. Without doing this, panels are in the wrong place when using keyboard selection.

There's still a bit of work to be done to make this work correctly. It's caused by a race condition of state application for panels which have not yet been presented (and get their state applied in LoadComplete which breaks the order of things).
2017-04-28 22:17:35 +09:00
EVAST9919
f8faea8da2 Removed unnecessary nested class 2017-04-28 16:02:00 +03:00
EVAST9919
c4bd21914d warning fixes 2017-04-28 15:37:22 +03:00
EVAST9919
b409a22309 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-04-28 15:29:24 +03:00
Dean Herbert
70e81115f4 Refactor BeatmapInfoWedge to suck a little less. 2017-04-28 21:16:37 +09:00
Dean Herbert
59cc5ea00a CI Fixes. 2017-04-28 20:50:23 +09:00
Dean Herbert
45729a8881 Add debounce to WorkingBeatmap creation at song select.
Improves perceived performance when quickly moving through carousel.
2017-04-28 20:44:16 +09:00
Dean Herbert
003cf53441 Streamline panel selection event logic.
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
2017-04-28 20:43:42 +09:00
Dean Herbert
b78fa99620 Don't perform a selection if we already have the correct panel selected. 2017-04-28 20:31:09 +09:00
Dean Herbert
28375ed1fc Allow transfer of previously loaded background between WorkingBeatmaps 2017-04-28 15:03:07 +09:00
smoogipooo
c95a6fbd09 Use single line for GetUnicodePreference. 2017-04-28 14:14:14 +09:00
Dan Balasescu
658ff61e8a Merge branch 'master' into locale 2017-04-28 13:51:36 +09:00
EVAST9919
c27909d53c CI fixes 2017-04-28 05:02:25 +03:00
EVAST9919
eacf2045f0 Initial commit 2017-04-28 04:56:34 +03:00
Dean Herbert
94c259bd59 Remove most usages of DelayReset
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09:00
Dean Herbert
59a3e23879 Ensure PlayerInputManager's initial time is transferred at load. 2017-04-27 17:38:00 +09:00
Huo Yaoyuan
ad92e6d732 Remove OsuConfig.Language too. 2017-04-27 12:42:56 +08:00
Huo Yaoyuan
061c3cacbd CI fixes. 2017-04-26 20:04:32 +08:00
Huo Yaoyuan
3706bc8741 Merge branch 'master' into locale 2017-04-26 19:56:34 +08:00
Huo Yaoyuan
4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Huo Yaoyuan
cf3e83ca62 Save ShowUnicode in framework config. 2017-04-26 19:48:46 +08:00
Dan Balasescu
a243729a54 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 20:43:56 +09:00
Dan Balasescu
f261a077d2 General fixes/cleanup in Player. 2017-04-26 20:37:47 +09:00
Dan Balasescu
08b1d5beb9 Use const where it was inteded. 2017-04-26 20:15:34 +09:00
Dean Herbert
c5afb4b2a0 Merge remote-tracking branch 'upstream/master' into replay-playback-accuracy 2017-04-26 19:53:30 +09:00
Dan Balasescu
df5a95b675 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 19:53:13 +09:00
Dean Herbert
e826f17eb0 Fix get-set mismatch. 2017-04-26 19:25:41 +09:00
Dean Herbert
49c02f5ad6 Merge branch 'master' into fix-drumroll-conversion 2017-04-26 19:16:40 +09:00
Dean Herbert
f48d497737 Fix disabling mouse buttons causing auto to stop working. 2017-04-26 18:56:20 +09:00
Dean Herbert
c2108b7706 Use object initialiser. 2017-04-26 18:32:47 +09:00
Dean Herbert
b6f838f536 Fix potential nullref. 2017-04-26 18:32:40 +09:00
Dean Herbert
4656a7170a Add very basic lead-in support. 2017-04-26 18:17:25 +09:00
Dean Herbert
9d14b6e1e9 Make SongProgress return the actual time value via OnSeek. 2017-04-26 18:17:17 +09:00
Dean Herbert
01caaf44f3 Add a decoupled clock to allow for lead-in and lead-out time. 2017-04-26 18:16:55 +09:00
smoogipooo
d9dec9d444 Implement Taiko difficulty calculation. 2017-04-26 15:50:08 +09:00
Dan Balasescu
22be765323 Update HitObject.cs 2017-04-26 14:45:30 +09:00
smoogipooo
4c2985b6d1 Use CRLF instead of LF. 2017-04-26 14:40:40 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
Dean Herbert
e003d9fc3c Add basic replay frame accurate "seeking".
Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.
2017-04-25 22:59:58 +09:00
Dean Herbert
d476482493 Add basic seeking support when a replay is loaded. 2017-04-25 22:59:51 +09:00
Dean Herbert
eb5d334838 Add non-toggle support for showing seek bar in SongProgress. 2017-04-25 22:59:46 +09:00
Dean Herbert
30e2e7bfe4 Merge branch 'master' into slider-stuff 2017-04-25 19:42:46 +09:00
Dean Herbert
f93adebc52 Minor style fixes. 2017-04-25 13:33:34 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
ColdVolcano
630c556b80 Merge branch 'master' of https://github.com/ppy/osu into intro-improvements 2017-04-24 22:42:28 -05:00
Dan Balasescu
91b264da1a Merge branch 'master' into info-wedge-design-update 2017-04-25 08:14:59 +09:00
Dan Balasescu
b3e21f6f99 Merge branch 'master' into general-fixes 2017-04-25 08:05:03 +09:00
Dan Balasescu
f329587bd4 Fix mismatched braces. 2017-04-25 08:02:09 +09:00
Jorolf
a6ea6738e5 add some spaces after commas 2017-04-24 17:10:00 +02:00
Jorolf
7ef90e6597 Merge branch 'master' of git://github.com/ppy/osu into slider-stuff 2017-04-24 17:05:32 +02:00
Dean Herbert
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
Dean Herbert
2d6fa711d1 Remove unnecessary base.Update() in PlayerInputManager. 2017-04-24 20:22:21 +09:00
Dean Herbert
3c98170330 Use method group for MusicController fault. 2017-04-24 20:22:21 +09:00
Dean Herbert
9ecfb4e4bf Last CI fix. 2017-04-24 20:22:04 +09:00
Dean Herbert
c7b789424b Update BeatmapInfoWedge design
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00
Dean Herbert
d84f1f05e2 Add better commenting for ambiguous parameter 2017-04-24 20:16:53 +09:00
Dean Herbert
9670ea9a2a CI fixes 2017-04-24 20:16:41 +09:00
Dean Herbert
8b048a6706 Fix typo. 2017-04-24 19:33:48 +09:00
Dean Herbert
c55d406b44 Fix nullref possibility. 2017-04-24 19:25:35 +09:00
Dean Herbert
6aa6e5eef7 Store and restore the selected details tab at song select. 2017-04-24 19:25:27 +09:00
Dean Herbert
e1a2f1bc7a Add beatmap metrics lookup. 2017-04-24 19:17:11 +09:00
Dean Herbert
d6c5654924 Reduce paddings and lock in some fixed heights for BeatmapDetails. 2017-04-24 18:55:49 +09:00
Dean Herbert
4fa22146b8 Increase safety of score lookups when leaderboard isn't visible. 2017-04-24 18:48:28 +09:00
Dean Herbert
ee659e7307 Fix decimal display of beatmap details being too precise. 2017-04-24 18:34:27 +09:00
Dean Herbert
a475f1f237 Remove redundant qualifier. 2017-04-24 14:16:51 +09:00
Dean Herbert
ba2db75890 Merge branch 'master' into nodal-hit-sounds 2017-04-24 14:14:33 +09:00
Dean Herbert
239f19ad02 Fix incorrect line endings. 2017-04-24 14:10:44 +09:00
Dean Herbert
c48c10e248 Merge branch 'master' into intro-improvements 2017-04-24 13:05:18 +09:00
ColdVolcano
30b7a029dc Remove for real this time 2017-04-23 00:57:41 -05:00
ColdVolcano
6a05440e6c Only schedule when faulted 2017-04-23 00:53:21 -05:00
ColdVolcano
fe35d20def Remove not needed stuff (+typo fix) 2017-04-23 00:50:02 -05:00
ColdVolcano
4b69477531 Trim whitespace 2017-04-23 00:41:15 -05:00
ColdVolcano
094a0f9639 Move MenuMusic logic to MainMenu 2017-04-23 00:36:23 -05:00
ColdVolcano
1d254f4a56 Take MusicController back to life 2017-04-23 00:13:58 -05:00
Jorolf
60bb45358c remove more casts and usings 2017-04-22 18:36:37 +02:00
Jorolf
b151c71c0e remove casts 2017-04-22 18:36:36 +02:00
Jorolf
e53c4be356 I guess this works... 2017-04-22 18:36:36 +02:00
Jorolf
02249dcd67 add a function to OsuSliderBar to manually set the tooltip text 2017-04-22 18:34:57 +02:00
Jorolf
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
Dean Herbert
b7ac7297b4 Merge branch 'master' into clr-vscode-debugging 2017-04-22 23:30:49 +09:00
Dan Balasescu
6fb8676215 Merge branch 'master' into nodal-hit-sounds 2017-04-22 22:11:19 +09:00
smoogipooo
2af9bf1423 Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects. 2017-04-22 21:33:11 +09:00
smoogipooo
ec04ceaece Fix off-by-one on repeatCount. 2017-04-22 20:53:55 +09:00
smoogipooo
1bb0b96ddc Make IHasCurve not depend on a SliderCurve object. 2017-04-22 20:43:20 +09:00
smoogipooo
2d91400239 Fix nullref due to framework change. 2017-04-22 16:56:17 +09:00
Dean Herbert
96a5d7032d
Fix regression causing menu cursor to stick to screen edges. 2017-04-21 22:37:55 +09:00
Dean Herbert
caf3d311cd
Merge remote-tracking branch 'upstream/master' into speed-adjust-mods 2017-04-21 20:55:20 +09:00
Dean Herbert
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
smoogipooo
d7477955ac CI fixes. 2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8 Remove CurvedHitObject to make RepeatSamples not tied to curve. 2017-04-21 20:40:11 +09:00
smoogipooo
b8f9a2be6e Whoops fix xmldoc. 2017-04-21 20:40:05 +09:00
smoogipooo
748f13501a Remove HeadSamples and TailSamples, combine into RepeatSamples. 2017-04-21 20:04:40 +09:00
smoogipooo
382e656e9f CI fixes. 2017-04-21 19:51:23 +09:00
Dan Balasescu
6c8bd4dfe4 More trimming. 2017-04-21 19:41:46 +09:00
smoogipooo
47f9b2d55b Trim whitespace. 2017-04-21 19:38:04 +09:00
smoogipooo
b8c10aa595 Improve xmldoc. 2017-04-21 19:37:16 +09:00
Dean Herbert
3345ba180f
Update with framework rename. 2017-04-21 19:26:32 +09:00
smoogipooo
cae4c7c6e5 Combine construction and assignment. 2017-04-21 19:12:16 +09:00
smoogipooo
a999c42d8a Split slider samples into head + tail + repeats + body (the original HitObject.Samples). 2017-04-21 18:49:49 +09:00
Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support. 2017-04-21 17:33:37 +09:00
smoogipooo
a7afde02bf Oops, apparently normal hit sound should always be added. 2017-04-21 16:27:35 +09:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
smoogipooo
ca824de91c Implement RepeatSamples in IHasRepeats. 2017-04-21 16:18:34 +09:00
smoogipooo
b4a4597366 Transform legacy HitObjectParsers to give repeat slider sounds, instead of all sounds. 2017-04-21 16:18:11 +09:00
Dean Herbert
25a7d99a8e
Remove unused reference. 2017-04-21 16:11:24 +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
4a3ae6937d
Improve the look of ScreenWhiteBox. 2017-04-21 15:41:22 +09:00
smoogipooo
83f1f9d7e5 Add ability to parse per-repeat sounds. 2017-04-21 14:38:46 +09:00
smoogipooo
bd7341c5a1 Restructure reading normal/add/volume members into class to make code a bit more readable/usable. 2017-04-21 14:36:28 +09:00
Dean Herbert
ef7bc0f92e
Update UI controls to understand DisabledChanged. 2017-04-21 14:02:04 +09:00
Dean Herbert
2d53ad4c0a
Remove xmldoc-only using usage. 2017-04-21 14:01:58 +09:00
Dean Herbert
d656090aab
Move tooltips below the cursor. 2017-04-21 14:01:31 +09:00
smoogipooo
ac9f0ccb48 Fix hit normals always being played, regardless of sound type. 2017-04-21 13:59:55 +09:00
Dean Herbert
6e3125e115 Merge pull request #656 from smoogipooo/taiko-fixes
Taiko fixes
2017-04-20 20:10:29 +09:00
Dean Herbert
3342a97b20
Remove using. 2017-04-20 19:52:32 +09:00
Dean Herbert
c7411c47d6
Update User API stuff. 2017-04-20 19:51:28 +09:00
smoogipooo
7df35e1197 Bind to method instead of exposing ScoreProcessor to HealthDisplay. 2017-04-20 19:45:15 +09:00
Dean Herbert
a174b7201e Merge branch 'master' into api-updates 2017-04-20 19:40:07 +09:00
smoogipooo
3acdc1dcfb Update palette colours. 2017-04-20 19:36:53 +09:00
Dean Herbert
008ca07b16
Update score to read statistics from server.
Also brings some naming up-to-date.
2017-04-20 18:54:35 +09:00
Dean Herbert
4e1942f998
Fix tooltips sticking after drag. 2017-04-20 18:17:12 +09:00
Dean Herbert
02e406860b
Merge remote-tracking branch 'upstream/master' into tooltips
# Conflicts:
#	osu.Game/Graphics/UserInterface/OsuSliderBar.cs
2017-04-20 18:02:38 +09:00
Dan Balasescu
37ef91e0f3 Merge branch 'master' into taiko-fixes 2017-04-20 18:02:30 +09:00
smoogipooo
f50e43fc4b CI fixes. 2017-04-20 18:02:09 +09:00
Dean Herbert
0de71ab24d
Add basic tooltip support to OsuSliderBar. 2017-04-20 17:57:58 +09:00
Dean Herbert
c87657707f
Add tooltip to sliderbars. Move interface. 2017-04-20 17:33:07 +09:00
smoogipooo
6e3018f36d Add a glow fade based on density of hits. 2017-04-20 17:11:58 +09:00
smoogipooo
e92e08f86d Make StandardHealthDisplay glow extrude beyond the end of the bar. 2017-04-20 17:11:31 +09:00
Dean Herbert
9cb789f426
Use 24 hour display for chat times. 2017-04-20 17:10:05 +09:00
Dean Herbert
ce5763ed97
Remove using. 2017-04-20 16:37:29 +09:00
Dean Herbert
9c8cd08927
Don't play sliderbar samples more than once when value has not changed. 2017-04-20 16:35:55 +09:00
Dean Herbert
9d975f202f
Make background slightly transparent. 2017-04-20 16:29:05 +09:00
Dean Herbert
18bbbdad4c
Reduce appear delay slightly. 2017-04-20 16:28:55 +09:00
Dean Herbert
d12a9a7675
Don't run AutoSize transforms when tooltip is already invisible. 2017-04-20 16:28:45 +09:00
Dean Herbert
a884ac215e
Position tooltip better; remove need for lastState. 2017-04-20 16:08:36 +09:00
Dean Herbert
00d8cacba8
Update visual apperance. 2017-04-20 16:05:25 +09:00
Dean Herbert
990c14fbe0
Keep tooltip's current target while the main button is pressed.
Handles drag operations better.
2017-04-20 15:51:30 +09:00
Dean Herbert
30c3c932b1
Remove redundancies. 2017-04-20 15:29:34 +09:00
smoogipooo
61090d918c Temporary for taiko lagging on auto replays due to inImportantSection.
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
2017-04-20 15:26:42 +09:00
Dean Herbert
4ca27a5395
Merge branch 'master' into tooltips 2017-04-20 15:08:26 +09:00
Dean Herbert
b11315ca46
Remove unnecessary interfaces and simplify tooltip logic. 2017-04-20 14:34:29 +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
2a422ca5fa
Remove ScoreStatistic. 2017-04-20 11:26:02 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary). 2017-04-20 11:03:11 +09:00
Dean Herbert
3e65cab9b7
Move replay creation logic to ScoreDatabase. 2017-04-20 10:25:07 +09:00
Dan Balasescu
66cb604081 Merge branch 'master' into score-statistics 2017-04-20 10:06:43 +09:00
Jorolf
ea67b41683 move tooltip outside of the cursor 2017-04-20 00:42:40 +02:00
Jorolf
e8aea3ccd2 Merge branch 'master' of git://github.com/ppy/osu into tooltips 2017-04-19 15:33:35 +02:00
Jorolf
d04893a43a ---changing--- 2017-04-19 15:33:24 +02:00
Dan Balasescu
dd3f9c1cdd Merge branch 'master' into results-screen 2017-04-19 21:58:40 +09:00
Dan Balasescu
7475b39dc1 Merge branch 'master' into chat-post-support 2017-04-19 21:29:07 +09:00
Jorolf
eda0e99179 Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips 2017-04-19 13:53:08 +02:00
Jorolf
4f9c5dd44d renaming and some changes in TestCaseTooltip 2017-04-19 13:52:17 +02:00
Jorolf
af9a45fd6c Merge branch 'master' into tooltips 2017-04-19 13:51:39 +02:00
Dean Herbert
015eacb3b8
Merge branch 'results-screen' into score-statistics 2017-04-19 20:51:23 +09:00
Dean Herbert
7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen
# Conflicts:
#	osu.Game/Users/User.cs
2017-04-19 20:51:05 +09:00
Jorolf
8e4288168a renaming and some changes in TestCaseTooltip 2017-04-19 13:47:00 +02:00
Dean Herbert
3e48a57e9a Merge branch 'master' into score-statistics 2017-04-19 20:36:14 +09:00
Dean Herbert
093abd6872
Add chat toggle button. 2017-04-19 19:54:03 +09:00
Dean Herbert
c7246fd2ac
Reorganise ChatOverlay to not suck. 2017-04-19 19:15:21 +09:00
Dean Herbert
dda3fb85ee
Add user colour support. 2017-04-19 19:07:38 +09:00
Dean Herbert
3129708ccb
Add chat sending support. 2017-04-19 18:46:52 +09:00
Dean Herbert
87f6dc9e5a
Change default channel to #lazer. 2017-04-19 18:46:50 +09:00
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
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
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
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
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
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
2bb50ff082
Add commas to score counter. 2017-04-11 19:21:05 +09:00
Dean Herbert
c615762da6
wip 2017-04-11 18:56:25 +09:00
Dean Herbert
7d7bea7198
Fix crash on restart after update.
Also make update process more graceful.
2017-04-11 18:40:39 +09:00
Dean Herbert
9732110bd9
Update TransformTo methods in line with framework changes. 2017-04-11 17:25:56 +09:00
Dean Herbert
001836f535
Rename variables and make public for now. 2017-04-11 16:48:11 +09:00
Dean Herbert
7ca0d6d117
Adjust cursor popin/out to make it less ugly. 2017-04-11 16:44:12 +09:00
Dean Herbert
f8c6ce15c3
Fix weird RollingCounter behaviour. 2017-04-11 16:37:36 +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
Dean Herbert
24fea2809b
Map beatmap md5 from online response to BeatmapInfo. 2017-04-11 13:44:55 +09:00
Jorolf
ad41fd5c1a more unnecessary stuff 2017-04-10 16:49:48 +02:00
Jorolf
412d6a14ca removed something unnecessary 2017-04-10 16:45:34 +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
Dan Balasescu
ba4d654a21 Merge branch 'master' into has-bindable-value 2017-04-10 19:40:37 +09:00
Dean Herbert
b9ce98efd6
Add AspectAdjust to HitRenderer to allow playfield to consume ful HitRenderer size when needed. 2017-04-10 19:22:27 +09:00
Dean Herbert
960ea27684
Make all Playfields completely relative. 2017-04-10 19:22:27 +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
Dean Herbert
5af4259ab4
Add back explicit binds. 2017-04-10 17:10:15 +09:00
Dean Herbert
ba03a98992
Add missing config set. 2017-04-10 16:39:10 +09:00
Dean Herbert
f12b5a8954
Unify disable logic. 2017-04-10 16:22:36 +09:00
Dean Herbert
b7cfdff8d1
Update SliderBar to use IHasCurrentValue. 2017-04-10 15:30:17 +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
c793878ae2 Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry 2017-04-10 05:50:28 +03:00
Dean Herbert
1fe6b84dfc Update with new input changes from framework. 2017-04-10 01:24:50 +09: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
DrabWeb
fc7eef091f current_colour -> currentColour, fix masked away playlist items not fading colours 2017-04-09 09:08:11 -03:00
DrabWeb
70756a069e Unused usings 2017-04-09 07:52:26 -03:00
DrabWeb
241895c85b Proper playlist item text wrapping 2017-04-09 07:36:41 -03:00
DrabWeb
67f1167172 Comments, play first song if current is nil and user presses play 2017-04-09 07:04:41 -03:00
DrabWeb
7f2feab9e7 Proper search field focusing and exit on escape 2017-04-09 06:26:17 -03:00
DrabWeb
a88c82705b Use playlist queue 2017-04-09 06:11:53 -03:00
DrabWeb
fe17cb924d Cleanup 2017-04-09 04:50:35 -03:00
DrabWeb
7b5f8800bd Reimplement with MusicController 2017-04-09 04:26:21 -03:00
DrabWeb
2d6a2f41aa Reset MusicController 2017-04-09 04:12:30 -03:00
DrabWeb
963cd09bd0 Merge https://github.com/ppy/osu into playlist 2017-04-09 04:04:13 -03:00
DrabWeb
f65eaa6566 Show scroll dragger, change behaviour when selecting playing song 2017-04-09 03:52:48 -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
Dean Herbert
e1e9772d46 Flash buttons on click. 2017-04-08 19:28:29 +09:00
Dean Herbert
e40ad69a3b Adjust icon scale of play button. 2017-04-08 19:25:40 +09:00
Thomas Müller
b99cbe6962 Add back nice scaling of music controller buttons 2017-04-08 19:17:20 +09:00
Thomas Müller
166a78a15a Fix up comment in audio device options 2017-04-08 11:01:41 +02: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
Dean Herbert
b6ece111a4 Merge pull request #606 from Tom94/fix-audio-crash
Fix crash caused by multiple identical audio device names
2017-04-08 01:31:54 +09:00
Jorolf
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
Jorolf
187a0e3613 Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-07 18:14:14 +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
Thomas Müller
ac073e22c9 Fix crash caused by multiple identical audio device names
The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
2017-04-07 17:00:34 +02:00
Dean Herbert
06a655af5d
Move initial position of KeyCounter upwards. 2017-04-07 20:51:37 +09: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
smoogipooo
a9d938e7ed Fix brace style. 2017-04-07 15:57:00 +09:00
Dean Herbert
06776443eb
Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:49:14 +09:00
Dean Herbert
2c2a4169c6
Better structure for button layout. 2017-04-07 15:28:18 +09:00
Dean Herbert
7d2af9310b
Expose DragBar's seeking property. 2017-04-07 15:23:03 +09:00
Dean Herbert
3dbf4879c7
Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:18:58 +09:00
Dean Herbert
361e187949
Temporarily disable button scaling. 2017-04-07 14:33:58 +09:00
Dean Herbert
fa28e7bdc3
Improve clickability and visuals of MusicController buttons. 2017-04-07 14:09:26 +09:00
Dean Herbert
7c9f30c288
MusicController regression fixes. 2017-04-07 13:15:57 +09:00
Dean Herbert
bc4e0bfa8b
Make DragBar animate seeks. 2017-04-07 13:14:41 +09:00
Dan Balasescu
579c351cfd Merge branch 'master' into details 2017-04-07 12:54:01 +09:00
Dean Herbert
1842d80e28
Update test case. 2017-04-07 09:43:08 +09:00
Dean Herbert
fba72b9a9e
Snaking out on by default. 2017-04-07 09:28:13 +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
smoogipooo
0107772737 Fix using. 2017-04-06 16:25:46 +09:00
Dan Balasescu
6fc1384927 Merge branch 'master' into taiko-fixes 2017-04-06 16:23:22 +09:00
Dean Herbert
1942ef9e8f
Fix merge fail. 2017-04-06 16:06:02 +09:00
Dean Herbert
4783d17d94 Merge branch 'master' into better-hitsounds 2017-04-06 16:00:56 +09:00
smoogipooo
cec8bca78a Implement IJsonSerializable, BeatmapInfo IJsonSerializable. 2017-04-06 15:54:50 +09: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