1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 18:47:25 +08:00
Commit Graph

842 Commits

Author SHA1 Message Date
Jorolf
9374bf925e only show warning when focused 2017-08-25 16:39:49 +02:00
Jorolf
26323caf6f Merge branch 'master' of git://github.com/ppy/osu into caps-warning 2017-08-25 16:33:29 +02:00
Dean Herbert
ee85515d95 Changes in line with framework changes 2017-08-25 19:18:07 +09:00
smoogipooo
3ffc467704 Fix crappy resizing. 2017-08-25 16:27:01 +09:00
smoogipooo
ce644138b9 Update OsuTabControl in line with framework 2017-08-25 15:58:30 +09:00
smoogipooo
a3a5a89636 Update OsuDropdown in line with framework 2017-08-25 15:58:21 +09:00
smoogipooo
4fb9570618 Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework. 2017-08-25 15:10:29 +09:00
smoogipooo
7467d24d35 Update OsuContextMenu in line with framework. 2017-08-25 15:10:12 +09:00
smoogipooo
06c392d6f2 Update OsuMenu in line with framework. 2017-08-25 15:09:07 +09:00
Jorolf
f8cc4238ff cleanup code 2017-08-24 22:13:20 +02:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
e9dde822a1 Expose triangles in OsuButton for further customisation 2017-08-23 19:25:40 +09:00
Jorolf
d81956e974 use GameHost to check if caps lock is enabled 2017-08-22 15:43:45 +02:00
Jorolf
c29d3437ba fix merge changes 2017-08-22 13:35:49 +02:00
Jorolf
2ccd6c6128 Merge branch 'master' of git://github.com/ppy/osu into caps-warning
# Conflicts:
#	osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
2017-08-22 13:29:42 +02:00
jorolf
3025fcdb25 Merge branch 'master' into ranks-section 2017-08-22 13:19:03 +02:00
Dan Balasescu
f371ca73f1 Merge branch 'master' into cursor-rotation-delay 2017-08-22 19:54:10 +09:00
Dean Herbert
d8de6e289c Don't start rotating the cursor until it has travelled a minimum disatnce
Some people, myself included, were annoyed by the rotation starting too soon (especially when dragging up and left one pixel).
2017-08-22 17:38:51 +09:00
Dean Herbert
18645fcf29 Update volume control logic to use key bindings
Fixes them not working at all, too.
2017-08-22 14:48:04 +09:00
Dean Herbert
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
smoogipooo
3ea7be1ccf Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134. 2017-08-19 12:28:54 +09:00
PoULkY
cc39aad7f8 Fix OsuButton doesn't implement IFilterable 2017-08-18 01:23:44 +07:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Dean Herbert
143ff695ef Remove unused using statements 2017-08-15 17:44:04 +09:00
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
Dean Herbert
1fe273cbc0 Move GameplayCursor to osu! ruleset and make work with OsuActions 2017-08-10 18:37:41 +09:00
Jorolf
c877a5a8b7 update TestCase 2017-08-09 19:26:27 +02:00
Jorolf
8631c469fc add license header 2017-08-09 18:50:44 +02:00
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
Dean Herbert
2ce30474ca Merge branch 'master' into spriteicon-invalidation-fix 2017-08-07 14:49:09 +09:00
smoogipooo
d0906d8232 Adjust xmldocs to conform to TransformableExtensions. 2017-08-07 14:20:56 +09:00
smoogipooo
2221797273 Add transform sequence support to IHasAccentColour. 2017-08-07 14:12:05 +09:00
smoogipooo
ce7d391f06 These method calls are impure. 2017-08-07 13:37:07 +09:00
smoogipooo
953cf5af58 Fix SpriteIcon invalidation causing game breakness. 2017-08-07 13:26:54 +09:00
Dean Herbert
8941c8658c Use nested containers for shadow 2017-08-07 09:50:04 +09:00
Dean Herbert
d7fede96ef Fix shadow on SpriteIcon being a bit off 2017-08-07 08:54:53 +09:00
Huo Yaoyuan
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +08:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Dean Herbert
a5a5c1a315 Remove debug code 2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4 Improve class xmldoc 2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd Add comment explaining why we use scale 2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e Derive from CompositeDrawable instead
We need to expose EdgeEffect as it's used in places.
2017-08-03 15:45:59 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
256daeaf68 Rename variable 2017-08-02 11:56:29 +09:00
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00
Huo Yaoyuan
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
Dean Herbert
6a36fa7809 Make OsuButtons visually disable when not enabled 2017-07-28 12:58:03 +09:00
Dean Herbert
b64fe68233 Allow OsuColour.FromHex to support prefix #.
Coincides with https://github.com/ppy/osu-web/pull/1373
2017-07-27 18:03:35 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Huo Yaoyuan
e0b1057b87 Merge branch 'master' into fixes 2017-07-24 20:50:33 +08:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Dean Herbert
451f92772a Merge branch 'master' into fixes 2017-07-20 19:46:50 +09:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30 Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange 2017-07-19 16:50:29 +02:00
Dean Herbert
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
007b343854 Fix incorrect equality check when TimingPointAt returns a default T 2017-07-19 15:16:40 +09:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Huo Yaoyuan
ef2770b718 Bypass commit in SearchTextBox regardless of Shift and Ctrl. 2017-07-18 17:40:34 +08:00
Huo Yaoyuan
a0c4fcdb4b Move xml doc to the right class. 2017-07-18 17:03:59 +08:00
Thomas Müller
7acff29bd3 Fix OsuTooltipContainer.PopIn not overriding PopOut transforms 2017-07-18 11:53:56 +03:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
fd58c6e835 Nicer generic rolling counters 2017-07-14 19:14:07 +03:00
Huo Yaoyuan
26b36c08a3 Prefer ScrollTo in SectionsContainer. 2017-07-14 22:56:27 +08:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Thomas Müller
b5fbb26f8f Merge branch 'master' of https://github.com/ppy/osu into better-transforms 2017-07-14 16:46:18 +03:00
Thomas Müller
c73a1ae058 Use TransformTo in rolling counters 2017-07-14 16:46:00 +03:00
MrTheMake
d2c18026f2 Removed unnecessary variables 2017-07-14 12:45:24 +02:00
MrTheMake
00a622da1a Let disabled icon buttons be interactive again 2017-07-14 12:31:12 +02:00
MrTheMake
c053733ea9 Updated to use ppy's implementation 2017-07-14 12:09:55 +02:00
MrTheMake
8e0d59bfed Updated to use ppy's implementation 2017-07-14 12:08:56 +02:00
Dan Balasescu
a6d917285a Merge branch 'master' into settings-improvements 2017-07-14 19:22:45 +10:00
Dean Herbert
b7612af20c Make comment different 2017-07-14 18:08:47 +09:00
Dean Herbert
b1d447bf71 Add missing access modifier 2017-07-14 07:05:39 +09:00
Dean Herbert
bfa6a9aa4e Add missing licence header 2017-07-14 06:43:33 +09:00
Dean Herbert
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
Dean Herbert
f4fd263671 Fix settings not offsetting scroll operations by fixed header content 2017-07-13 17:09:12 +09:00
Dean Herbert
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
2017-07-13 15:11:33 +09:00
Dean Herbert
b79e309c2f Don't lock scroll position of SectionsContainer header elements on negative scroll
Feels better in all cases.
2017-07-13 14:24:41 +09:00
Dean Herbert
c02a85bc4a Formatting 2017-07-13 13:52:40 +09:00
Dean Herbert
3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
2017-07-13 13:44:21 +09:00
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Dean Herbert
0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
Dean Herbert
c8c1dcae28 Fix incorrect filename 2017-07-12 12:55:40 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Huo Yaoyuan
fd4a054921 Merge branch 'master' into profile 2017-07-11 09:16:32 +08:00
Thomas Müller
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Thomas Müller
d9b362489b Fix incorrect TimeUntilNextBeat and add TimeSinceLastBeat 2017-07-10 12:07:38 +03:00