1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 05:22:57 +08:00
Commit Graph

1180 Commits

Author SHA1 Message Date
EVAST9919
9f803de9d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 19:49:48 +03:00
Dean Herbert
561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
Dean Herbert
674731f9bb Add sound back to skip action 2017-05-19 22:23:48 +09:00
Dean Herbert
60f960aafd Fix audio clock breakage. 2017-05-19 22:19:20 +09:00
Dean Herbert
20156d26f9 Don't rely on parent's clock 2017-05-19 22:12:09 +09:00
EVAST9919
6f0e1fccdb moved autosize to ctor and whitespace fix 2017-05-19 16:08:33 +03:00
EVAST9919
b2b299a8c3 Fixed the ability to change visibility even not in replay 2017-05-19 15:54:21 +03:00
Dean Herbert
aef82acb0d Update skip button design 2017-05-19 21:54:14 +09:00
EVAST9919
4d0d27aa88 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 15:25:48 +03:00
Dean Herbert
da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
Dean Herbert
a7d16ac213 Move skip logic to inside SkipButton 2017-05-19 18:18:21 +09:00
smoogipooo
9191c4f3e3 Remove LegacyBeatmapConverter. 2017-05-19 16:31:56 +09:00
Dean Herbert
36b628bbcc Merge branch 'master' into fix-early-inactive-pause 2017-05-19 16:21:20 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dean Herbert
bfd37d0350 Fix audio beginning to play when potentially paused due to inactive window
Also removes all usage of Delay() in Player.
Resolves #793.
2017-05-19 13:53:09 +09:00
Dean Herbert
5ae3a7143e Fix audio seeking when entering play mode in certain cases
Resolves #794
2017-05-19 13:23:11 +09:00
EVAST9919
91b081f0b2 Change visibility on ctrl+h 2017-05-19 06:41:33 +03:00
EVAST9919
f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
EVAST9919
83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
EVAST9919
d07d94d606 better resizing 2017-05-18 07:09:36 +03:00
EVAST9919
35bc3a42aa Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 06:36:15 +03:00
Dan Balasescu
32c471d285 Merge branch 'master' into pause-container 2017-05-18 01:22:37 +09:00
Dean Herbert
8084c575ef Merge branch 'master' into fix-fail-pause-conflict 2017-05-17 23:32:41 +09:00
EVAST9919
a9f37d3e78 now button can hide content 2017-05-17 17:24:52 +03:00
EVAST9919
a21343da23 CI fixes 2017-05-17 17:14:09 +03:00
EVAST9919
60ed7a2372 fixed license header 2017-05-17 16:54:49 +03:00
EVAST9919
1e029d05a8 Added bindable to adjust playback speed 2017-05-17 16:10:49 +03:00
Dean Herbert
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
EVAST9919
0867ef814c Visible only in replay 2017-05-17 15:54:12 +03:00
EVAST9919
e0625a9b30 More overlays and overall fixes 2017-05-17 15:39:26 +03:00
Dean Herbert
88a70e407c Fix and simplifty pause logic
Resolves #770
2017-05-17 20:11:41 +09:00
DrabWeb
9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
Dean Herbert
7bb38e927b Fix song select reverting to first difficulty of current group on entering 2017-05-17 17:33:20 +09:00
Dean Herbert
cab12ee55a Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed 2017-05-17 17:33:16 +09:00
EVAST9919
1a4025ab3c ingame options basic logic 2017-05-17 10:36:57 +03:00
Dean Herbert
12cb530358 Merge branch 'master' into tidy-up 2017-05-17 09:24:11 +09:00
nyaamara
a3e93afb37 Merge pull request #3 from ppy/master
cool
2017-05-16 16:57:45 -04:00
nyaamara
b22c84287a Fix typo. 2017-05-16 16:54:33 -04:00
Huo Yaoyuan
d929de466a DateDisplay -> DateTimeDisplay for more exactly. 2017-05-16 21:16:52 +08:00
Huo Yaoyuan
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Dean Herbert
6487bf45cf
Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
Dean Herbert
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
23760d6805 Adjust osu! logo metrics and add shockwave impact animation 2017-05-15 19:36:03 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
Dean Herbert
e096dd8126 Merge branch 'master' into fix-beatmap-population 2017-05-12 20:30:06 +09:00
Dan Balasescu
815379646c Merge branch 'master' into new-option-search 2017-05-12 20:22:11 +09:00
Dan Balasescu
d60da82c4c Merge branch 'master' into fix-beatmap-population 2017-05-12 20:15:10 +09:00
Dean Herbert
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
Dean Herbert
d3770d8395 Merge branch 'master' into chat-design-update 2017-05-12 19:57:57 +09:00
Dean Herbert
d2e066ca35 Move SearchTextBox to better namespace
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
Dean Herbert
cf239f4d9c Move chat into main content
Also changes the way parallax is applied to OsuScreens game-wide.
2017-05-12 19:03:21 +09:00
EVAST9919
9a04069123 removed useless booleans, using nullables instead 2017-05-12 10:16:31 +03:00
EVAST9919
34b4efc4e9 Applied suggested changes 2017-05-12 08:12:34 +03:00
EVAST9919
79ed92a0d7 Simplified logic 2017-05-12 01:48:28 +03:00
EVAST9919
1f34cec5ce Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-11 22:22:57 +03:00
Dean Herbert
a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
EVAST9919
ea0add2354 Fixed update condition 2017-05-11 02:34:57 +03:00
EVAST9919
d55c97a08a Stop progress as soon as we at 100% 2017-05-11 01:48:46 +03:00
EVAST9919
5b469eff69 Fixes 2017-05-10 10:33:02 +03:00
EVAST9919
d8f9e71b84 Applied suggested changes 2017-05-10 10:14:44 +03:00
EVAST9919
7b17e331c4 cleanups 2017-05-10 03:45:31 +03:00
EVAST9919
315f1f1256 CI fixes 2017-05-09 06:23:03 +03:00
EVAST9919
2c92ee432b Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-09 06:05:46 +03:00
EVAST9919
2826c663fd Apply suggested changes 2017-05-09 06:05:37 +03:00
Dean Herbert
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
EVAST9919
de2486b8e6 Moved timeLeft recalculation to property 2017-05-08 20:36:02 +03:00
EVAST9919
17d1ecb8f5 Use float type for progress value 2017-05-08 19:42:36 +03:00
EVAST9919
4b5e24cc36 Changed logic a bit 2017-05-08 19:14:19 +03:00
EVAST9919
ae2186970c Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-08 18:16:16 +03:00
Huo Yaoyuan
cb21e98ae1 MatchCreate.ValidForResume = false. 2017-05-08 19:55:04 +08:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Dean Herbert
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
Dean Herbert
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
EVAST9919
f0145c7f4f Trying to woke up AppVeyor 2017-05-08 02:16:56 +03:00
EVAST9919
926ed907c2 CI fixes 2017-05-08 02:00:21 +03:00
EVAST9919
dda25219bc code fixes 2017-05-08 01:54:31 +03:00
EVAST9919
c3a42ded36 Fixed Graph/seeking offset 2017-05-08 01:23:51 +03:00
EVAST9919
531f2c410a removed useless variable 2017-05-08 00:26:34 +03:00
EVAST9919
ea28a9f7ce Adjust values 2017-05-08 00:16:58 +03:00
Huo Yaoyuan
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
EVAST9919
d06b5783cb Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-06 17:33:51 +03:00
Huo Yaoyuan
f37c857af8 CI fixes. 2017-05-06 16:06:38 +08:00
Huo Yaoyuan
767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
skettios
36dff94802 removed check if ModSelectOverlay is open 2017-05-05 18:16:48 -07:00
skettios
d129bd0c1f Fix ModSelectOverlay accepting escape when it shouldn't
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
2017-05-05 17:03:24 -07:00
Dean Herbert
44f06e5423 Add hover expand support. 2017-05-05 13:17:36 +09:00
Dean Herbert
9c4f813da1 Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
2017-05-05 13:14:44 +09:00
Dean Herbert
b547dd6893 CI Fixes. 2017-05-05 13:06:54 +09:00
Dean Herbert
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
EVAST9919
95f6c999bd Adjust scale and CI fixes 2017-05-04 17:59:01 +03:00
EVAST9919
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
EVAST9919
57c4232416 Added testcase 2017-05-04 11:58:37 +03:00
EVAST9919
6063231e40 float value fix 2017-05-03 16:58:10 +03:00
EVAST9919
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
EVAST9919
9e35eb8d97 Fixes 2017-05-03 13:53:45 +03:00
EVAST9919
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
EVAST9919
f49cc124ed Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 08:26:54 +03:00
EVAST9919
a897dcbfbe Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-03 08:26:01 +03:00
EVAST9919
6ea3629c9a Adjust the size 2017-05-03 08:23:52 +03:00
EVAST9919
2e30a69b67 removed using 2017-05-02 23:04:36 +03:00
EVAST9919
a955f9cbfd Simplify hiding logic 2017-05-02 22:59:36 +03:00
EVAST9919
37c3133981 Fixes 2017-05-02 22:46:18 +03:00
EVAST9919
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
Dean Herbert
5a8a8acbc8 Merge branch 'master' into roompanel 2017-05-02 18:04:48 +09:00
smoogipooo
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
smoogipooo
9ca8295149 Oops. 2017-05-02 17:09:16 +09:00
smoogipooo
40d2fee1dc Split up adding of local store from the ctor. 2017-05-02 16:55:04 +09:00
smoogipooo
e2620e2840 Make Team not inherit Country. 2017-05-02 16:54:43 +09:00
smoogipooo
ee0a5409bb CI fixes. 2017-05-02 16:33:48 +09:00
EVAST9919
108cd28e96 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-02 10:15:56 +03:00
smoogipooo
91e000fd44 Back to sanity. 2017-05-02 14:21:22 +09:00
smoogipooo
f17046abaf Add ability to load Drawings flags from osu/Drawings/Flags. 2017-05-02 13:28:35 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
Dean Herbert
6074cb5979 Make playlist filtering work.
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
ColdVolcano
f2b0602f90 Double check if the selectedpanel is not the provided as argument 2017-05-01 00:13:00 -05:00
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
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
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
EVAST9919
a8c918f7bf Removed empty line 2017-04-28 21:12:48 +03: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
Naeferith
2a269dbc5a Remove unsused variable + IStateful Implementation 2017-04-28 10:57:59 +02: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
3706bc8741 Merge branch 'master' into locale 2017-04-26 19:56:34 +08:00