MrTheMake
8e0d59bfed
Updated to use ppy's implementation
2017-07-14 12:08:56 +02:00
Dan Balasescu
fa0c0e3b48
Merge branch 'master' into fix-track-rotation
2017-07-14 19:38:48 +10:00
Dan Balasescu
c13dc943f8
Merge branch 'master' into fix-track-rotation
2017-07-14 19:25:54 +10:00
Dan Balasescu
a6d917285a
Merge branch 'master' into settings-improvements
2017-07-14 19:22:45 +10:00
Dan Balasescu
3914b3ba13
Merge branch 'master' into right-mouse-scrollbar
2017-07-14 19:15:00 +10:00
Dean Herbert
9dba363b08
Use button boundaries to decide when to expand sidebar
2017-07-14 17:57:01 +09:00
Dean Herbert
b957bca4c5
Merge branch 'master' into settings-improvements
2017-07-14 17:27:09 +09:00
Dean Herbert
3aeed86392
Merge branch 'master' into drawable-room-update
2017-07-14 15:29:27 +09:00
Dean Herbert
bce4b838d8
Formatting
2017-07-14 14:40:50 +09:00
Dean Herbert
133bcdec7a
Move async loading to a higher level to simplify logic
2017-07-14 14:39:15 +09:00
Dean Herbert
980fb18ed6
Remove unnecessary alpha/alwayspresent changes
2017-07-14 14:30:35 +09:00
Dean Herbert
20052b060c
Nest delays and implement IStateful, allowing for flushing on early dismiss
...
Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.
2017-07-14 13:25:31 +09:00
Dean Herbert
ab5341eadc
Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash
2017-07-14 09:46:36 +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
2ff92ac25a
Contract sidebar on click
...
Also makes queueing of expand more correct.
2017-07-13 17:09:12 +09:00
Dean Herbert
939e167d6a
Correct offset settings vertically based on toolbar visibility
2017-07-13 17:09:12 +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
8460e29bcb
Sidebar now pushes full settings out further
2017-07-13 17:09:12 +09:00
Dean Herbert
fc28617099
Merge remote-tracking branch 'upstream/master' into ruleset-settings
2017-07-13 15:35:53 +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
b13e8599f1
Hide the login overlay when the user panel container by it is clicked
2017-07-13 14:46:17 +09:00
Dean Herbert
3c7cd97d42
Vertically center "coming soon" text
2017-07-13 14:24:08 +09:00
Dean Herbert
4cf409ab35
Adjust padding slightly
2017-07-13 14:23:52 +09:00
Dean Herbert
c7a13740f9
Move sections to own namespace
2017-07-13 13:53:45 +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
DrabWeb
fea40ccc1a
Share BeatmapSet cover sprite code.
2017-07-13 01:17:47 -03:00
Dean Herbert
f142bd0dc0
Improve formatting of panel creation code
2017-07-13 12:52:51 +09:00
DrabWeb
321ae42351
Formatting.
2017-07-13 00:27:41 -03:00
Dean Herbert
8045e0566f
Use a bindable for the current query.
...
Aso debounce and don't require hitting enter.
2017-07-13 12:22:51 +09:00
Dean Herbert
4e1a998f9d
Don't return so early on empty search (never clears results)
2017-07-13 12:20:32 +09:00
Dean Herbert
e30f0a2e69
Avoid potentially calling updateSearch more than once in a single update
2017-07-13 12:20:07 +09:00
DrabWeb
931adcf677
Typo.
2017-07-13 00:13:56 -03:00
DrabWeb
ca12fd3042
Better medal sprite loading, fade in particles, visual test update.
2017-07-13 00:13:18 -03:00
Dean Herbert
190ea3bfab
Remove unnused variable
2017-07-13 11:06:28 +09:00
Dean Herbert
3f2f42d13c
Always load high resolution for now
...
Also rename GetBackground to CreateBackground, since it's returning a new instance.
2017-07-13 10:30:09 +09:00
Dean Herbert
56c817e4b6
Merge branch 'master' into osu-direct-search
2017-07-13 10:16:27 +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
54f6befd67
Merge branch 'master' into fix-track-rotation
2017-07-12 13:18:16 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
DrabWeb
204d2ee43d
Convert MedalOverlay animation durations to constants.
2017-07-11 22:43:16 -03:00
DrabWeb
29cdbc65bc
CI fixes.
2017-07-11 22:38:13 -03:00
DrabWeb
aef2a3bdda
Cleanup.
2017-07-11 22:26:58 -03:00
DrabWeb
16bb96e6aa
Async medal sprite loading.
2017-07-11 22:12:49 -03:00
Jorolf
f7c9e449d4
add ruleset settings
2017-07-11 20:25:24 +02:00
Dean Herbert
773ef26ce3
Make MusicController support disabled beatmap bindable
2017-07-11 18:38:49 +09:00
Dean Herbert
311c2aec1c
Fix next track not automatically playing when music controller is not visible
2017-07-11 17:53:36 +09:00
DrabWeb
2ee0f3f5f6
Update with framework changes.
2017-07-11 02:11:08 -03:00
DrabWeb
202e3ca530
Merge https://github.com/ppy/osu into medal-splash
2017-07-11 02:00:36 -03:00
DrabWeb
a9ff0b5317
Make SlimMenu more opaque.
2017-07-11 01:59:52 -03:00
DrabWeb
b448603d6c
CI fixes.
2017-07-11 01:42:51 -03:00
DrabWeb
fc7b4ceff1
Fix osu!direct visual test initially not having a mode selected.
2017-07-11 01:30:59 -03:00
DrabWeb
fbe414d780
Cleanup.
2017-07-11 01:03:38 -03:00
DrabWeb
84701846ec
Merge https://github.com/ppy/osu into osu-direct-search
2017-07-11 00:26:49 -03:00
Huo Yaoyuan
752f625a62
Set relative axes inside AsyncLoadWrapper.
2017-07-11 09:19:36 +08:00
Huo Yaoyuan
fd4a054921
Merge branch 'master' into profile
2017-07-11 09:16:32 +08:00
Dean Herbert
d6d79432c9
Update framework
2017-07-11 09:59:08 +09: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
f856e89b58
Fix CI issues
2017-07-10 03:37:51 +09: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
Thomas Müller
1b55692368
Merge branch 'master' into better-fill-mode
2017-07-08 12:49:46 +03:00
Thomas Müller
45d07e39c1
Update framework & change logic slightly
2017-07-08 12:41:15 +03:00
Thomas Müller
178685292a
Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode
2017-07-08 12:25:08 +03:00
Thomas Müller
b6f90dada5
Merge branch 'master' into settingsoverlay-scrollto
2017-07-08 12:21:11 +03:00
Thomas Müller
6de9776e05
Update framework with tooltip changes
2017-07-07 08:59:17 +03:00
Jai Sharma
6eaeba5a92
Merge branch 'master' into remove-dragbar
2017-07-06 20:14:08 +01:00
Dean Herbert
724e5aa99e
Merge master into better-input
2017-07-05 13:59:40 -07:00
Dean Herbert
ecfaac4eac
Merge remote-tracking branch 'jai-sharma/master' into better-caching
2017-07-05 13:37:43 -07:00
Huo Yaoyuan
cadc191602
Merge branch 'master' into profile
2017-07-02 22:03:30 +08:00
Jorolf
5df33ad2d7
use Length instead of Count()
2017-07-02 13:33:42 +02:00
Jorolf
c9784f57d3
fix mod button samples
2017-07-02 13:16:22 +02:00
Thomas Müller
2d7eefa6fe
Update Cached usage according to framework
2017-07-02 13:00:02 +03:00
Thomas Müller
bbae6e2590
Remove unnecessary using
2017-06-30 10:02:07 +03: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
28f0da606a
Add OsuFocusedOverlayContainer with predefined sounds.
2017-06-28 10:18:12 -07:00
Thomas Müller
40225238d9
Set RelativeSizeAxes for updated FillMode behavior
2017-06-28 12:24:23 +03:00
Dean Herbert
480cdba023
Add OsuClickableContainer with generic sounds
2017-06-27 21:05:49 +09:00
Dean Herbert
b5cf022676
Add missing newline
2017-06-26 16:26:50 +09:00
Dean Herbert
3bb6005dc9
Merge remote-tracking branch 'upstream/master' into profile
2017-06-26 16:26:35 +09:00
MrTheMake
0e1b49dff9
Applied suggested changes
2017-06-25 20:56:22 +02:00
Huo Yaoyuan
0582eddcba
Slightly update text position.
2017-06-26 00:52:03 +08:00
Huo Yaoyuan
d6a7206041
Show rank chart with dummy data.
2017-06-26 00:43:49 +08:00
Dean Herbert
7baa2b7421
Fix CI issues
2017-06-25 14:46:59 +09:00
Huo Yaoyuan
be12f318e9
Allow showing offline data only in profile.
2017-06-25 10:40:45 +08:00
Huo Yaoyuan
d24f78ea24
Merge branch 'master' into profile
2017-06-25 10:29:14 +08:00
Huo Yaoyuan
18295a9b97
Handle scrolling in SectionsContainer.
2017-06-25 10:06:54 +08:00
MrTheMake
d914a1b00e
Added animation parameter
2017-06-24 13:47:34 +02:00
MrTheMake
ba783f984c
Change usage of ScrollIntoView to ScrollTo in the setttings overlay
2017-06-24 13:36:57 +02:00
Thomas Müller
1bca9ca0e9
Update framework with better children list
2017-06-24 12:56:35 +02:00
MrTheMake
cc71c10488
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-06-24 12:26:40 +02:00
Jai Sharma
e16b646014
Add readonly to fill
2017-06-24 09:14:55 +01:00
Jai Sharma
e073100498
Merge branch 'master' into remove-dragbar
2017-06-24 08:55:02 +01:00
Thomas Müller
e3489928b7
Remove now obsolete InternalContains
2017-06-24 09:21:08 +02:00
DrabWeb
b2c516238e
Cleanup.
2017-06-24 01:48:55 -03:00
DrabWeb
0133f9c086
Medal sprite, make MedalOverlay auto-show when loaded.
2017-06-24 01:19:44 -03:00
DrabWeb
c71f34c507
Make the background strip expand from the disc edges.
2017-06-23 23:51:28 -03:00
DrabWeb
3c97f04826
Particles.
2017-06-23 23:18:44 -03:00
DrabWeb
e09625e49d
Merge https://github.com/ppy/osu into medal-splash
2017-06-23 22:42:36 -03:00
DrabWeb
15cd4f77b2
Proper dismissing.
2017-06-23 22:35:06 -03:00
Jai Sharma
de50a1694f
Merge branch 'master' into remove-dragbar
2017-06-23 19:26:47 +01:00
Jai Sharma
a327f49d68
Updating progressBar.EndTime is more thread safe
2017-06-23 18:24:46 +01:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
Huo Yaoyuan
674e2a4395
Align placeholder.
2017-06-23 23:37:19 +08:00
Dean Herbert
b90c9bcacf
Merge branch 'master' into profile
2017-06-23 22:51:31 +09:00
Dean Herbert
81de1bd5a7
Merge branch 'master' into multiplayer-room-inspector
2017-06-23 21:55:18 +09:00
Dean Herbert
5dc0b87ef5
Apply some fixes for my own comments
2017-06-23 14:02:19 +09:00
Dean Herbert
eafd05e98f
Fade shadow effect in to avoid appearing too early in transition
2017-06-23 11:54:32 +09:00
Jai Sharma
62aae899fa
Fixed non-assigned MaxValue
2017-06-22 19:03:31 +01:00
Jai Sharma
73c004fb71
Removed DragBar from song progress
2017-06-22 17:42:29 +01:00
Jai Sharma
ce2242a979
Removed dragbar from MusicController
2017-06-22 16:32:50 +01:00
Huo Yaoyuan
8b8954b825
Add edge effect and adjust positioning.
2017-06-22 21:42:06 +08:00
Dean Herbert
4297c1a376
Use WaveOverlayContainer
2017-06-22 21:39:54 +09:00
Huo Yaoyuan
bb2e63e714
Avoid unverifiable capture.
2017-06-22 20:34:28 +08:00
Huo Yaoyuan
1d4add9079
Assign an explicit depth when reordering.
2017-06-22 20:26:06 +08:00
MrTheMake
3b2df5fa0f
Renaming and smaller optimizations
2017-06-21 16:46:30 +02:00
MrTheMake
8b07565025
Added test case usability, namings and bug fixes
2017-06-21 16:33:26 +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
Huo Yaoyuan
bcfb1392d7
Hide scroll bar.
2017-06-21 17:17:54 +08: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
70096b6c86
Bug fixes
2017-06-21 01:28:43 +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
MrTheMake
354f516779
Moved load condition and simplify list selection
2017-06-20 15:19:59 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
MrTheMake
03c13620c8
Filter the playlist overlay's beatmap list
2017-06-20 02:12:05 +02:00
MrTheMake
1b95991e40
Extended condition
2017-06-19 19:05:09 +02:00
MrTheMake
b4437329cc
Removed redundant variable
2017-06-19 18:34:56 +02:00
MrTheMake
b9cf0e47ee
CI fix
2017-06-19 18:12:26 +02:00
MrTheMake
667e6a2d6b
Applied suggested changes
2017-06-19 18:06:39 +02:00
MrTheMake
aec46a57c8
Restart the current track when pressing PREVIOUS or NEXT rather than doing nothing
2017-06-19 17:33:58 +02:00
MrTheMake
15a1dd14a6
CanChangeBeatmap -> CanBeatmapChange
2017-06-19 16:45:21 +02:00
MrTheMake
8bee06943b
Removed ununsed variables
2017-06-19 16:33:08 +02:00
MrTheMake
cb8b3cb8fb
CI fix
2017-06-19 16:31:45 +02:00
MrTheMake
73f2709a2d
Move logic into PlaylistOverlay
2017-06-19 16:30:58 +02:00
MrTheMake
9cc5dc6c2b
Only disallow changing the current track, not pausing or seeking it
2017-06-19 15:03:07 +02:00
MrTheMake
13df0e0b04
Fixed test case
2017-06-19 14:52:36 +02:00
MrTheMake
5450499415
Implement OsuScreen::CanBeatmapChange and use it in the music controller
2017-06-19 14:32:53 +02:00
Huo Yaoyuan
fe3cbb7072
Update join date definition.
2017-06-16 20:32:11 +08:00
Huo Yaoyuan
69270814d5
CI fixes.
2017-06-16 16:54:05 +08:00
Huo Yaoyuan
6372cd0a13
Move namespace under Overlays.
2017-06-16 16:36:23 +08:00
Huo Yaoyuan
af4ddf8fbd
Merge branch 'master' into profile.
2017-06-16 16:32:54 +08:00
Huo Yaoyuan
43569d69a7
Update transforms.
2017-06-16 16:13:23 +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
9a77332063
Order sections.
2017-06-15 23:47:56 +08:00
Huo Yaoyuan
3ec5d774df
Child control fixes.
2017-06-15 22:42:15 +08:00
Huo Yaoyuan
f03530cdd2
Fetch latest user data.
2017-06-15 22:33:08 +08:00
Huo Yaoyuan
53bd22cf9c
Update usage design.
2017-06-15 20:06:17 +08:00
Huo Yaoyuan
13d9f3b9bb
Move namespace and setup for DI.
2017-06-15 17:53:12 +08:00
Huo Yaoyuan
ce67a28609
Merge branch 'master' into profile.
2017-06-15 02:31:51 +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
Huo Yaoyuan
fcd137ced2
Add OsuTextFlowContainer.
2017-06-13 00:51:06 +08: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
d5dc37ec62
Merge branch 'master' into profile
2017-06-11 23:41:08 +08:00
Huo Yaoyuan
798d8711b8
Refactor SectionsContainer to generic.
2017-06-09 16:24:19 +08:00
Huo Yaoyuan
283b6b2b5e
Merge branch 'master' into profile
2017-06-09 13:45:32 +08:00
Dean Herbert
1b0e96f411
Fix some discrepancies when changing settings
2017-06-08 20:57:21 +09:00
Dean Herbert
83cdec3ee6
Merge remote-tracking branch 'upstream/master' into raw-input-osd
2017-06-08 20:41:04 +09:00
Dean Herbert
a454ca606f
Merge remote-tracking branch 'upstream/master' into johnneijzen-master
2017-06-08 20:33:39 +09:00
Dean Herbert
e3403c619c
Merge branch 'better-invalidations' into update-framework
2017-06-08 19:46:19 +09:00
DrabWeb
30fe7315ee
Small cleanup
2017-06-08 06:47:21 -03:00
DrabWeb
bb103d7878
Fix being able to commit with an empty query and clearing the results
2017-06-08 06:31:37 -03:00
DrabWeb
70e12e5d9b
Make the header tabs work
2017-06-08 06:21:45 -03:00
Dean Herbert
028364b2d9
Add on-screen display support for RawInput and CursorSensitivity
...
Also allows resetting both at once using Ctrl+Alt+R.
- Depends on https://github.com/ppy/osu-framework/pull/807
2017-06-08 17:58:57 +09:00
DrabWeb
1162df96be
Use DelayedLoadWrapper in DirectPanel backgrounds
2017-06-08 05:08:12 -03:00
Dean Herbert
64682a741c
Update framework
2017-06-08 17:05:25 +09:00
Tom94
5f7270ee4b
Use new invalidation rules
2017-06-08 09:53:45 +02:00
John Neijzen
2f7d9655fd
More Clean up
2017-06-08 15:27:35 +08:00
John Neijzen
d9a9616125
EOF remove blank spaces
2017-06-08 14:56:03 +08:00
John Neijzen
4abad17b92
Fix Black Space after } and Symbol Spacing
2017-06-08 14:48:42 +08:00
John Neijzen
431d225a60
Keyword Spacing and Brackets Fixing
2017-06-08 14:35:10 +08:00
Dean Herbert
bf45155ed5
Merge branch 'master' into master
2017-06-08 12:55:25 +09:00
DrabWeb
d541006134
Use 2x size covers in list view
2017-06-07 12:15:11 -03:00
DrabWeb
ddc4d45ae8
Unused usings
2017-06-07 11:39:04 -03:00
DrabWeb
add08e65ff
Result counts displaying
2017-06-07 11:30:52 -03:00
DrabWeb
a4be5c8a78
Fix being able to start typing something, change other filters, and have the search use the currently typing query
2017-06-07 11:13:12 -03:00
Huo Yaoyuan
e94d98fa84
Expose header background for SectionsContainer.
2017-06-07 22:11:38 +08:00
John Neijzen
aa3a231763
Review Changes
2017-06-07 22:00:14 +08:00
DrabWeb
312fd16631
Ruleset filtering
2017-06-07 11:00:05 -03:00
DrabWeb
f7f4f5e155
Request sorting, fix VS Code's "refactoring"
2017-06-07 10:40:18 -03:00
DrabWeb
3ed740676f
DirectSortCritera -> DirectSortCriteria
2017-06-07 10:19:17 -03:00
DrabWeb
0b204bd157
Add padding to the bottom of SearchableListOverlay's ScrollFlow
2017-06-07 10:11:10 -03:00
DrabWeb
8006fab3c7
Merge https://github.com/ppy/osu into osu-direct-search
2017-06-07 09:56:13 -03:00
DrabWeb
94b3320e58
Center direct panel covers
2017-06-07 09:45:12 -03:00
John Neijzen
23a7045eef
More Clean UP
2017-06-07 20:07:18 +08:00
Dean Herbert
59bed2b16e
Add missing spaces
2017-06-07 20:44:54 +09:00
Dean Herbert
8d434e88ee
Fix VisualTest not using placeholder data
2017-06-07 20:20:22 +09:00
Dean Herbert
97db4856fc
Add toolbar toggle button
...
Also ensure chat is hidden when social is displayed and vice-versa.
2017-06-07 20:15:58 +09:00
Dean Herbert
fc2d9816df
Make SearchableListHeader icon customisable
2017-06-07 20:06:02 +09:00
Dean Herbert
6a12173175
Add very temporary data source for social browser
2017-06-07 20:05:43 +09:00
Dean Herbert
1de296747f
Merge remote-tracking branch 'upstream/master' into social-browser
2017-06-07 17:38:06 +09:00
Dean Herbert
5f537780cf
Bring framework up-to-date
2017-06-07 15:32:50 +09:00
Thomas Müller
fac16bdebd
Do not release focus of the chat text box when sending a message
2017-06-05 18:07:28 +02:00
Dean Herbert
6b7e18a1e3
Fix not being able to change channels when channel select dialog is up
2017-06-05 23:12:39 +09:00
Dean Herbert
d9106c4e30
Temporarily disable inspection
2017-06-05 21:58:13 +09:00
Dean Herbert
57aad1311d
Merge branch 'master' into channel-selection
2017-06-05 21:46:28 +09:00
Dean Herbert
09e075e3fb
Allow adjusting mouse sensitivity at 0.01 increments
2017-06-05 20:22:39 +09:00
Dean Herbert
55d8b8b5f5
Merge branch 'master' into raw-input-sensitivity
2017-06-05 20:16:40 +09:00
Dean Herbert
bf971f6613
Merge branch 'master' into social-browser
2017-06-05 19:16:28 +09:00
Dean Herbert
16fcfc473d
Fix toggle not toggling on pressing escape
...
Also add comment about hacky implementation of toggle tab.
2017-06-05 18:04:40 +09:00
Dean Herbert
778865b6eb
Merge remote-tracking branch 'upstream/master' into channel-selection
2017-06-05 17:36:14 +09:00
Dean Herbert
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
Dean Herbert
ae7388e68f
Don't update sensitivity when dragging slider
2017-06-05 13:25:18 +09:00
Dean Herbert
ff0888449f
Disable ability to adjust sensitivity when raw input is disabled
2017-06-05 12:13:15 +09:00
Dean Herbert
c1e6438bec
Merge remote-tracking branch 'upstream/master' into raw-input-sensitivity
2017-06-05 11:42:26 +09:00
Dan Balasescu
6bda62f260
Merge branch 'master' into async-channel-load
2017-06-05 10:02:01 +09:00
Jorolf
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
Dean Herbert
edead2ad3a
Add settings for toggling raw input and adjusting sensitivity
2017-06-02 20:24:18 +09:00
DrabWeb
c13e807d82
Redundant parenthesis
2017-06-02 01:48:43 -03:00
DrabWeb
d81ff9cbc2
Add visual states for ChannelSelectorTabItem
2017-06-02 01:41:55 -03:00
DrabWeb
1fa70167c2
Fix channel list occasioanlly taking clicks when not open
2017-06-02 01:35:36 -03:00
DrabWeb
90dabe01f4
Fix the channel list appearing behind the tab bar
2017-06-02 01:00:09 -03:00
DrabWeb
fc6f8b9c0c
Merge https://github.com/ppy/osu into medal-splash
2017-06-01 21:19:11 -03:00
DrabWeb
62ada0afcb
Make the add tab item unselectable and toggle the channel list
2017-06-01 20:46:18 -03:00
DrabWeb
697fab9248
Reselect the chosen tab when closing the channel list
2017-06-01 20:22:09 -03:00
DrabWeb
24b3ec7787
Fix tab background not fading
2017-06-01 08:16:53 -03:00
DrabWeb
ecb0c2f68f
Cleanup ChannelListItem Joined binding
2017-06-01 07:55:01 -03:00
Dean Herbert
5b80c8ac49
Load initial channel content asynchronously
...
Quite often, the first time loading a chat channel will be loading font characters (textures) that were previously never displayed. This stops the game from stuttering in such a scenario.
2017-06-01 18:29:34 +09:00
DrabWeb
fad5b4ca9d
Speed up animations
2017-06-01 06:10:26 -03:00
DrabWeb
a707d63647
Fix visual errors if spamming close/open on channel list
2017-06-01 05:41:21 -03:00
DrabWeb
d728c87cca
Fix janky opening transition when resizing the chat and reopening the channel list
2017-06-01 05:26:01 -03:00
DrabWeb
c2d1a44de5
Fix channel selection not getting focus
2017-06-01 05:17:45 -03:00
DrabWeb
212b2c1142
Initial layout and animation
2017-06-01 04:45:46 -03:00
DrabWeb
32f98ca62b
Don't autohide the channel list if the chat is too tall
2017-05-31 22:42:53 -03:00
DrabWeb
52d524a65e
Update with framework changes
2017-05-31 22:39:03 -03:00
DrabWeb
e7bf1e02cb
Merge https://github.com/ppy/osu into channel-selection
2017-05-31 22:32:05 -03:00
DrabWeb
6176f1d275
Make the transition when chat is too tall and opening the channel selector smoother
2017-05-31 22:29:52 -03:00
DrabWeb
d970430174
Fix the channel selector not appearing if the chat is scaled up too tall then back down
2017-05-31 22:08:25 -03:00
DrabWeb
0439b15728
Generic type argument formatting
2017-05-31 21:29:50 -03:00
Patrick Andersson
1dd85b5986
Add alternative for random beatmap selection
...
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
DrabWeb
ec8a88c96a
Update with framework changes
2017-05-31 05:28:50 -03:00
DrabWeb
9942733b63
Trim whitespace
2017-05-31 05:22:54 -03: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
Dean Herbert
6a6f0913cd
Merge branch 'master' into social-browser
2017-05-30 20:51:50 +09:00
EVAST9919
e737ded382
Applied suggested changes
2017-05-30 12:23:53 +03:00
EVAST9919
963d6e9e8f
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-30 12:04:41 +03:00
DrabWeb
3aa1f35127
Basic layout
2017-05-30 05:12:11 -03:00
DrabWeb
a1453eb9e1
Fix filter text box input
2017-05-29 22:52:38 -03:00
DrabWeb
b6cb9d3229
Fix display style dropdown scaling the filter control
2017-05-29 22:39:59 -03:00
DrabWeb
2edbf64d69
Redundant parentheses
2017-05-29 22:22:14 -03:00
DrabWeb
96efa5a240
Hook up to channel selector tab item
2017-05-29 22:10:07 -03:00
DrabWeb
b9292b6240
Merge https://github.com/ppy/osu into channel-selection
2017-05-29 22:06:05 -03:00
DrabWeb
2ba86cffa6
Channel list item hover effect
2017-05-29 22:04:53 -03:00
DrabWeb
d8e86da78c
Better scroll dragger position
2017-05-29 22:00:15 -03:00
Dean Herbert
e91a3f06f1
Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item
2017-05-30 09:54:35 +09:00
Dean Herbert
fde579262f
User a simpler method to hide the background icon
2017-05-30 09:54:29 +09:00
DrabWeb
d29bf58817
Show scroll dragger
2017-05-29 21:50:15 -03:00
DrabWeb
745e2e5e18
Make the channel selection overlay hide/resize with chat
2017-05-29 21:23:03 -03:00
DrabWeb
50e50ce67e
Update with framework changes
2017-05-29 20:33:28 -03:00
DrabWeb
21a8071293
Merge https://github.com/ppy/osu into channel-selection
2017-05-29 20:31:35 -03:00
EVAST9919
261f1f4e1f
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-29 18:13:44 +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
Dan Balasescu
e4b876ff5b
Update ModButton.cs
2017-05-29 18:10:02 +09:00
Dean Herbert
7960b5cf26
More refactoring
...
Also allows rotation when reaching the end of the available mods.
2017-05-29 18:03:40 +09:00
Dean Herbert
5e473c6c96
Merge remote-tracking branch 'upstream/master' into better-multimod-animation
2017-05-29 17:21:49 +09:00
Dean Herbert
31cc6917bc
Tidy up code, improve transition, add directionality
2017-05-29 17:20:55 +09:00
Dean Herbert
7b52c4621d
Merge branch 'master' into musiccontroller-init-fix
2017-05-29 10:28:56 +09:00
DrabWeb
8994c57f3c
Update with framework changes
2017-05-28 15:14:22 -03:00
Seth
0e087994a1
Merge branch 'master' into social-browser
2017-05-28 15:11:00 -03:00
jorolf
9a4abcc199
Merge branch 'master' into better-multimod-animation
2017-05-28 14:39:04 +02:00
Thomas Müller
bb14708165
Merge branch 'master' into fix-chat-overlay-drift
2017-05-28 14:38:39 +02:00
Dean Herbert
bc47dedf27
Add non-null assertion
2017-05-28 21:34:15 +09:00
Dean Herbert
3644198c6e
Fix CI issues
2017-05-28 21:20:11 +09:00
Dean Herbert
ed8b34d5ed
Fix drift when dragging chat beyond bounds
2017-05-28 21:11:46 +09: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
DrabWeb
95cfce2950
Rank status filtering
2017-05-28 02:43:37 -03:00
DrabWeb
8745948a01
Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class
2017-05-28 02:26:25 -03:00
DrabWeb
ab32e962ca
Make BeatmapOnlineInfo and BeatmapSetOnlineInfo separate classes, -OnlineWorkingBeatmap
2017-05-28 00:37:55 -03:00
DrabWeb
816caf86ea
Better exception for SearchableListFilterControl's generic type argument not being an enum
2017-05-27 18:49:55 -03:00
DrabWeb
239472c451
Lowercase hex colours
2017-05-27 18:35:46 -03:00
DrabWeb
b88c07f1a0
Make channel readonly
2017-05-27 17:49:57 -03:00
DrabWeb
754fe956f9
Make ChannelSection headers uppercase in the setter
2017-05-27 17:40:20 -03:00
DrabWeb
b632e7f1ad
Accept Channel in ctor and remove Channel property
2017-05-27 17:35:42 -03:00
Jorolf
e86ccf61b3
use recursion
2017-05-27 10:11:59 +02:00
EVAST9919
bedcf04043
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-27 02:25:03 +03:00
Jorolf
db1dde72de
change constant names
2017-05-26 16:29:15 +02:00
Jorolf
64612ef34b
add multimod animation
2017-05-26 16:10:28 +02:00
jorolf
f6f1ea42ee
Merge branch 'master' into channel-selector-tab-item
2017-05-26 13:18:50 +02:00
Jorolf
1e4bca90f0
remove duplicate code
2017-05-26 12:10:16 +02:00
DrabWeb
c0999c7fc1
Unused using directives
2017-05-26 06:12:22 -03:00
DrabWeb
12f6276e05
Move DisplayStyleControl to all FilterControls
2017-05-26 06:05:05 -03:00
DrabWeb
38d0138978
CI fixes
2017-05-26 04:11:45 -03:00
DrabWeb
ae96ef08f7
Tab character
2017-05-26 04:02:04 -03:00
DrabWeb
4c551270e9
Add OnRequestLeave
2017-05-26 03:56:10 -03:00
DrabWeb
d632435a34
Make ChannelListItems scale better
2017-05-26 03:51:09 -03:00
DrabWeb
21e900df73
Transition code cleanup
2017-05-26 03:46:50 -03:00
DrabWeb
d29ebb139f
Cleanup
2017-05-26 03:38:52 -03:00
DrabWeb
64016f9466
Merge https://github.com/ppy/osu into channel-selection
2017-05-26 03:24:41 -03:00
DrabWeb
5785715ad5
CI fixes
2017-05-26 03:10:36 -03:00
DrabWeb
28ee00109d
Wave colours
2017-05-26 02:55:25 -03:00
DrabWeb
8359f6ced0
Incorrect colour
2017-05-26 02:49:04 -03:00
DrabWeb
68377494f7
Browser - SearchableList
2017-05-26 02:44:09 -03:00
DrabWeb
5831da6978
Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls
2017-05-26 02:32:01 -03:00
DrabWeb
fc67582c3f
Cleanup
2017-05-26 02:16:56 -03:00
DrabWeb
e19a4f5e6f
Add displaying users
2017-05-26 02:00:38 -03:00
DrabWeb
5c0d0cb7e7
Alpha on wrong object
2017-05-26 01:34:30 -03:00
DrabWeb
2d3995b85c
Fix filter controls having margin when no controls given, add DisplayStyleControl to social, misc cleanups
2017-05-26 01:32:20 -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
Dean Herbert
8ae7e84563
Merge branch 'master' into musiccontroller-init-fix
2017-05-26 10:48:32 +09:00
Jorolf
a9658ec66f
update colour, width, icon and text
2017-05-25 20:25:59 +02:00
MrTheMake
9de7e7bc40
Fixes
2017-05-25 17:49:47 +02:00
Dean Herbert
9eec2edd30
Fix initial login state not being reflected in user panel
2017-05-25 22:43:33 +09:00
MrTheMake
c32d816f9c
Removed new line
2017-05-25 14:19:04 +02:00
MrTheMake
9ea70b849b
Fix initialize beatmap change animation of the music controller
2017-05-25 14:16:51 +02:00
Dean Herbert
1a255fdf48
Fix display order regression
2017-05-25 19:47:18 +09:00
Dean Herbert
be81346573
Attempt to fix inner scope warning
2017-05-25 14:47:25 +09:00
DrabWeb
e22eb1f205
CI fixes
2017-05-24 22:39:07 -03:00
DrabWeb
ec3c92fc3c
Trim whitespace
2017-05-24 22:26:48 -03:00
DrabWeb
9cad344401
Revert back header for login form, fix incorrect spacing on header
2017-05-24 22:02:32 -03:00
DrabWeb
8e09b738b0
Remove magic numbers
2017-05-24 21:51:00 -03:00
DrabWeb
9b863f60ab
Adjust dropdown layout
2017-05-24 21:32:46 -03:00
DrabWeb
efd4c57431
Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem
2017-05-24 21:09:18 -03:00
DrabWeb
b57a3f2056
Initial layout of user panel and user dropdown
2017-05-24 19:44:48 -03:00
Dean Herbert
3134f92051
Merge branch 'master' into user-panel
2017-05-24 16:32:09 +09:00
DrabWeb
a25c504965
CI fixes
2017-05-24 03:08:48 -03:00
DrabWeb
72c9959215
resultCounts -> ResultAmounts
2017-05-24 02:40:34 -03:00
DrabWeb
ba2627d4e2
Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
2017-05-24 02:40:00 -03:00
DrabWeb
e59c1879a2
Remove tabs
2017-05-24 02:38:55 -03:00
DrabWeb
4490596f5f
Keep one object per file
2017-05-24 02:37:27 -03:00
DrabWeb
b08668b6d9
Remove @ from to-be-localized strings
2017-05-24 02:19:45 -03:00
Dean Herbert
5e01940770
Compare with private field
2017-05-24 13:43:10 +09:00
DrabWeb
2be1b00a76
Hide status bar when Status is null
2017-05-24 00:45:56 -03:00
DrabWeb
247d8e9b21
Replace "Connected as _" in login form with a UserPanel
2017-05-24 00:23:48 -03:00
Dean Herbert
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
DrabWeb
be1ae2bd8e
Remove ??, value can never be null
2017-05-23 15:08:02 -03:00
DrabWeb
7a4b476121
Tab character
2017-05-23 14:46:23 -03:00
DrabWeb
aa9a636c3c
Indentation
2017-05-23 14:42:57 -03:00
DrabWeb
7b9eacc213
CI fixes
2017-05-23 14:41:30 -03:00
DrabWeb
fbbcc80a3e
Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
2017-05-23 14:34:58 -03:00
DrabWeb
4f17a4fe91
Make result counts scroll with the panels
2017-05-23 14:34:34 -03:00
Jorolf
af9b02746a
make fields readonly
2017-05-23 18:19:01 +02:00
Jorolf
7ad10009e6
Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item
2017-05-23 17:32:48 +02:00
EVAST9919
2ca0794b37
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-23 14:45:38 +03:00
EVAST9919
564abc1a5b
using autosize instead of constant height
2017-05-23 14:32:45 +03:00
EVAST9919
165d6ef1bb
Make transition a bit smoother
2017-05-23 12:30:39 +03:00
EVAST9919
c7a241246e
Better letterbox settings transition
2017-05-23 12:09:32 +03:00
Dean Herbert
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
DrabWeb
62897d302e
Remove SettingsButton(old and outdated design), fix channel list scrolling under the header
2017-05-22 22:37:25 -03:00
Dean Herbert
5c5a18833a
Merge branch 'master' into channel-selector-tab-item
2017-05-22 20:22:57 +09:00
Huo Yaoyuan
63259a3457
Fix depth of header background.
...
Thanks to the order of adding to parent container, the depth value is actually not needed.
2017-05-22 16:00:03 +08:00
DrabWeb
bdab545ca4
Use BeatmapBackgroundSprite
2017-05-22 03:15:22 -03:00
DrabWeb
77affc1eb7
Split onto multiple lines
2017-05-22 03:13:55 -03:00
EVAST9919
50e3feb761
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-22 09:12:40 +03:00
DrabWeb
3c35badf06
Unused using
2017-05-22 02:03:53 -03:00
DrabWeb
6bf0ca59fe
Make FilterControl not scroll with the panels
2017-05-22 02:03:26 -03:00
Huo Yaoyuan
d0ff9e6576
Merge branch 'master' into sections
2017-05-22 12:52:27 +08:00
Dean Herbert
93182e5da3
Merge branch 'master' into generic-interface
2017-05-22 09:52:40 +09:00
DrabWeb
4e2126dca8
Fix nullref when changing display mode without any BeatmapSets added
2017-05-21 18:54:35 -03:00
DrabWeb
eb77c94150
Fix search field losing focus
2017-05-21 15:30:10 -03:00
EVAST9919
8c1437c51a
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-21 13:44:52 +03:00
DrabWeb
51bc3dfe72
Padding below channel list, remove text shadows, fix search box focusing
2017-05-20 21:38:36 -03:00
DrabWeb
a60d1efc21
Basic channel joining (ignore layout in ChatOverlay, temporary)
2017-05-20 21:26:39 -03:00
DrabWeb
4a166c1949
Make ChannelSelectionOverlay a FocusedOverlayContainer
2017-05-20 20:48:36 -03:00
DrabWeb
2e1d01a268
Added searching
2017-05-20 20:22:55 -03:00
DrabWeb
47dfc0d7bc
Added transition
2017-05-20 20:05:28 -03:00
DrabWeb
7eba619f80
Move Joined to Channel
2017-05-20 19:37:11 -03:00
DrabWeb
3cc51006cc
Add settings button, background triangles, proper displaying of Channels
2017-05-20 19:30:40 -03:00
DrabWeb
6a8d745db1
Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned
2017-05-20 18:29:57 -03:00
DrabWeb
31890a1e01
Initial layout, channels items
2017-05-20 18:06:25 -03:00
Huo Yaoyuan
4a55666e03
Merge branch 'master' into sections
2017-05-21 04:43:39 +08:00
Huo Yaoyuan
f06f8b4dcd
Make sidebar buttons working.
2017-05-21 04:33:05 +08:00
Huo Yaoyuan
aa409ac1a9
Move SearchTextBox out of SettingsHeader.
2017-05-21 04:12:16 +08:00
Huo Yaoyuan
35712514a4
Update settings UI using SectionsContainer basically.
2017-05-21 03:50:04 +08:00
DrabWeb
87ace2d7ec
@"" -> string.Empty
2017-05-20 13:52:51 -03:00
DrabWeb
49eb096b03
Fix visual test mode toggle buttons activation state
2017-05-20 13:19:50 -03:00
Dean Herbert
0b987be600
Merge branch 'master' into osu-direct
2017-05-20 16:17:59 +09:00
Dean Herbert
fb72693c96
Merge branch 'master' into playlist-item-paragraph
2017-05-20 15:47:54 +09:00
DrabWeb
995a573b9c
@"" -> string.Empty
2017-05-20 03:22:37 -03:00
DrabWeb
7485a78128
Update framework
2017-05-20 03:14:22 -03:00
DrabWeb
139b03a1ce
Only recreate text once per unicode option change
2017-05-20 02:05:13 -03:00
DrabWeb
43bd0f686b
Fix artist being the opposite value
2017-05-20 01:25:42 -03:00
DrabWeb
48417beb81
Unused using directive
2017-05-20 01:22:33 -03:00
DrabWeb
615082d757
Remove whitespace
2017-05-20 01:17:04 -03:00
DrabWeb
dcc3dbf5e2
Make PlaylistItem use Paragraphs
2017-05-20 01:11:20 -03:00
DrabWeb
bfedd42ca4
Add mod tooltips
2017-05-19 23:56:48 -03:00
DrabWeb
e030573436
Add ReverseDepthFillFlowContainer to remove code duplication
2017-05-19 23:44:36 -03:00
DrabWeb
68cb23786a
Fade in background when loaded
2017-05-19 20:53:51 -03:00
DrabWeb
6e7a09fedb
Line endings, use ToString for statistic value
2017-05-19 20:37:13 -03:00
DrabWeb
ffb3450dc2
Remove <U+FEFF> character
2017-05-19 20:34:51 -03:00
DrabWeb
503ee97a15
Fix license header
2017-05-19 20:28:37 -03:00
DrabWeb
cdd2b54dc7
Move SlimEnumDropdown into it's own file
2017-05-19 20:25:08 -03:00
DrabWeb
e7a64126a3
Formatting and remove magic number
2017-05-19 20:13:59 -03:00
DrabWeb
83c81c0626
Cleanup (again)
2017-05-19 20:03:07 -03:00
DrabWeb
c981a4a511
Formatting
2017-05-19 19:50:45 -03:00
DrabWeb
0a96aaf575
Whitespace
2017-05-19 19:27:51 -03:00
DrabWeb
0a90965a5b
CI formatting
2017-05-19 19:22:42 -03:00
DrabWeb
c2ea2bb5b0
Proper search tab changing logic
2017-05-19 19:13:07 -03:00
DrabWeb
57115f453e
Remove todo comment
2017-05-19 19:03:45 -03:00
DrabWeb
6cc7602db1
Added download button animations
2017-05-19 19:02:53 -03:00
DrabWeb
649fc8362b
Fix ranked status dropdown expanding below the panels
2017-05-19 18:54:47 -03:00
DrabWeb
2f10b72cb2
Proper dropdown expansion, DisplayModeToggleButton -> DisplayStyleToggleButton
2017-05-19 18:32:04 -03:00
DrabWeb
05b8fc5126
Added switching between grid/list and little transitions for the panels
2017-05-19 17:52:34 -03:00
DrabWeb
1d61fc84c7
Remove duplicate code in SettingsEnumDropdown
2017-05-19 17:04:59 -03:00
DrabWeb
1bd13a8361
Indentation
2017-05-19 16:22:54 -03:00
DrabWeb
74ed4cf0e3
More cleanup
2017-05-19 16:19:23 -03:00
DrabWeb
6eac19e76b
Move constructor above methods in DirectPanel
2017-05-19 16:12:47 -03:00
DrabWeb
c3d753a585
DifficultyIcons -> GetDifficultyIcons()
2017-05-19 16:11:45 -03:00
DrabWeb
a86d07cac7
Remove enclosing background container
2017-05-19 16:07:05 -03:00
DrabWeb
e1c4c36122
+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds
2017-05-19 15:43:18 -03:00
EVAST9919
9f803de9d5
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-19 19:49:48 +03:00
Dean Herbert
a34d9d8b09
Oops
2017-05-20 01:14:51 +09:00
DrabWeb
3b8cadd4df
Clean up DirectPanel and it's subclasses
2017-05-19 12:52:23 -03:00
Dean Herbert
9c9c0a64fd
Merge branch 'master' into debug-config-rename
2017-05-20 00:45:16 +09:00
Dan Balasescu
7e8ffe8f34
Merge branch 'master' into osd-fixes
2017-05-20 00:12:10 +09:00
Dean Herbert
528d79be51
FrameworkDebugConfig -> DebugSetting
2017-05-19 22:53:26 +09:00
Dean Herbert
0332348b24
Correctly display default audio device on OSD
2017-05-19 22:51:09 +09:00
Dean Herbert
5bcef91b89
Add padding to setting value on on screen display
...
Long audio device names were destroying all padding.
2017-05-19 22:49:47 +09:00
Dean Herbert
04f7acb68a
Add setting checkbox to toggle debug logs
2017-05-19 22:47:15 +09:00
Jorolf
94484974f9
use AddTabItem instead + Bindable for ChannelSelectorTabItem
2017-05-19 11:59:23 +02:00
DrabWeb
a5fa7e1a7d
Result counts displaying
2017-05-18 17:43:39 -03:00
DrabWeb
1d1375c4d4
Remove commented line
2017-05-18 17:13:53 -03:00
DrabWeb
ca6826f3ba
Fix incorrect height between sort tabs and ruleset toggle buttons
2017-05-18 17:12:57 -03:00
DrabWeb
c8102db780
Fix visual test crash
2017-05-18 16:54:50 -03:00
DrabWeb
065f4faa70
Fix ruleset toggle buttons not updating when changing from the toolbar
2017-05-18 16:34:34 -03:00
DrabWeb
0b480fe327
ModeToggleButton -> RulesetToggleButton
2017-05-18 16:17:16 -03:00
DrabWeb
c2880676db
Added displaying sets
2017-05-18 16:15:49 -03:00
DrabWeb
c3fb1ab7c6
Mapper -> Author, use BeatmapSetInfo for metadata
2017-05-18 15:01:01 -03:00
DrabWeb
ab1401054d
Added result counts (visually)
2017-05-18 14:08:14 -03:00
DrabWeb
9f36a39c59
More cleanup
2017-05-18 13:57:19 -03:00
Jorolf
0e3fb55d5e
usage of constant and formatting
2017-05-18 17:02:11 +02:00
DrabWeb
b26c8dd1c7
Added temporary difficulties on the panels
2017-05-17 18:42:40 -03:00
DrabWeb
b3ef8b8fd4
Design updates
2017-05-17 18:10:29 -03:00
DrabWeb
cabfe72c92
Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel
2017-05-17 18:02:33 -03:00
Huo Yaoyuan
ffbab6bfeb
Tidy up DrawableChannel.
2017-05-18 04:08:47 +08:00
DrabWeb
5fb445e3fe
Basic direct panel, minor cleanups
2017-05-17 16:37:34 -03:00
Jorolf
67806c4247
add tab item
2017-05-17 21:16:53 +02:00
Huo Yaoyuan
23e2d3ef07
Use GroupBy in ChatOverlay.
2017-05-18 02:40:36 +08:00
Huo Yaoyuan
b5d7211cd6
Expire placeholder text.
2017-05-18 02:40:29 +08:00
EVAST9919
a21343da23
CI fixes
2017-05-17 17:14:09 +03:00
EVAST9919
eec813ad65
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-17 17:14:00 +03:00
Dean Herbert
d606b5b3a7
Fix CI warning
2017-05-17 22:13:56 +09:00
EVAST9919
e785f1ddf1
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-17 16:12:38 +03:00
EVAST9919
fd2150aa49
Moved collectionsDropdown to it's own class
2017-05-17 15:32:16 +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
Dean Herbert
231f7939a6
Fix channels being unnecessarily recycled on disconnect
...
Resolves #768
2017-05-17 12:42:02 +09: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
Dan Balasescu
be3953aeb2
Merge branch 'master' into general-fixes
2017-05-16 20:52:38 +09:00
Dean Herbert
fdf0137fc2
Remove incorrect padding
2017-05-16 19:58:34 +09:00
Dean Herbert
23807aa3b9
Better handling of logged in state
2017-05-16 19:55:45 +09:00
Dean Herbert
0c7ceea4fd
Merge branch 'master' into on-screen-display
2017-05-16 18:54:54 +09:00
Dean Herbert
71b14bb8af
Merge branch 'master' into fix-duplicate-channels
2017-05-16 18:50:21 +09:00
Dean Herbert
712bd21e25
Fix duplicate channels being created on connection loss
...
Resolves #763
2017-05-16 18:28:42 +09:00
Dean Herbert
3673e4af1f
Fade bold state of chat tabs better
2017-05-16 18:00:29 +09:00
Dean Herbert
0feaa407f2
Merge branch 'margin-padding-namespace' into on-screen-display
2017-05-16 16:40:06 +09:00
Dean Herbert
89e2a39d14
Merge remote-tracking branch 'upstream/master' into margin-padding-namespace
2017-05-16 16:36:34 +09:00
Dan Balasescu
91de72e161
Merge branch 'master' into on-screen-display
2017-05-16 16:27:19 +09:00
Dean Herbert
f0ea445e46
Fix initial requests of channel mesages not being performed
...
fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
2017-05-16 15:59:01 +09:00
Dan Balasescu
2ad9aa2ae5
Merge branch 'master' into chat-error-messages
2017-05-16 15:12:59 +09:00
Dean Herbert
5e5ad9a899
Add basic on-screen display
2017-05-16 15:03:03 +09:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
Dean Herbert
3b1d5ce7df
CI fix
2017-05-15 13:31:51 +09:00
Dean Herbert
dcd4b4450d
Add error message in chat when attempting to use commands
2017-05-15 13:26:35 +09:00
Dean Herbert
1f3039926f
Reword settings text slightly
2017-05-15 12:57:55 +09:00
Dean Herbert
3b87a938db
Merge branch 'master' into cursor_size.
2017-05-15 12:23:49 +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
EVAST9919
ca6df533bd
Automatic gameplay cursor size
2017-05-13 03:46:37 +03:00
Dean Herbert
fd9218b6d5
Use FirstOrDefault
2017-05-12 20:48:25 +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
6c117f15af
Remove unnecessary usings
2017-05-12 20:06:38 +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
bc5bcfa66a
Make tab background opaque when chat is fullscreen
2017-05-12 19:15:04 +09:00
Dean Herbert
dbf60d24bf
Second design update pass.
2017-05-12 15:39:00 +09:00
Dean Herbert
6ea65009c4
Initial design update pass
2017-05-12 15:38:55 +09:00
Dean Herbert
c4a93cbc85
Move drawable chat related classes to better namespace
2017-05-12 15:38:51 +09:00
Dean Herbert
9cf4998701
Make chat resizable via drag, save user set size
2017-05-12 15:36:37 +09:00
Dean Herbert
f248efb01f
CI Fixes
2017-05-12 13:25:50 +09:00
Dean Herbert
ffa59c6cb3
Support read-only channels, post to correct channel.
...
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
Dean Herbert
a77049213d
Add basic hard-coded inefficient multi-channel support.
2017-05-11 23:10:48 +09:00
Dean Herbert
ca32caf9e4
Merge branch 'master' into new-option-search
2017-05-11 21:04:37 +09:00
Dean Herbert
b258109a9e
Fix chat input box not always keeping focus as expected
2017-05-11 19:38:36 +09:00
Dean Herbert
ec67b617ae
Add OptionsHeader class
...
Makes search textbox anchor correctly. Also improves visual styling.
2017-05-11 16:06:18 +09:00
Dean Herbert
df48204403
Fix OptionsOverlay stealing focus itself.
2017-05-11 13:56:21 +09:00
Dean Herbert
7d8af5f1da
Use SearchTextBox
...
Correctly handle focus.
2017-05-11 13:23:31 +09:00
Dean Herbert
6c5490e31c
Merge remote-tracking branch 'upstream/master' into new-option-search
2017-05-11 12:59:19 +09:00
Dean Herbert
70ef503403
Merge branch 'master' into metadata
2017-05-11 12:23:00 +09:00
Dean Herbert
262b42efe3
Merge branch 'master' into new-option-search
2017-05-11 12:20:58 +09:00
Dean Herbert
ab1768ef80
Merge branch 'master' into tidy-up
2017-05-09 10:27:29 +09:00
Jorolf
9aaac4ab0c
Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search
2017-05-08 18:30:33 +02:00
Jorolf
86f0173c6b
fix license header
2017-05-08 18:30:00 +02:00
jorolf
3abf1b2a0b
Merge branch 'master' into new-option-search
2017-05-08 17:25:47 +02:00
Huo Yaoyuan
ced2332d20
Handle overlay in ToolbarOverlayToggleButton.
2017-05-08 19:37:41 +08:00
Huo Yaoyuan
dff05bec79
Use readonly fields.
2017-05-08 18:56:04 +08:00
Dean Herbert
2f4fad9d41
Refactor colour selection.
2017-05-08 11:33:22 +09:00
Dean Herbert
df4a737c9b
Merge remote-tracking branch 'ppy/master' into hud-mod-display
2017-05-08 10:56:34 +09:00
Dean Herbert
5131371c93
Merge branch 'master' into new-option-search
2017-05-08 10:49:49 +09:00
DrabWeb
de8428c95b
Make requested changes
2017-05-07 22:23:33 -03:00
Dan Balasescu
fbf05f12fc
Use controlWithCurrent as per comment.
2017-05-08 10:11:45 +09:00
Jorolf
3c4faae554
add search box and the ability to search
2017-05-07 20:35:57 +02:00
Huo Yaoyuan
146d57953d
Use metadata field of WorkingBeatmap.
2017-05-06 14:57:11 +08:00
DrabWeb
81d67cbe06
Play first visible set in playlist when commiting in the search field.
2017-05-05 01:59:24 -03:00
Dean Herbert
6298b3effd
Refactor ModSection and ModIcon to avoid null mods.
2017-05-05 12:16:41 +09:00
Dean Herbert
98b3b82c07
Apply CI fixes.
2017-05-04 23:32:27 +09:00
Dean Herbert
153951d3dd
Add OptionItem class
...
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
EVAST9919
26985dbc62
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
2017-05-03 16:22:40 +03:00
Dean Herbert
19f6d58723
Merge remote-tracking branch 'upstream/master' into options-implementation
2017-05-03 21:54:27 +09:00
Dean Herbert
330dd458bd
Trim whitespace.
2017-05-03 20:49:52 +09:00
Dean Herbert
489f586887
Add FPS display toggling.
...
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
EVAST9919
5f2f1d2763
CI fixes
2017-05-03 14:01:43 +03:00
EVAST9919
e7a8619f01
ModIcon refactor
2017-05-03 09:48:10 +03:00
Dean Herbert
691742b828
Remove most options which have not yet been implemented.
2017-05-02 19:40:30 +09:00
Dean Herbert
f9de733128
Formatting.
2017-05-02 18:53:33 +09:00
Dean Herbert
d4045ee2c0
We only have one release stream, so let's unlock it.
2017-05-02 18:40:30 +09:00
Dean Herbert
57c2dd1f49
Fix options dropdown labels never being displayed.
2017-05-02 18:35:23 +09:00
Dean Herbert
1b0f353af3
Add support for framework-level mouse confining.
2017-05-02 17:45:42 +09:00
Dean Herbert
bef15fe637
Improve organisation of some options and config code.
2017-05-02 17:45:22 +09:00
Dean Herbert
116e92a542
Remove silly platform specific logic.
2017-05-02 17:00:30 +09:00
Dean Herbert
46ae8bc86b
Use value because we need to.
2017-05-02 16:49:27 +09:00
Dean Herbert
f1d0b77d10
Base the music controller transform direction on relative indices in playlist.
2017-05-02 16:40:29 +09:00
Dean Herbert
beb98c14b6
Fix layout not being invalidated when re-filtering playlist display.
2017-05-02 16:26:11 +09:00
Dean Herbert
6074cb5979
Make playlist filtering work.
...
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
Dean Herbert
737ad78056
Set a sane default transform direction.
2017-05-01 20:10:19 +09:00
Dean Herbert
2437c416b1
Use less usings.
2017-05-01 19:56:01 +09:00
Dean Herbert
3943e4ae95
Fix comma.
2017-05-01 19:32:31 +09:00
Dean Herbert
c59589eba7
Only retrieve colour once.
2017-05-01 19:32:00 +09:00
Dean Herbert
0f4ef16910
Remove custom word splitting logic, add localisation support.
2017-05-01 17:14:59 +09:00
Dean Herbert
2cfb83436d
Add placeholder logic for filtering.
2017-05-01 15:27:41 +09:00
Dean Herbert
a1f341a64f
Fix textbox focus issues (and inability to use escape).
2017-05-01 15:23:01 +09:00
Dean Herbert
c1d0aea217
Refactoring part 5.
2017-05-01 15:09:14 +09:00
Dean Herbert
580cf93147
Refactoring part 4.
2017-05-01 15:03:11 +09:00
Dean Herbert
97a7f16ab7
Refactoring part 3.
2017-05-01 13:41:22 +09:00
Dean Herbert
7c2e193db1
Refactoring part 2.
2017-05-01 13:25:32 +09:00
Dean Herbert
37944bb04e
Initial refactoring.
2017-05-01 13:01:08 +09:00
DrabWeb
9bdf462dd1
Possible null reference exception
2017-04-29 06:36:06 -03:00
DrabWeb
067b572245
Formatting
2017-04-29 06:28:57 -03:00
DrabWeb
ef811f3cf3
More formatting
2017-04-29 06:17:50 -03:00
DrabWeb
3f73799975
Formatting
2017-04-29 06:10:12 -03:00
DrabWeb
c193a90a16
Merge https://github.com/ppy/osu into playlist
2017-04-29 05:39:52 -03:00
Huo Yaoyuan
061c3cacbd
CI fixes.
2017-04-26 20:04:32 +08:00
Huo Yaoyuan
4cb18361c1
Use localisation engine for unicode text.
2017-04-26 19:50:38 +08:00
Huo Yaoyuan
cf3e83ca62
Save ShowUnicode in framework config.
2017-04-26 19:48:46 +08:00
Dean Herbert
30e2e7bfe4
Merge branch 'master' into slider-stuff
2017-04-25 19:42:46 +09:00
Jorolf
a6ea6738e5
add some spaces after commas
2017-04-24 17:10:00 +02:00
Jorolf
7ef90e6597
Merge branch 'master' of git://github.com/ppy/osu into slider-stuff
2017-04-24 17:05:32 +02:00
Dean Herbert
3c98170330
Use method group for MusicController fault.
2017-04-24 20:22:21 +09:00
ColdVolcano
6a05440e6c
Only schedule when faulted
2017-04-23 00:53:21 -05:00
ColdVolcano
1d254f4a56
Take MusicController back to life
2017-04-23 00:13:58 -05:00
Jorolf
60bb45358c
remove more casts and usings
2017-04-22 18:36:37 +02:00
Jorolf
b151c71c0e
remove casts
2017-04-22 18:36:36 +02: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
Jorolf
1d2f19b5a2
change background dim from integer to double
2017-04-22 18:34:03 +02:00
smoogipooo
2d91400239
Fix nullref due to framework change.
2017-04-22 16:56:17 +09:00
Dean Herbert
d94035e9da
Merge branch 'master' into general-fixes
2017-04-21 20:42:46 +09:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset).
2017-04-21 16:20:05 +09:00
Dean Herbert
25a7d99a8e
Remove unused reference.
2017-04-21 16:11:24 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
...
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
ef7bc0f92e
Update UI controls to understand DisabledChanged.
2017-04-21 14:02:04 +09:00
Dean Herbert
093abd6872
Add chat toggle button.
2017-04-19 19:54:03 +09:00
Dean Herbert
c7246fd2ac
Reorganise ChatOverlay to not suck.
2017-04-19 19:15:21 +09:00
Dean Herbert
dda3fb85ee
Add user colour support.
2017-04-19 19:07:38 +09:00
Dean Herbert
3129708ccb
Add chat sending support.
2017-04-19 18:46:52 +09:00
Dean Herbert
87f6dc9e5a
Change default channel to #lazer.
2017-04-19 18:46:50 +09:00
Dean Herbert
325af333b9
Update API responses for chat.
2017-04-19 18:46:48 +09:00
Dean Herbert
64a8992153
Merge branch 'master' into general-fixes
2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
Dean Herbert
727086c0b2
Updates in-line with framework.
2017-04-18 15:34:53 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases.
2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
smoogipooo
4a149c4ab8
Better default values + don't set Mode from outside.
2017-04-15 06:14:31 +09:00
smoogipooo
0333e1a050
Remove unused usings.
2017-04-15 05:57:18 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
smoogipooo
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
Dean Herbert
98544a8077
Fix unsynchronised tweening.
2017-04-14 19:20:07 +09:00
Dean Herbert
8c41707ac7
Fix incorrect default state. Handle input better.
2017-04-14 14:40:52 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
Poliwrath
dffdb100ab
Small fix to the chat overlay to prevent crashing on the test
2017-04-11 21:35:49 -04:00
Dean Herbert
9732110bd9
Update TransformTo methods in line with framework changes.
2017-04-11 17:25:56 +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
b7cfdff8d1
Update SliderBar to use IHasCurrentValue.
2017-04-10 15:30:17 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes.
2017-04-10 14:54:23 +09:00
DrabWeb
fc7eef091f
current_colour -> currentColour, fix masked away playlist items not fading colours
2017-04-09 09:08:11 -03:00
DrabWeb
70756a069e
Unused usings
2017-04-09 07:52:26 -03:00
DrabWeb
241895c85b
Proper playlist item text wrapping
2017-04-09 07:36:41 -03:00
DrabWeb
67f1167172
Comments, play first song if current is nil and user presses play
2017-04-09 07:04:41 -03:00
DrabWeb
7f2feab9e7
Proper search field focusing and exit on escape
2017-04-09 06:26:17 -03:00
DrabWeb
a88c82705b
Use playlist queue
2017-04-09 06:11:53 -03:00
DrabWeb
fe17cb924d
Cleanup
2017-04-09 04:50:35 -03:00
DrabWeb
7b5f8800bd
Reimplement with MusicController
2017-04-09 04:26:21 -03:00
DrabWeb
2d6a2f41aa
Reset MusicController
2017-04-09 04:12:30 -03:00
DrabWeb
963cd09bd0
Merge https://github.com/ppy/osu into playlist
2017-04-09 04:04:13 -03:00
DrabWeb
f65eaa6566
Show scroll dragger, change behaviour when selecting playing song
2017-04-09 03:52:48 -03:00
Dean Herbert
e1e9772d46
Flash buttons on click.
2017-04-08 19:28:29 +09:00
Dean Herbert
e40ad69a3b
Adjust icon scale of play button.
2017-04-08 19:25:40 +09:00
Thomas Müller
b99cbe6962
Add back nice scaling of music controller buttons
2017-04-08 19:17:20 +09:00
Thomas Müller
166a78a15a
Fix up comment in audio device options
2017-04-08 11:01:41 +02:00
Thomas Müller
ac073e22c9
Fix crash caused by multiple identical audio device names
...
The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
2017-04-07 17:00:34 +02:00
Dean Herbert
7e99fc47e2
wip
2017-04-07 16:54:54 +09:00
smoogipooo
a9d938e7ed
Fix brace style.
2017-04-07 15:57:00 +09:00
Dean Herbert
06776443eb
Merge branch 'music-controller-improvements' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-07 15:49:14 +09:00
Dean Herbert
2c2a4169c6
Better structure for button layout.
2017-04-07 15:28:18 +09:00
Dean Herbert
7d2af9310b
Expose DragBar's seeking property.
2017-04-07 15:23:03 +09:00
Dean Herbert
3dbf4879c7
Merge branch 'music-controller-improvements' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-07 15:18:58 +09:00
Dean Herbert
361e187949
Temporarily disable button scaling.
2017-04-07 14:33:58 +09:00
Dean Herbert
fa28e7bdc3
Improve clickability and visuals of MusicController buttons.
2017-04-07 14:09:26 +09:00
Dean Herbert
7c9f30c288
MusicController regression fixes.
2017-04-07 13:15:57 +09:00
Dean Herbert
bc4e0bfa8b
Make DragBar animate seeks.
2017-04-07 13:14:41 +09:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Modes/UI/HudOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
Huo Yaoyuan
411988f038
Remove all trailing whitespaces in this repo.
2017-04-06 16:21:18 +08:00
Huo Yaoyuan
9b1e010dcc
Fix filename mismatch.
2017-04-06 16:05:41 +08:00
Dean Herbert
efe82ef88c
Merge branch 'master' into hud_visibility
2017-04-06 13:40:10 +09:00
Dean Herbert
863dc44c4d
Some minor improvements.
2017-04-06 09:57:34 +09:00
Andrey Zavadskiy
009909dd4b
Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
2017-04-04 17:39:53 +03: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
83322dc5cb
Merge branch 'master' into hud_visibility
2017-04-03 11:51:11 +09:00
Dean Herbert
bfa2e68bfb
Container->Wrapper.
2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Andrey Zavadskiy
d7c39a00b4
Hud Visibility
2017-03-31 16:43:31 +03:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter.
2017-03-29 19:48:13 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places.
2017-03-28 15:28:58 +09:00
Dean Herbert
768b3c4b4b
Add better focus handling in the login form.
2017-03-28 00:08:27 +09:00
Dean Herbert
13272e6995
Make Avatar accept a user.
...
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
DrabWeb
215b016f32
Initial implementation
2017-03-24 05:59:26 -03:00
Dean Herbert
4d61424abd
Merge branch 'master' into song-progress-graph
2017-03-23 17:44:22 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +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
DrabWeb
29c54d4d8b
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-22 08:50:17 -03: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
b46ded7794
Use Bindable for DropDown.
2017-03-22 07:49:21 +08:00
Dean Herbert
8983bbcaad
Merge branch 'master' into leaderboards
2017-03-22 08:24:49 +09:00
Huo Yaoyuan
f0edf5d3d3
Update to DropDown and Menu.
2017-03-22 07:18:53 +08:00
Dean Herbert
b00f86d809
Merge branch 'master' into seperateCursorSize
2017-03-22 08:11:45 +09:00
Jorolf
82d6129063
renamed CursorSize to MenuCursorSize
2017-03-21 17:16:23 +01:00
Andrey Zavadskiy
943bd737c4
Hide letterbox position sliders
2017-03-21 18:24:19 +03:00
smoogipooo
d27f37beb5
Hard-code text size in cases it wasn't set.
2017-03-20 13:48:06 +09:00
Dean Herbert
5d0adc6454
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
2017-03-19 18:51:53 +09:00
Jorolf
80de15d935
fixed typo
2017-03-18 15:22:03 +01:00
Thomas Müller
9af0104e3e
Fix NaN when dragging music controller
...
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
Seth
4aea06be22
Merge branch 'master' into leaderboards
2017-03-17 18:23:01 -03:00
Jorolf
8568e1536c
Separated menu and gameplay cursor size
2017-03-17 18:40:03 +01:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages).
2017-03-15 15:22:28 +09:00
DrabWeb
650fc7563d
ScoreRank, Avatar to own files, +DrawableRank
2017-03-14 10:58:28 -03:00
Seth
21a9996225
Merge branch 'master' into leaderboards
2017-03-14 10:07:33 -03:00
Dan Balasescu
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
Huo Yaoyuan
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
DrabWeb
74eddc768a
Random diff
2017-03-13 13:02:56 -03:00
DrabWeb
8e90e05f23
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
2017-03-13 12:31:46 -03:00
DrabWeb
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
smoogipooo
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
Dean Herbert
e6f4fe9e61
Merge pull request #458 from Lahvuun/master
...
Options sidebar flickering fix.
2017-03-10 13:20:07 +09:00
Jorolf
9dd835e256
didn't see this was unnecessary after my changes
2017-03-09 21:43:11 +01:00
Jorolf
d9a4a677fd
Added Descriptions to Rulesets + PlayModes list
2017-03-09 21:37:03 +01:00
Lahvuun
427a0dd0f5
Options sidebar flickering fix.
2017-03-09 22:29:39 +02:00
Huo Yaoyuan
9007409072
Follow appveyor's code style check.
2017-03-09 16:44:45 +08:00
Dean Herbert
115ebd4773
Merge branch 'master' into modselect
2017-03-09 17:31:25 +09:00
Huo Yaoyuan
1b182b1361
Fix typo.
2017-03-09 15:55:40 +08:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally.
2017-03-09 16:07:34 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
Dean Herbert
a048e666d7
Fix autoproperty which doesn't work on mono.
2017-03-09 14:26:09 +09:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
Dean Herbert
3eece390cb
Abstract constructors -> protected.
2017-03-09 14:01:08 +09:00
Dean Herbert
0c4c1689b6
Merge branch 'master' into modselect
2017-03-09 12:51:40 +09:00
Dean Herbert
5a42035f88
Update license headers.
2017-03-08 15:50:52 +09:00
Huo Yaoyuan
b19405c987
Allow null in mod list to generate a placeholder ModButton.
2017-03-07 19:52:51 +08:00
Huo Yaoyuan
8979b28496
Remove usages of the 'new' keyword.
2017-03-07 16:17:51 +08:00
Huo Yaoyuan
b56d6c767b
Merge branch 'master' into modselect
2017-03-07 16:10:53 +08:00
Dean Herbert
bff1179624
Merge branch 'master' into replay
...
# Conflicts:
# osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections.
2017-03-07 13:52:47 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum
...
# Conflicts:
# osu.Game.Modes.Mania/ManiaMod.cs
# osu.Game.Modes.Osu/OsuMod.cs
# osu.Game/Modes/Mod.cs
2017-03-07 13:42:50 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
Dean Herbert
9106c45858
Fix remaining errors.
2017-03-07 10:42:59 +09:00
Thomas Müller
9b92e99ce9
Merge branch 'master' into increase-ci-strictness
2017-03-06 21:44:39 +01:00
Thomas Müller
6e9c4a4251
Merge branch 'master' into options-footer
2017-03-06 20:01:51 +01:00
Huo Yaoyuan
27edc9971e
Update deselect logic.
...
Change to DeselectTypes to avoid enumerating children for multi times.
2017-03-07 01:15:21 +08:00
Huo Yaoyuan
eda7e1b26f
Fix and update mode changing handling.
2017-03-07 01:01:42 +08:00
Huo Yaoyuan
5cd859ecf1
Fix missed color during loading.
2017-03-07 00:46:36 +08:00
Huo Yaoyuan
836484ba51
Add abstract ModType for ModSection.
2017-03-07 00:32:22 +08:00
Huo Yaoyuan
318ab68af1
Use Bindable<IEnumerable<Mod>> to fit other changes.
2017-03-07 00:17:06 +08:00
Huo Yaoyuan
59d1fdb032
Simplify ModSection.
2017-03-07 00:12:06 +08:00
Dean Herbert
dcc7386609
Add option toggle for debug cached setting.
2017-03-06 22:07:46 +09:00