1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Commit Graph

1726 Commits

Author SHA1 Message Date
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
36cabe72cf Make DimmedLoadingLayer block input when active 2019-11-25 11:49:54 +09:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Dean Herbert
57d38c5c74 Add final newline 2019-11-22 02:39:54 +09:00
Dean Herbert
f390e558c7 Combine and simplify beatmap change logic 2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Berkan Diler
66a3837ff4 Fix CI 2019-11-20 14:25:44 +01:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
53bc2dcab7 Use costum displaying text for inherited references. 2019-11-18 15:29:18 +08:00
Huo Yaoyuan
b04bca7db6 Reference elements in origin definition. 2019-11-17 20:55:40 +08:00
Huo Yaoyuan
f05b83d7d4 Use typeparamref. 2019-11-17 20:48:23 +08:00
Dean Herbert
ce60f8262c
Merge branch 'master' into sharpen 2019-11-13 15:38:59 +09:00
Dean Herbert
da819261e0 Shrink and darken loading layer to better suit button 2019-11-12 21:38:16 +09:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Dean Herbert
52ab309295
Merge branch 'master' into stateful-menu-items 2019-11-12 10:31:50 +09:00
Dean Herbert
5bb65d0716 Rename button class 2019-11-12 10:21:06 +09:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
bed62e0d2f Rename ThreeState -> TernaryState and add basic tests 2019-11-11 18:56:18 +09:00
Dean Herbert
c0f6e4687a
Merge branch 'master' into stateful-menu-items 2019-11-11 18:33:50 +09:00
Dean Herbert
c70c05c896
Less sickening parallax (#6743)
Less sickening parallax
2019-11-08 19:15:25 +09:00
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
smoogipoo
a2c265c147 Separate ThreeStates into its own file 2019-11-08 13:23:13 +09:00
smoogipoo
011bf09516 Add xmldocs and cleanup 2019-11-08 13:23:13 +09:00
smoogipoo
0a15a13fab Reorder parameters 2019-11-08 13:23:13 +09:00
smoogipoo
30f877c4ab Implement a three-state menu item 2019-11-08 13:23:13 +09:00
smoogipoo
ce08d664a5 Abstract statefulness of new menu item type 2019-11-08 13:23:13 +09:00
smoogipoo
4fe69dbc89 Fix context menu sub-menu display 2019-11-08 13:23:13 +09:00
smoogipoo
c3a3b4091b Add basic implementation of a toggleable menu item 2019-11-07 22:26:35 +09:00
smoogipoo
29672c48e1 Make simple OsuMenuItem ctor invoke the complex one 2019-11-07 16:04:13 +09:00
smoogipoo
20d6eceecf Move DrawableOsuMenuItem out of OsuMenu 2019-11-07 16:03:35 +09:00
Dean Herbert
d400e4a5f6 Add shared constant for parallax amount 2019-11-07 09:30:50 +09:00
Dean Herbert
ee4839b7e7 Reduce delay on parallax 2019-11-06 18:09:36 +09:00
Dean Herbert
4ce3450cfc Move button implementation to OsuButton 2019-11-06 14:08:52 +09:00
Dean Herbert
44d0791676 Update button usage 2019-11-05 16:26:31 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events (#6636)
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dean Herbert
08040adfad Expose Current bindable in LabelledComponents
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 16:24:28 +09:00
Dean Herbert
6980f488dc Make OsuButton correctly block hover events 2019-10-28 16:24:07 +09:00
Dean Herbert
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
Dean Herbert
8baf569f59 Remove necessity of AutoGenerated flag 2019-10-25 19:58:42 +09:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
Andrei Zavatski
85769982a0 Refactor LoadingButton 2019-10-24 17:49:34 +03:00
Andrei Zavatski
b310fd9d44 Adjust naming inside the LoadingButton 2019-10-23 13:39:42 +03:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill 2019-10-23 15:41:54 +09:00
Dean Herbert
21e0bd2a5a Merge branch 'fix-wave-container' into apply-framework-fixes 2019-10-23 15:13:41 +09:00
smoogipoo
851773a842 Apply adjustments for framework changes 2019-10-23 14:04:06 +09:00