Commit Graph

21195 Commits

Author SHA1 Message Date
1e192d08c9 Merge pull request #4674 from peppy/fix-lead-in-issues
Fix lead-in time being too short
2019-04-27 21:14:32 +09:00
db75516e79 Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +09:00
febe8b4695 Update with framework DrawNode changes (#4576)
Update with framework DrawNode changes

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-27 21:01:09 +09:00
27c1c368ac Remove unused using 2019-04-27 20:42:07 +09:00
d40177f97c Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
41d0b00120 Update framework 2019-04-27 16:43:23 +09:00
b08fb5136e Merge branch 'master' into sh-xh-grading-2 2019-04-26 10:38:10 +03:00
32e71a6314 Fix incorrect seeking behaviour of TrackVirtualManual 2019-04-26 16:15:42 +09:00
50a775145c Separate variables 2019-04-26 13:56:26 +09:00
2f4bf423a4 Renamespace 2019-04-26 13:51:39 +09:00
7047303b0f Add tooltips to all buttons 2019-04-26 13:29:58 +09:00
a680a38e81 Merge pull request #4675 from nyquillerium/playerloader-tracking
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
4fade26543 Turn on warnings, resolve issues (#4679)
Turn on warnings, resolve issues
2019-04-26 13:19:54 +09:00
4adf590036 Combine hover/active state handling in tab control 2019-04-26 12:41:00 +09:00
d5b91c6455 Cleanup top header container + user handling 2019-04-26 12:32:15 +09:00
838325fed4 Remove HasTooltipContainer, use separate composites 2019-04-26 11:58:45 +09:00
9ce7d0416b Fix framework version 2019-04-25 23:16:08 +09:00
9da13cb463 Merge branch 'master' into flashlight-dim 2019-04-25 23:15:15 +09:00
619071b7ee Unnecessary 'using' directive 2019-04-25 14:23:00 +03:00
f8c5ee457b Reduce tabcontrol spacing 2019-04-25 20:09:42 +09:00
8329e53b6c Remove extra space from header title 2019-04-25 20:08:14 +09:00
2caea38f8c Cleanup centre header container 2019-04-25 20:05:59 +09:00
4e0f21102b Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2 2019-04-25 14:04:12 +03:00
45d9f42c98 Merge branch 'master' into sh-xh-grading-2 2019-04-25 14:01:38 +03:00
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
9d5b81165e Adjust button stylings 2019-04-25 19:51:05 +09:00
0eca9b9683 Center -> centre 2019-04-25 18:43:29 +09:00
b33c0e9a93 Cleanup bottom header container 2019-04-25 18:42:19 +09:00
1766ed8f9e Fix warnings/remove obsolete usages 2019-04-25 18:05:46 +09:00
3b0d4c1bad Merge branch 'turn-on-warnings' into profile-header-update 2019-04-25 17:43:10 +09:00
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
6fdcd98caa Don't play screen "back" sample when retrying 2019-04-25 14:15:07 +09:00
b911322c92 Merge branch 'master' into fix-lead-in-issues 2019-04-25 12:34:29 +09:00
8d8258c039 Merge pull request #4643 from peppy/update-framework
Update framework
2019-04-25 12:34:02 +09:00
9fa8f62077 Merge branch 'master' into update-framework 2019-04-25 12:25:17 +09:00
8dc7fd8223 Update framework 2019-04-25 12:16:12 +09:00
d3bc443810 Merge branch 'master' into sh-xh-grading-2 2019-04-25 06:11:07 +03:00
c961d95989 Merge pull request #4673 from peppy/frame-stability-initial-seek
Amend FrameStabilityContainer's initial seek behaviour
2019-04-25 11:41:44 +09:00
90d5c64cf3 Remove unused usings 2019-04-24 18:47:00 +09:00
8f101e4f60 Remove unnecessary multi-slider tracking logic 2019-04-24 18:25:38 +09:00
4f31eee5ad Merge branch 'master' into flashlight-dim 2019-04-24 17:01:11 +09:00
67382724f6 Reword and reoganise logic 2019-04-24 16:58:13 +09:00
8222923ab8 Only track logo if we're still the current screen 2019-04-24 16:20:51 +09:00
c5ca337e66 Merge branch 'master' into sh-xh-grading-2 2019-04-24 10:08:08 +03:00
73401ebf65 Merge branch 'frame-stability-initial-seek' into fix-lead-in-issues 2019-04-24 15:56:19 +09:00
f273f5daae Remove unnecessary using statement 2019-04-24 15:55:51 +09:00
3b36a4982d Fix tests running under nUnit and running multiple times in concession 2019-04-24 15:46:49 +09:00
bb69330e9f Call ProcessFrame on the userOffsetClock after a seek
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
efaedafc08 Fix (legacy) AudioLeadIn being used incorrectly.
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
e69963e60e Ensure there is enough time before the first object in osu! (roughly following osu-stable specs) 2019-04-24 15:28:14 +09:00