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
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
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
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
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08: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
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
MrTheMake
6ff2b73c30
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
2017-07-19 16:50:29 +02: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
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
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
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
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09: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
Dean Herbert
0e2dc9388a
More changes in-line with framework changes.
2017-07-10 12:55:47 +09:00
Huo Yaoyuan
6f2b49dea8
Merge branch 'master' into profile.
2017-07-10 10:36:23 +08:00
Dean Herbert
7952e7caa9
Fix typos
2017-07-10 03:22:08 +09:00
Dean Herbert
2c8b8c3f9c
Update loop logic in line with framework changes
2017-07-09 18:23:34 +09:00
Dean Herbert
724e5aa99e
Merge master into better-input
2017-07-05 13:59:40 -07:00
Huo Yaoyuan
cadc191602
Merge branch 'master' into profile
2017-07-02 22:03:30 +08:00
Thomas Müller
bb15bc0467
Use ReceiveMouseInputAt whenever possible
2017-06-30 09:54:03 +03:00
Thomas Müller
5c02f1812f
Remove now unneeded Contains overrides
2017-06-30 09:53:52 +03:00
Dean Herbert
f3f3952ba5
More unused usings
2017-06-29 12:20:05 -07:00
Dean Herbert
6865f9b231
Remove unused parameters
2017-06-29 12:05:37 -07:00
Dean Herbert
1e50840a8e
Fix unused usings
2017-06-29 12:04:04 -07:00
Dean Herbert
ee96d39b93
Shuffle sound samples around and make more conformant
2017-06-28 10:19:04 -07:00
Dean Herbert
480cdba023
Add OsuClickableContainer with generic sounds
2017-06-27 21:05:49 +09:00
Dean Herbert
684d188752
Adjust transition duration slightly
2017-06-26 16:26:43 +09:00
Dean Herbert
3bb6005dc9
Merge remote-tracking branch 'upstream/master' into profile
2017-06-26 16:26:35 +09:00
Dean Herbert
7baa2b7421
Fix CI issues
2017-06-25 14:46:59 +09:00
Huo Yaoyuan
d24f78ea24
Merge branch 'master' into profile
2017-06-25 10:29:14 +08:00
MrTheMake
cc71c10488
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-06-24 12:26:40 +02:00
Thomas Müller
e3489928b7
Remove now obsolete InternalContains
2017-06-24 09:21:08 +02:00
Dean Herbert
b90c9bcacf
Merge branch 'master' into profile
2017-06-23 22:51:31 +09:00
Dean Herbert
a0e7751cd1
Merge branch 'master' into fix-invalid-depth
2017-06-23 14:48:12 +09:00
Dean Herbert
5dc0b87ef5
Apply some fixes for my own comments
2017-06-23 14:02:19 +09:00
MrTheMake
8b07565025
Added test case usability, namings and bug fixes
2017-06-21 16:33:26 +02:00
MrTheMake
67292a5dcf
Brought ITransform in line with framework changes
2017-06-21 12:27:45 +02:00
Marco Stephan
8ffd7b313b
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-06-21 12:23:38 +02:00
MrTheMake
7a9d430a28
Applied suggested changes
2017-06-21 12:17:59 +02:00
Dean Herbert
89986e8e77
Fix namespaces
2017-06-21 17:03:47 +09:00
Dean Herbert
45d3c2cd52
Merge branch 'master' into profile
2017-06-21 16:40:17 +09:00
smoogipooo
fc0e44b214
Update framework.
2017-06-21 11:28:27 +09:00
MrTheMake
2db0466722
Readded color flash and simplify logic
2017-06-21 02:47:11 +02:00
MrTheMake
edd7fd585c
Disable beatmap changing buttons when entering a screen that disallows changing the beatmap
2017-06-21 00:51:32 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
smoogipooo
1d5c5a0a4d
Fix an invalid depth operation.
2017-06-19 07:50:26 +09:00
Huo Yaoyuan
af4ddf8fbd
Merge branch 'master' into profile.
2017-06-16 16:32:54 +08:00
Huo Yaoyuan
fa98cfa9e5
Handle max==min in LineGraph.
2017-06-16 14:48:14 +08:00
Dean Herbert
ae79ba48be
Merge branch 'master' into numpad-enter
2017-06-16 15:32:52 +09:00
MrTheMake
06089a74e3
Handle the numpad's Enter in cases where only the normal Enter was handled
2017-06-15 23:06:28 +02:00
Huo Yaoyuan
3ec5d774df
Child control fixes.
2017-06-15 22:42:15 +08:00
Huo Yaoyuan
ce67a28609
Merge branch 'master' into profile.
2017-06-15 02:31:51 +08:00
Huo Yaoyuan
78669a5941
Hover for rank history.
2017-06-15 02:17:48 +08:00
Huo Yaoyuan
3b64dfe0fd
Update transform using masking.
2017-06-15 00:46:39 +08:00
Huo Yaoyuan
443e24716c
Handle relative size at LineGraph level.
2017-06-14 22:00:22 +08:00
Huo Yaoyuan
190de76d9a
Add LineGraph.
2017-06-14 20:37:07 +08:00
smoogipooo
99a93d98dc
Merge remote-tracking branch 'origin/master' into fix-hacky-tabs
2017-06-13 19:46:01 +09:00
Huo Yaoyuan
9ceb4930e9
Merge branch 'master' into profile
2017-06-13 15:23:12 +08:00
Dean Herbert
19236dcd1e
Merge branch 'improved-loading-animation' into nuget-update
2017-06-13 15:50:21 +09:00
Dean Herbert
700d6f9d38
Adjust appearance slightly
2017-06-13 15:27:47 +09:00
Dean Herbert
679786c76f
Move MenuItemType to correct namespace
2017-06-13 15:20:21 +09:00
EVAST9919
9f8c66b8c6
Forgot to add dropdown-like animation
2017-06-12 13:39:45 +03:00
EVAST9919
41eb084191
CI fixes
2017-06-12 13:37:13 +03:00
EVAST9919
1711258038
Context Menu
2017-06-12 12:56:07 +03:00
Dean Herbert
3efe8629d6
Fix hacky tabs
2017-06-12 18:39:22 +09:00
Dean Herbert
e94425f311
Improve the loading animation and use it in multiple places
...
- Supersedes https://github.com/ppy/osu/pull/926 .
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817 .
2017-06-12 17:04:42 +09:00
Huo Yaoyuan
e311ac612c
Merge branch 'master' into profile
2017-06-12 14:40:42 +08:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
Huo Yaoyuan
3945d33adc
Make OsuTabControl.isEnumType static.
2017-06-09 19:04:29 +08:00
Huo Yaoyuan
140c74cd2a
Use PageTabControl.
2017-06-09 16:01:16 +08:00
John Neijzen
2f7d9655fd
More Clean up
2017-06-08 15:27:35 +08:00
John Neijzen
431d225a60
Keyword Spacing and Brackets Fixing
2017-06-08 14:35:10 +08:00
Dean Herbert
bf971f6613
Merge branch 'master' into social-browser
2017-06-05 19:16:28 +09:00
Dean Herbert
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
Jorolf
f6e0e0bc38
add caps lock warning
2017-06-03 19:24:53 +02:00
Jorolf
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
Seth
394745bca5
Merge branch 'master' into social-browser
2017-05-31 05:18:52 -03:00
Dean Herbert
bab3f1b89a
Merge branch 'master' into user-dropdown-arrow
2017-05-31 15:39:52 +09:00
EVAST9919
8cde50a88a
Merge branch 'master' of https://github.com/ppy/osu into ingame_options
2017-05-31 08:23:06 +03:00
DrabWeb
cd57343191
Text -> Label
2017-05-31 02:03:13 -03:00
DrabWeb
4fd7405fb8
Fix user dropdown menu item chevron alignment
2017-05-31 01:57:32 -03:00
Dean Herbert
8544b45443
Update in line with framework
2017-05-30 22:23:51 +09:00
EVAST9919
e737ded382
Applied suggested changes
2017-05-30 12:23:53 +03:00
smoogipooo
7416952eb3
Fix usings.
2017-05-30 17:36:42 +09:00
smoogipooo
c8066cfde9
Allow Nub/OsuCheckbox/OsuSliderBar colours to be overridden.
2017-05-30 16:40:35 +09:00
EVAST9919
08219ccb42
Applied suggested changes
2017-05-29 19:00:29 +03:00
Dean Herbert
5e4558cc54
Merge branch 'master' into social-browser
2017-05-29 18:35:22 +09:00
Dan Balasescu
6918368afc
Merge branch 'master' into ingame_options
2017-05-29 18:12:02 +09:00
Dean Herbert
718eeb6df8
Use linq to tidy up casting
2017-05-29 16:18:07 +09:00
Dean Herbert
4a0c8fb5dd
Merge branch 'master' into breadcrumbs
2017-05-29 15:59:37 +09:00
Dean Herbert
f3422800b1
Merge remote-tracking branch 'upstream/master' into backbutton_beat
2017-05-29 13:04:43 +09:00
Seth
0e087994a1
Merge branch 'master' into social-browser
2017-05-28 15:11:00 -03:00
Dean Herbert
d749fc516d
Update focus handling in line with framework changes
2017-05-28 20:08:46 +09:00
Dean Herbert
bdeaf2dbb4
Update method names in line with framework changes
2017-05-28 18:34:12 +09:00
EVAST9919
743dfcc130
More xmldoc and few Title text fixes
2017-05-28 00:56:11 +03:00
DrabWeb
d4a9813af9
Cleanup BreadcrumbTabItem visibility code
2017-05-27 18:19:09 -03:00
EVAST9919
bedcf04043
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-27 02:25:03 +03:00
DrabWeb
3699c39967
PADDING -> padding, make private
2017-05-26 16:46:09 -03:00
DrabWeb
33d6b718be
padding -> PADDING
2017-05-26 16:37:52 -03:00
DrabWeb
c9971bb490
Don't store hideChevron
2017-05-26 16:32:46 -03:00
DrabWeb
4c127a6130
CI fixes
2017-05-26 16:29:20 -03:00
DrabWeb
352d3d247b
Fix incorrect sizes
2017-05-26 16:21:37 -03:00
DrabWeb
fb6ed159ca
Use padding for chevron margin
2017-05-26 16:03:51 -03:00
EVAST9919
d052f093d5
Scaling on hover
2017-05-26 14:29:45 +03:00
DrabWeb
cbe36259c3
Add BreadcrumbControl
2017-05-26 07:49:45 -03:00
EVAST9919
2c23703ca6
Removed amplitude container
2017-05-26 13:46:44 +03:00
EVAST9919
ad66587273
Merge remote-tracking branch 'refs/remotes/ppy/master' into backbutton_beat
2017-05-26 13:19:47 +03:00
DrabWeb
8fca0fddb3
Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser
2017-05-26 00:54:03 -03:00
DrabWeb
8e09b738b0
Remove magic numbers
2017-05-24 21:51:00 -03:00
DrabWeb
b57a3f2056
Initial layout of user panel and user dropdown
2017-05-24 19:44:48 -03:00
EVAST9919
181648515b
Moving icon to the beat on the TwoLayerButton
2017-05-24 16:05:24 +03:00
EVAST9919
178f8127b8
overall fixes
2017-05-23 16:01:00 +03:00
EVAST9919
0615f104f0
SettingsContainer -> SettingsDropdownContainer
2017-05-21 18:22:27 +03:00
DrabWeb
1d61fc84c7
Remove duplicate code in SettingsEnumDropdown
2017-05-19 17:04:59 -03:00
EVAST9919
6f0e1fccdb
moved autosize to ctor and whitespace fix
2017-05-19 16:08:33 +03:00
EVAST9919
e18f95185f
More constants
2017-05-19 06:39:39 +03:00
EVAST9919
c3647e4056
dropdown-like animation
2017-05-19 06:26:54 +03:00
DrabWeb
a5fa7e1a7d
Result counts displaying
2017-05-18 17:43:39 -03:00
EVAST9919
f2af31aceb
Naming fixes
2017-05-18 20:21:58 +03:00
EVAST9919
640c940fce
Make field readonly
2017-05-18 11:50:15 +03:00
EVAST9919
83a89ce22d
options -> settings
2017-05-18 11:39:22 +03:00
DrabWeb
5fb445e3fe
Basic direct panel, minor cleanups
2017-05-17 16:37:34 -03:00
DrabWeb
9ba356f2c6
Added osu!direct header and filter control
2017-05-17 05:58:34 -03:00
EVAST9919
5fb8830e3a
Moved music controller buttons to it's own class
2017-05-17 10:36:24 +03:00
Huo Yaoyuan
f1d5a92950
Use generic IEqutable to avoid typeless Equals.
2017-05-16 21:49:38 +08:00
Huo Yaoyuan
b9a40a841b
Use IsAssignableFrom.
2017-05-16 21:04:54 +08:00
Dean Herbert
b016d53b85
Fix TwoLayerButton not capturing MouseDown events
...
Caused clicks to pass through the skip button to the progress bar.
2017-05-16 17:59:07 +09:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
Dean Herbert
24db423c4f
Merge remote-tracking branch 'upstream/master' into playlist-commit
2017-05-12 20:39:50 +09:00
Dan Balasescu
815379646c
Merge branch 'master' into new-option-search
2017-05-12 20:22:11 +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
f044b95ce8
Allow OsuTabControl to handle non-enum types.
2017-05-11 23:10:19 +09:00
DrabWeb
c193a90a16
Merge https://github.com/ppy/osu into playlist
2017-04-29 05:39:52 -03:00
Dean Herbert
94c259bd59
Remove most usages of DelayReset
...
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09: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
Dean Herbert
ef7bc0f92e
Update UI controls to understand DisabledChanged.
2017-04-21 14:02:04 +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
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
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
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
smoogipooo
3054697f98
Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.
2017-04-13 10:04:12 +09: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
ec6267c5b2
switch -> if.
2017-04-12 19:41:11 +09:00
Jorolf
d2affe6867
requested changes
2017-04-12 10:52:24 +02: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
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
Jorolf
fb5952186c
changes and fixes
2017-04-11 14:02:56 +02: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
f8c6ce15c3
Fix weird RollingCounter behaviour.
2017-04-11 16:37:36 +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
Dean Herbert
5af4259ab4
Add back explicit binds.
2017-04-10 17:10:15 +09:00
Dean Herbert
f12b5a8954
Unify disable logic.
2017-04-10 16:22:36 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes.
2017-04-10 14:54:23 +09:00
DrabWeb
963cd09bd0
Merge https://github.com/ppy/osu into playlist
2017-04-09 04:04:13 -03:00
Jorolf
f7a9a11ae5
Bar uses AccentColour aswell
2017-04-08 13:53:11 +02:00
Jorolf
5e56e84c4a
change SRGBColour to Color4 and use IHasAccentColour in some places
2017-04-08 13:31:55 +02:00
Jorolf
c60a55285c
updated TestCase and some null checks
2017-04-07 20:32:09 +02:00
Jorolf
9881889f88
removed some unused stuff
2017-04-07 18:24:36 +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
Jorolf
e59c0a770f
Merge branch 'master' into details
2017-04-06 15:42:00 +02:00
Huo Yaoyuan
9b1e010dcc
Fix filename mismatch.
2017-04-06 16:05:41 +08:00
Dean Herbert
942699218a
Merge branch 'master' into details
2017-04-06 15:44:43 +09:00
Jorolf
f9bf1c69bf
add Flags to BarDirection and remove unused "using"
2017-04-04 18:23:29 +02:00
Jorolf
502afc0a48
some fixes to BarGraph so Direction works properly
2017-04-04 18:09:16 +02:00
Jorolf
b2731bb0a1
some formatting
2017-04-04 17:27:08 +02:00
Jorolf
58f8dc8254
add direction to graphs
2017-04-04 17:17:22 +02:00
Dean Herbert
7c74951454
Update bindables.
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseResults.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
f6303d55ec
Upodate some tab usages.
2017-04-04 11:13:09 +09:00
Jorolf
5a694e0c9d
changed location of BarGraph to be more generic
2017-04-03 19:29:13 +02:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox.
2017-03-31 17:38:33 +09:00
Dean Herbert
79031b9e74
Update framework.
2017-03-31 12:58:54 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
DrabWeb
215b016f32
Initial implementation
2017-03-24 05:59:26 -03:00
DrabWeb
88d878e1d5
Formatting
2017-03-23 02:47:27 -03:00
Dean Herbert
e77229b34b
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5
Formatting
2017-03-23 01:35:55 -03:00
DrabWeb
67421cdf1c
Even though it was 5 minutes ago what was I thinking
2017-03-23 01:34:06 -03:00
DrabWeb
87b8015e8f
Cleanup
2017-03-23 00:29:28 -03:00
DrabWeb
c173c4b7ee
Tab control
2017-03-23 00:22:31 -03:00
Dean Herbert
b0340f77d8
Remove nested types completely.
2017-03-23 08:57:14 +09:00
Dean Herbert
3dee39346f
U -> T1.
2017-03-23 08:49:29 +09:00
Dean Herbert
ba32d50456
Consolidate nested classes.
2017-03-23 08:44:52 +09:00
Huo Yaoyuan
0dbc232ebf
Rename all DropDown -> Dropdown.
2017-03-22 22:32:32 +08:00
Huo Yaoyuan
6a4ca08578
Merge branch 'master' into controls
2017-03-22 22:28:19 +08:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes.
2017-03-22 19:35:03 +09:00
Huo Yaoyuan
e217c67bcf
Merge branch 'master' into controls
2017-03-22 08:54:03 +08:00
Huo Yaoyuan
b06eb0122c
Fix for colours and members rename.
2017-03-22 08:15:31 +08:00
Huo Yaoyuan
f0edf5d3d3
Update to DropDown and Menu.
2017-03-22 07:18:53 +08:00
Huo Yaoyuan
1d13924e0a
Remove redundant type parameter.
...
Nested type has implicit type parameter from base type.
2017-03-21 01:05:48 +08:00
smoogipooo
d27f37beb5
Hard-code text size in cases it wasn't set.
2017-03-20 13:48:06 +09:00
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes.
2017-03-17 00:39:40 +09:00
Dean Herbert
8cd1353d74
Fix serious input regression.
2017-03-16 22:09:35 +09:00
Dean Herbert
2cf6ed423e
Disallow duplicate active changes.
2017-03-16 21:33:08 +09:00
Dean Herbert
84b080a060
Make transition logic a bit more sane.
2017-03-16 21:26:03 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files.
2017-03-16 21:17:14 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
Dean Herbert
93c0fe5140
Remove unnecessary set.
2017-03-16 17:02:37 +09:00
Dean Herbert
1156e76c28
Don't directly access Header.
2017-03-16 17:00:49 +09:00
Dean Herbert
334e389518
Tidy up OsuTabControl and FilterControl.
2017-03-16 16:35:44 +09:00
Drew DeVault
360340c61d
Fix linter issues
2017-03-15 22:39:09 -04:00
Drew DeVault
01cca1a4d2
Refactor color handling
...
colour*
2017-03-15 20:52:31 -04:00
Drew DeVault
3aecbf5739
Rearrange things somewhat
2017-03-15 20:15:40 -04:00
Kelvin
755fb260db
Updated TabControl Usage
2017-03-14 19:52:21 -07:00
Kelvin
ee3d3b682f
Updated usage for DropDownHeader of FilterTabControl
2017-03-14 19:49:40 -07:00
Kelvin
2629f78afc
Add FilterControl and FilterTabControl
2017-03-14 19:49:40 -07:00
Dean Herbert
b5a8ef07fe
Update framework.
2017-03-15 09:46:03 +09:00
Dan Balasescu
0fa2776975
Merge branch 'master' into counter_bindables
2017-03-10 14:21:33 +09:00
smoogipooo
5f72265eff
Remove float ValueAt method.
2017-03-10 14:09:55 +09:00
smoogipooo
cd1717c42f
More bindables!
2017-03-10 13:49:51 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Thomas Müller
9b92e99ce9
Merge branch 'master' into increase-ci-strictness
2017-03-06 21:44:39 +01:00
Dean Herbert
88f3dc0e02
Fix a few naming issues.
2017-03-06 18:49:23 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome.
2017-03-06 17:06:48 +09:00
Thomas Müller
73fef85b12
Remove unnecessary usings
2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow
2017-03-04 23:28:39 +09:00
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01:00
TheGui
e3c3806759
Fixed accuracy's counter first value change.
2017-03-04 04:48:32 -03:00
Huo Yaoyuan
ef13cdbff7
Disallow copying from OsuPasswordTextBox.
2017-03-03 10:00:39 +08:00
Thomas Müller
c732890664
Remove usages of negative Margin / Padding
...
Replaces such usage with more sensible settings, like changing the
position or size.
2017-03-02 19:16:31 +01:00
Dean Herbert
4163569e57
Fix some license headers.
2017-03-02 18:45:20 +09:00
Dean Herbert
ff5f0af2d3
Merge branch 'master' into popup-dialog
2017-03-02 16:42:20 +09:00
Thomas Müller
4d28696479
FlowDirection -> FillDirection
2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465
Update framewörk
2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes
2017-02-28 13:49:19 +09:00
DrabWeb
e8cae3b45e
Remove new override in DialogButton
2017-02-27 21:38:25 -04:00
DrabWeb
164f205ee5
Remove SpaceTextOnHover
2017-02-27 21:30:10 -04:00
DrabWeb
3094c01a40
Merge https://github.com/ppy/osu into popup-dialog
2017-02-27 16:40:04 -04:00
default0
03889e6ca6
Update References to FlowStrategies
...
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Andrey Zavadskiy
3487dfe236
Removed unused variables and parameters
2017-02-27 17:32:32 +03:00
DrabWeb
d78dca3d85
New design
2017-02-26 23:35:13 -04:00
Dean Herbert
47997c20ad
Weld -> BindWith.
2017-02-27 12:24:53 +09:00
default0
8d91519d59
Update usage of FlowContainer and its subclasses
2017-02-26 21:32:43 +01:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Dean Herbert
12db33ad4b
Visual and readability improvements to StarCounter.
2017-02-24 19:30:56 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings
2017-02-24 11:29:34 +09:00
Thomas Müller
0264c44a20
Do not shadow Colour in TwoLayerButton
...
Renames Colour to BackgroundColour instead.
2017-02-23 22:33:37 +01:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Dean Herbert
520e040396
Add FocusedTextBox abstraction.
2017-02-19 17:59:22 +09:00
Dean Herbert
78c9348b5a
Make accuracy fixed width and improve feel.
2017-02-18 17:35:54 +09:00
Dean Herbert
1a31589abd
Add padding zeroes to score display (and fix not being applied initially).
2017-02-18 17:35:37 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
Dean Herbert
53e40804ab
Move other score components to centre alignment (and switch font).
2017-02-16 22:44:41 +09:00
Dean Herbert
13ed7db361
Merge branch 'master' into general-fixes
2017-02-15 01:14:25 +09:00
Dean Herbert
f207da6041
Add/update license headers.
2017-02-14 18:17:35 +09:00
Dean Herbert
4f9d1a6c39
Visually disable options which aren't yet wired up.
2017-02-14 00:36:50 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Dean Herbert
8ec927899f
Implement notifications.
2017-02-10 16:30:23 +09:00
Dean Herbert
d73093867d
Merge pull request #320 from default0/audio-device-selection
...
Audio device selection
2017-02-09 16:45:29 +09:00
Dean Herbert
d05b544d0d
Merge branch 'master' into audio-device-selection
...
# Conflicts:
# osu-framework
# osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
2017-02-09 16:21:28 +09:00
Dean Herbert
18bb61897f
Update overlay containers in lines with framework changes.
...
Allows closing the MusicController using escape.
2017-02-09 13:57:44 +09:00
Dean Herbert
92c77263ed
Use CircularContainer for nub (bumps framework).
2017-02-08 17:21:17 +09:00
Dean Herbert
55e7177577
Password masking character animation.
2017-02-08 16:01:58 +09:00
Dean Herbert
a6f02106a4
Use new placeholder logic.
2017-02-08 14:08:01 +09:00
Dean Herbert
84096b146e
Make password mask characters look better.
2017-02-08 12:49:20 +09:00
Dean Herbert
5a89ba1040
Make OsuTextBox use OsuSpriteText.
2017-02-08 11:22:46 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing.
2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
756fd78a88
Fix incorrect line endings.
2017-02-07 13:52:19 +09:00
default0
b230b5cfb9
Update OsuDropDownMenu for Framework-Changes
...
Since the DropDownMenu in the framework has changed it was necessary
to update the GetDropDownItems override of OsuDropDownMenu to
accomodate the new structure of the framework.
2017-02-06 01:17:50 +01:00
Thomas Müller
8271b139e9
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
2017-02-05 09:40:58 +01:00
Thomas Müller
aae5f4f9e2
Fix volume control not showing is mouse-wheel is turned during its fade-out animation.
2017-02-05 09:40:12 +01:00
Dean Herbert
d97f02a219
Cursor becomes vector.
2017-02-04 22:56:56 +09:00
Dean Herbert
97d52188b2
Make sliderbar lines smoother when scrolling.
2017-02-04 20:56:14 +09:00
Dean Herbert
1e3266a9d2
Fix sliderbar lines lagging behind nub.
2017-02-04 20:55:26 +09:00
Thomas Müller
1913ec659a
Merge branch 'master' of github.com:ppy/osu into better-option-sliders
2017-02-04 12:07:21 +01:00
Thomas Müller
d6714324df
OsuNub -> Nub.
2017-02-04 12:06:53 +01:00
Thomas Müller
6db70f8850
Use MaskingSmoothness to make masked diagonal edges smoother.
2017-02-04 11:06:26 +01:00
Thomas Müller
0edc64a08c
Re-use checkbox nub for option sliders and slightly re-structure.
2017-02-04 09:50:58 +01:00
Dean Herbert
c24edb583f
Uncomment corner radius post-fix.
2017-02-04 16:05:24 +09:00
Dean Herbert
9f9278c837
Fix background colour of dropdown menu item area.
2017-02-03 19:23:14 +09:00
Dean Herbert
4504440f80
Fix much dropdown shit.
2017-02-03 19:13:10 +09:00
Dean Herbert
36cfe54e59
Missing namespace.
2017-02-03 13:16:45 +09:00
Dean Herbert
16a01abc4d
Merge remote-tracking branch 'upstream/master' into options-refactor
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Dean Herbert
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
Dean Herbert
7008e36167
Button hover and press effects.
2017-01-31 20:32:36 +09:00
Dean Herbert
9ff37e5ed9
Change textbox commit colour to match border.
2017-01-31 20:10:26 +09:00
Dean Herbert
1bb142d42a
Bold font for OsuButtons.
2017-01-31 19:58:45 +09:00
Dean Herbert
a2cd829a2c
Colour conformity pass.
2017-01-31 19:40:02 +09:00
Dean Herbert
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
Dean Herbert
687b634fb3
Adjust button font size.
2017-01-31 18:40:04 +09:00
Dean Herbert
6ca974bf0c
Re-namespace options, adjust font sizes + more.
2017-01-31 18:37:11 +09:00
Dean Herbert
bdbe8501d3
Merge branch 'master' into add-flash-effects
...
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
Dean Herbert
26e9533ff0
Add custom implementation of TextBox.
2017-01-30 20:29:04 +09:00
Dean Herbert
b4c01f104b
Make buttons look closer to the design.
2017-01-30 18:10:30 +09:00
Dean Herbert
8f1e7ef19a
Fix non-matching shear angles.
2017-01-30 15:28:47 +09:00
Dean Herbert
3e7503e860
Make skip button work.
2017-01-27 21:57:22 +09:00
Dean Herbert
420e61fa97
TwoLayerButton
2017-01-27 21:08:36 +09:00
Dean Herbert
5787b43586
wip
2017-01-27 19:14:44 +09:00
Dean Herbert
f3e9da609e
Merge pull request #295 from peppy/songselect-footer
...
Initial implementation of song select footer area.
2017-01-27 16:13:43 +09:00
Dean Herbert
c3699c1395
Remove unused prevCount variable.
2017-01-27 00:39:00 +09:00
Dean Herbert
4a7b3cf391
Initial implementation of song select footer area.
2017-01-27 00:36:12 +09:00
Drew DeVault
f5f545df62
Refactor OsuColour into injected instance class
...
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d
Refactor colors to palette based design
2017-01-12 16:38:27 -05:00
Drew DeVault
c222be05c0
Add Color4.Opacity and OsuColor.Gray
2017-01-10 13:44:40 -05:00
Drew DeVault
70ecf48ca7
Add central color class
...
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.
Closes #126
2017-01-09 17:20:31 -05:00
Dean Herbert
20260b43d1
Improve star animation.
2016-12-15 22:58:34 +09:00
Dean Herbert
08f8eb649c
Make counters closer to what they should be looking like.
2016-12-07 21:05:29 +09:00
Dean Herbert
f356640cb7
Add missing licence headers.
2016-12-06 19:07:15 +09:00
Dean Herbert
ef8793ff24
Merge branch 'refs/heads/master' into more-sound-effects
2016-12-06 00:08:45 +09:00
Dean Herbert
3cb9cb647d
Tidy up BackButton and adjust transitions a bit.
2016-12-05 21:36:42 +09:00
Dean Herbert
7bd9a87bda
Add menu button sound effects.
2016-12-05 21:09:41 +09:00
Huo Yaoyuan
2eefc320fd
Make KeyCounterCollection generic.
2016-12-03 15:58:27 +08:00
Thomas Müller
a456eb6f1b
Fix being able to hover the back button from outside of its shape.
...
Could alternatively done by shearing the entire button, but then you would need a positional x-offset depending on whether the anchor is top or bottom.
2016-11-29 21:12:49 +01:00
Dean Herbert
53df2932ad
Merge pull request #199 from stanriders/back-button
...
Add stable-alike BackButton
2016-11-30 03:20:03 +09:00
stanriders
988a9bbaad
Switch to relative sizes
2016-11-29 20:27:59 +03:00
Dean Herbert
fa80cc84f8
Fix volume control fill being incorrect on first display.
2016-11-29 18:35:59 +09:00
Dean Herbert
139fe873f3
Remove silly weld weld weld.
2016-11-29 18:35:40 +09:00
Dean Herbert
a47507fff3
Remove redundant property assignments.
2016-11-29 16:54:54 +09:00
Dean Herbert
3526c299ec
Reformat code.
2016-11-29 16:24:37 +09:00
stanriders
2ecf72d0d7
More consts, less crap (probably)
2016-11-29 05:36:48 +03:00
stanriders
775e8ac5d6
Hardcoded button size, fixed input handling, fixed flash not being visible
2016-11-27 18:56:05 +03:00
stanriders
fb3d5a3b79
One more
2016-11-27 07:18:56 +03:00
stanriders
a3ceef48a6
More backbutton
2016-11-27 07:06:50 +03:00
stanriders
88ead18929
Backbutton improvements
2016-11-27 06:50:36 +03:00
stanriders
ba18c9a309
Merged ExtendableButton and BackButton
2016-11-27 05:48:31 +03:00
stanriders
af57984d5c
Moved ExtendableButton out of framework
2016-11-27 04:41:17 +03:00
stanriders
e9343fe53d
Add stable-alike BackButton
2016-11-27 04:21:12 +03:00
Drew DeVault
69cb9cf4de
Fix up volume encapsulation
2016-11-25 00:21:42 -05:00
Drew DeVault
a3db259071
Fix VolumeMeter.Bindable
2016-11-25 00:21:42 -05:00
Dean Herbert
20ae8df2bd
Refactor volume control to load asynchronously.
2016-11-23 16:12:21 +09:00
Dean Herbert
3e9c398652
Update input handler logic to match framework changes.
2016-11-21 21:36:11 +09:00
Huo Yaoyuan
53deaf2a00
Merge branch 'master'
2016-11-16 10:51:39 +08:00
Dean Herbert
867797a089
Change volume control mouse wheel behaviour to not gain full-screen focus.
2016-11-15 15:22:14 +09:00
Huo Yaoyuan
1cddc4eb5b
Use EqualityComparer<T> to avoid boxing and casting when comparing.
2016-11-15 01:49:05 +08:00
Tom94
c860eb25f9
Migrate to new anchor system without x/y reversal.
2016-11-14 17:22:20 +01:00
Thomas Müller
ac99e2d488
Avoid using load to construct the drawable hierarchy whereever possible.
2016-11-12 18:34:36 +01:00
Dean Herbert
cc0f61f545
Merge branch 'refs/heads/master' into dependency-injection
...
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
ee24cd310c
Convert everything to DI pattern
2016-11-10 16:41:18 -05:00
Dean Herbert
f14a35d480
Update FontAwesome definitions.
2016-11-07 17:59:00 +09:00
Thomas Müller
103176826f
Ensure transformations are never used prior to being added to the Drawable tree.
2016-11-06 11:13:52 +01:00
Thomas Müller
5f2bf165a2
Remove now obsolete clock usages.
2016-11-06 10:06:09 +01:00
Thomas Müller
a6c0fd29f2
Make use of new timing system in Drawables and Transforms.
2016-11-06 08:25:21 +01:00
Drew DeVault
cb40b7079f
Rework how references are passed about
2016-11-03 22:43:00 -04:00
Drew DeVault
6c0cef894e
Add OsuButton with sane defaults
2016-11-03 19:06:22 -04:00
Dean Herbert
b86f308af6
Add async workflow.
2016-11-01 23:24:14 +09:00
Dean Herbert
13b5fb0578
Update transforms to not accept clock.
2016-10-28 17:42:00 +09:00
Dean Herbert
ee8b678989
Fix volume controls handling mouse wheel at a higher level than anything else game-wide.
2016-10-26 18:45:48 +09:00
Dean Herbert
3ce93608fb
Fix one remaining FlowContainer.
2016-10-22 19:37:27 +09:00
Dean Herbert
cdef75c98b
Fix AutoSize references.
2016-10-22 17:50:42 +09:00
Dean Herbert
43f0409893
Start to structure flow of information in Player.
...
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
Dean Herbert
ee463dc65c
Merge pull request #77 from NeoAdonis/counters-a
...
Rolling counters
2016-10-19 15:06:00 +09:00
Thomas Müller
68476eafb9
Use DrawSize instead of Size whereever Size was previously read due to framework changes.
...
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
Adonais Romero González
eeacd85073
Protect RollingCounter props
2016-10-17 21:40:50 -05:00
Adonais Romero González
72c4dc344e
Misc. fixes and improvements
2016-10-16 18:30:25 -05:00
Adonais Romero González
862dc1d7c7
Tidying code and restricting methods
2016-10-15 19:07:07 -05:00
Adonais Romero González
10b47859c3
Delay order on StarCounter changed
2016-10-15 18:04:00 -05:00
Adonais Romero González
0ceb72ba42
More refactoring
2016-10-15 15:16:02 -05:00
Adonais Romero González
a15f4cda44
Tidying
2016-10-15 15:03:51 -05:00
Adonais Romero González
2625d06553
Why calling StopAnimation() on StarCounter's ctor()?
2016-10-15 13:53:39 -05:00
Adonais Romero González
6bd3eaf37d
Changes according to review + Refactor
2016-10-14 18:23:27 -05:00
Adonais Romero González
edbbe8daef
Delete unnecessary class attributes
2016-10-13 22:54:02 -05:00
Adonais Romero González
9ccff6ec48
Tidying up
2016-10-13 19:50:06 -05:00
Adonais Romero González
0deb5b4e22
Removed unneeded vars
2016-10-13 18:07:06 -05:00
Adonais Romero González
69621eb6d3
Star animation delay micro fix
2016-10-13 18:00:36 -05:00
Adonais Romero González
ce07a45456
Improved code
2016-10-13 17:13:20 -05:00
Dean Herbert
5e3e949fd6
Revert all counter commits. Requires much further review.
2016-10-13 14:45:41 +09:00
Adonais Romero González
1d8d2fa9c9
Implicit base()
2016-10-12 21:46:51 -05:00
Adonais Romero González
8f0093f133
Comments in StarCounter
2016-10-12 21:36:52 -05:00
Adonais Romero González
55420d4356
Improvements in transformCount handling
2016-10-12 21:33:55 -05:00
Adonais Romero González
bf832ebe71
uint for ids
2016-10-12 21:03:41 -05:00
Adonais Romero González
71d7de5326
Leading zeroes now part of ScoreCounter ctor
2016-10-12 20:57:06 -05:00
Adonais Romero González
73e4359e9d
Adjusted StarCounter ctor
2016-10-12 20:51:50 -05:00
Adonais Romero González
e9a38f0c4d
Fixed some animations
2016-10-12 17:24:06 -05:00
Adonais Romero González
fa67ab86ed
Adjusted Combo Counter animation
2016-10-12 15:28:24 -05:00
Adonais Romero González
11e0429fd3
Children creation off-load to ctors
2016-10-12 14:38:48 -05:00
Adonais Romero González
798e7241d8
Make counters work again
2016-10-12 14:33:04 -05:00
Dean Herbert
61d5c7c56d
Make stuff compile again (but StarCounter hits assertions).
2016-10-12 16:11:40 +09:00
Dean Herbert
e800649633
Merge remote-tracking branch 'upstream/master' into limit-game-access
2016-10-12 16:03:03 +09:00
Dean Herbert
4052a665bf
Remove all non-load Game access.
2016-10-12 15:47:08 +09:00
Drew DeVault
5306141f5f
Merge pull request #49 from NeoAdonis/counters
...
Rolling counters (initial)
2016-10-11 15:04:46 -04:00
Adonais Romero González
2954c19345
Misc. fixes
2016-10-09 15:19:35 -05:00
Adonais Romero González
4d0c8ed441
StarAnimationEasing
2016-10-09 14:55:50 -05:00
Adonais Romero González
fd1cbfd8fa
Hide VisibleCount from transformStar
2016-10-09 14:53:06 -05:00
Adonais Romero González
01da3ca474
More line wrapping
2016-10-09 14:48:24 -05:00
Adonais Romero González
841707b61f
Not animate stars over MaxStars
2016-10-09 14:09:07 -05:00
Adonais Romero González
707effb591
Completed StarCounter
...
More complex than the other counters, but hopefully functional.
I subestimated you and your silly bouncing animations.
>.>
2016-10-09 14:02:44 -05:00
Thomas Müller
dd04b33232
Use AddInternal instead of AddTopLevel.
2016-10-09 20:06:23 +09:00
Adonais Romero González
67d3d772f6
Minor fix with StarCounter width
2016-10-08 22:15:25 -05:00
Adonais Romero González
37115c8c9f
Merge branch 'master' into counters
2016-10-08 22:02:43 -05:00
Adonais Romero González
accf365fd1
More styling.
2016-10-08 21:58:53 -05:00
Adonais Romero González
0d18680eeb
StarCounter styling using absolute positioning.
2016-10-08 21:45:01 -05:00
Adonais Romero González
5ebb2fc289
Refactor + Stars Counter (initial)
...
Moved a few things to allow using common transforms
for a star counter. This implementation is basic and
hacky, but good enough as proof of concept.
2016-10-08 19:11:01 -05:00
Dean Herbert
5ff9d828eb
Add KeyCounter to Player for fun.
2016-10-08 15:53:59 +09:00
Adonais Romero González
a3b4a34a1a
TestCase buttons + minor fixes
2016-10-07 17:15:36 -05:00
Adonais Romero González
7277cf5af1
Reflection to simplify transforms + some refactoring
2016-10-07 16:59:52 -05:00
Adonais Romero González
965e542eaf
Line wrapping
2016-10-07 16:14:35 -05:00
Adonais Romero González
35325fab95
Licence added
2016-10-07 02:24:46 -05:00
Adonais Romero González
00cfc51004
Rolling counters (initial)
2016-10-07 02:05:02 -05:00
Dean Herbert
ac16bffe49
Bring framework and resources up-to-date.
2016-10-01 19:05:26 +09:00
Huo Yaoyuan
25fecfca06
Relative size and position for text layer.
2016-09-26 16:56:39 +08:00
Huo Yaoyuan
bb13da2b32
Add ResetCount method for Counter.
2016-09-26 14:23:22 +08:00
Huo Yaoyuan
b4bb3d6317
Update private methods implementation.
2016-09-26 14:21:40 +08:00
Huo Yaoyuan
756e7a6a67
Add missing lincense header, remove unnecessary comment and field.
2016-09-26 14:21:25 +08:00
Huo Yaoyuan
63535df6dc
Fix typo and missnaming.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ec2bc4720d
Comma seperator in numbers.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ed4fae53cb
Add FadeTime and allow setting custom styles directly from container.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
f4ac1f630d
Adjust visual tree of counter.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
0da0d4f35e
Avoid accessing container in each counter.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
c70bf53486
Rename counter classes to avoid confusing.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
16f1dff849
Make counter public.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
d8666deaa0
IsLit Adjustment.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
ba19fe1b97
Move IsCounting to KeyCounter.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
409bb0d068
Counter animation.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
81f269ee69
MouseCount and KeyBoardCount, input handling.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
e5ef3e1d02
Adjust children position of Counter.
2016-09-24 19:46:10 +08:00
Huo Yaoyuan
55a1a3827a
Implement KeyCounter and base Count class.
2016-09-24 19:46:10 +08:00
Remie Richards
4754c0e2d1
Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface
2016-09-17 21:54:52 +01:00
Remie Richards
1a5c2b5221
Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax
2016-09-17 21:33:46 +01:00
Dean Herbert
375406bc97
Bring framework up-to-date.
2016-09-11 17:23:43 +09:00
Dean Herbert
4a85d8627d
Update to latest framework version.
2016-09-11 03:04:47 +09:00
Dean Herbert
23111821f5
Update naming conventions.
2016-09-04 18:31:58 +09:00
smoogipooo
dde748b8c1
Fix loaded not being set on textbox Load.
2016-09-03 21:18:07 +09:30
Dean Herbert
7d9cb85289
Hook up new TextInputSource to TextBox.
2016-09-02 14:41:42 +09:00
Dean Herbert
49a4d64fad
Fix TextBox always taking keyboard focus.
2016-09-01 22:55:02 +09:00
Dean Herbert
600223a65c
Add proper keyboard sound effects back.
2016-09-01 22:51:45 +09:00
Dean Herbert
923fc228e9
Fix cursor horizontal position.
2016-09-01 22:51:03 +09:00
Dean Herbert
a2fc339a45
Update Transforms to new style.
2016-09-01 22:51:03 +09:00
Dean Herbert
41c03ab255
Move ctor content to Load(). Schedule some prop updates.
2016-09-01 22:51:03 +09:00
Dean Herbert
7f0212f93f
TextSize -> SpaceWidth (temporary).
2016-09-01 22:51:03 +09:00
Dean Herbert
b3e2339175
Make TextBox rendering work again.
2016-09-01 22:51:03 +09:00