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 |
|