Thomas Müller
2689de0c0c
Update framework and add "Async" suffix to asynchronous methods
2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Kelvin
fd622286fe
Enable Tabbing in LoginOptions
2017-02-23 00:50:09 -08:00
Dean Herbert
f1538791c3
Correctly hook up window mode dropdown.
2017-02-23 17:35:14 +09:00
Dean Herbert
6701cd9016
Merge branch 'master' into general-fixes
2017-02-23 17:04:53 +09:00
Dean Herbert
f812641696
Merge pull request #383 from peppy/player-loading-screen
...
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
Dean Herbert
d19a7813f3
Fix TestCasePlayer regression.
2017-02-22 23:27:29 +09:00
Dean Herbert
c83d2bbe6e
Make panels fade in again.
2017-02-22 21:54:49 +09:00
Dean Herbert
aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
Dean Herbert
7cda82d016
Space to skip.
2017-02-22 21:28:40 +09:00
Thomas Müller
0d3cc39cbc
Merge branch 'master' into general-fixes
2017-02-22 08:01:34 +01:00
Thomas Müller
44bedb5407
Merge branch 'master' into chat-improvement
2017-02-22 07:36:42 +01:00
Dean Herbert
2d2660c1c5
Improve transition when retrying a beatmap.
2017-02-22 14:14:37 +09:00
Dean Herbert
d00ea4564f
Fix API coming online too early in race scenarios.
2017-02-22 14:09:48 +09:00
Dean Herbert
190bed8939
Add top padding.
2017-02-22 13:38:22 +09:00
Dean Herbert
b7a9fd85ea
Assert single channel support for now.
2017-02-22 13:38:10 +09:00
Alex Amadori
3d19199218
Fixed for star difficulty
2017-02-21 18:27:39 +01:00
Alex Amadori
6c161fb167
Merge remote-tracking branch 'upstream/master'
2017-02-21 18:15:46 +01:00
Dean Herbert
afba4fbfad
Merge remote-tracking branch 'upstream/master' into chat-improvement
2017-02-21 15:46:28 +09:00
Dean Herbert
5f29b0dc4f
Update in line with framework changes.
2017-02-21 15:46:04 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications.
2017-02-21 13:52:37 +09:00
Dean Herbert
aedce4d516
Merge remote-tracking branch 'upstream/master' into difficulty-calculator
2017-02-20 21:20:56 +09:00
Dean Herbert
6a83620589
Add better focus handling and padding/margin updates.
2017-02-20 21:11:09 +09:00
Dean Herbert
e3fa49dda7
Naively "send" messages that the user types (doesn't arrive yet).
2017-02-20 21:10:43 +09:00
Dean Herbert
4afa434962
Maintain a scroll position when scrolled to the bottom of a chat channel.
2017-02-20 21:10:23 +09:00
Dean Herbert
75b66871dd
Add colourised usernames.
2017-02-20 21:09:56 +09:00
Dean Herbert
7a2eedbd7e
Add message batching per-channel.
2017-02-20 21:09:34 +09:00
Dean Herbert
729f2eec8d
Increase maximum chat history.
2017-02-20 21:07:44 +09:00
Thomas Müller
444c3ba817
Merge branch 'master' into difficulty-calculator
2017-02-20 07:38:10 +01:00
Thomas Müller
1ead694c75
Merge branch 'master' into general-fixes
2017-02-20 07:37:31 +01:00
Dean Herbert
a621a65eb5
Fix GlobalHotkeys not working (regression due to masking rules).
2017-02-20 15:31:15 +09:00
Dean Herbert
737bd62c30
Fix GlobalHotkeys not working (regression due to masking rules).
2017-02-20 15:27:48 +09:00
Alex Amadori
a0d0c1854b
Merge remote-tracking branch 'upstream/master'
2017-02-19 19:09:55 +01:00
Thomas Müller
417f146386
Add difficulty calculation
...
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Jorolf
1e0a694ff8
replaced bool with Bindable<bool>
...
Also accounted for the ParallaxAmount when moving to default position
2017-02-19 17:11:36 +01:00
Jorolf
7f751d3653
Update ParallaxContainer.cs
2017-02-19 16:54:00 +01:00
Jorolf
e83ac8b04c
Removed public ParallaxEnabled property
2017-02-19 13:47:26 +01:00
Dean Herbert
c6fa5cc803
Fix order of execution when populating initial messages.
2017-02-19 18:46:19 +09:00
Dean Herbert
de87141e90
Remove unused using statements.
2017-02-19 18:39:54 +09:00
Dean Herbert
cde660a8ef
Scroll to bottom.
2017-02-19 18:07:35 +09:00
Dean Herbert
aac4ba2baa
Add input box to ChatOverlay.
2017-02-19 18:02:25 +09:00
Dean Herbert
520e040396
Add FocusedTextBox abstraction.
2017-02-19 17:59:22 +09:00
Dean Herbert
0da0ef5a1b
Fix padding, fonts and alignment of chat display.
2017-02-19 17:06:41 +09:00
Jorolf
f166bb0f96
Moved movement to the default position to property
2017-02-18 22:26:48 +01:00
Jorolf
77bfe57d8c
compacted code, made public bool to disable it
2017-02-18 22:00:07 +01:00
Jorolf
a48e4a31a7
Parallax Option works now
2017-02-18 21:34:21 +01:00
Alex Amadori
21cf96ec10
More sorting rookie mistakes
2017-02-18 16:23:13 +01:00
Alex Amadori
f48c83b787
Fix silly sorting mistakes
2017-02-18 15:56:29 +01:00
Alex Amadori
d92382c1aa
Merge remote-tracking branch 'upstream/master'
2017-02-18 15:18:26 +01:00
Alex Amadori
6bbbbd8f96
Implemented sorting in TestCasePlaySong
2017-02-18 15:11:40 +01:00
Dean Herbert
c1194102b1
Remove second sample playback when clicking osu! logo.
2017-02-18 22:33:24 +09:00
Dean Herbert
ebc38917dc
Fix options sidebar not displaying correclty.
2017-02-18 22:29:20 +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
Alex Amadori
1cd93f79b3
General sorting improvements
2017-02-18 07:59:01 +01:00
Dean Herbert
94dd268fd2
Move constant for default ControlPoint out of Slider.
2017-02-18 15:54:16 +09:00
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing.
2017-02-18 14:16:46 +09:00
Alex Amadori
6b3ecc28b8
Fixed BeatmapPanels disappearing
2017-02-17 23:32:14 +01:00
Thomas Müller
ef775458dd
Fix compilation error introduced in merge conflict resolution.
2017-02-17 21:27:17 +01:00
Thomas Müller
04de28d8b2
Merge branch 'refs/heads/update-framework' into general-fixes
2017-02-17 21:26:39 +01:00
Thomas Müller
1198705a6f
Merge branch 'master' of github.com:ppy/osu into general-fixes
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2017-02-17 21:22:34 +01:00
Thomas Müller
4b0d6cd26b
Don't rely on default relative size of ScrollContainer.
2017-02-17 20:08:28 +01:00
Shadoxfix
7a45ea58b2
Add comment explaining why the branch is necessary
2017-02-17 18:17:18 +01:00
Alex Amadori
7dcbefd50f
Implemented basic sorting logic
2017-02-17 17:41:53 +01:00
Shadoxfix
72306e8757
Fix beatmap import crash when the first timingPoint starts later than a slider
2017-02-17 17:36:00 +01:00
Dean Herbert
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer.
2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
Dean Herbert
366e95dd4f
Remove outdated comment.
2017-02-17 17:33:41 +09:00
Dean Herbert
9e8b4d43dd
Improve exit procedure.
2017-02-17 17:25:28 +09:00
Dean Herbert
0b922365bb
Fix nullref due to missing controlPoints.
2017-02-17 15:27:48 +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
ca6946c7a2
Update Health display design.
2017-02-16 22:44:21 +09:00
Dean Herbert
9a2beb5979
Update Key Counter font.
2017-02-16 22:43:49 +09:00
Dean Herbert
04346dbb92
Make osu! logo at song select correctly handle mouse focus.
2017-02-16 22:24:25 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
...
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
Dean Herbert
2640c2ac43
Add tick sample.
2017-02-16 13:39:01 +09:00
Dean Herbert
23677a309f
Merge branch 'master' into slider_ticks
2017-02-16 11:06:23 +09:00
Damnae
b7fca88b4f
Clearer slider Velocity and TickDistance calculations.
2017-02-15 18:55:49 +01:00
Dean Herbert
7fbc5990d1
Add combo numbers.
2017-02-15 23:23:55 +09:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText.
2017-02-15 21:37:43 +09:00
Dean Herbert
12e265a3e2
Combine triangle system implementations.
2017-02-15 20:39:10 +09:00
Jorolf
d42c5481b0
Make mode selector selected line non-relative. ( #352 )
...
* mode selector line has the correct length now
* calculation is now a 'one-liner'
* Line length is absolute now
* Line length is calculated inline
2017-02-15 13:48:49 +09:00
Dean Herbert
d570a6d308
Handle cases where HitObjects were not parsed.
2017-02-15 12:38:10 +09:00
Dean Herbert
753232533a
Display Important/Error logging in notifications for now.
2017-02-15 12:37:57 +09:00
Dean Herbert
580584a015
Don't use osu! mode parser for other game modes for now (convert still works).
2017-02-15 12:36:47 +09:00
Dean Herbert
8e9a5e9faa
Add the ability to make DrawableHitObjects non-interactive (for use in other contexts).
2017-02-15 01:23:20 +09:00
Dean Herbert
fc192906ea
Handle proxied approach layer better and add slider's approach circle (previously missing).
2017-02-15 01:23:19 +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
6fa84f3a81
Merge branch 'master' into disable-unimplemented-options
2017-02-14 08:35:40 +09:00
Dean Herbert
4f9d1a6c39
Visually disable options which aren't yet wired up.
2017-02-14 00:36:50 +09:00
Dean Herbert
343e48c195
Merge branch 'master' into followpoints
2017-02-13 22:23:57 +09:00
Dean Herbert
11643d2e09
Remove unnecessary methods and local variables.
2017-02-13 18:30:51 +09:00
Dean Herbert
1aeb48b920
Merge remote-tracking branch 'upstream/master' into osb_loading
2017-02-13 18:22:29 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Thomas Müller
e3f35cd66e
Merge branch 'master' into osb_loading
2017-02-12 12:26:25 +01:00
Dean Herbert
e32ccb6153
Move scene graph init to ctors.
2017-02-12 19:39:54 +09:00
Dean Herbert
874af48de6
Merge remote-tracking branch 'upstream/master' into installer-updater
2017-02-12 17:18:04 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors
2017-02-12 02:32:11 -05:00
Dean Herbert
3d65c468ae
Merge remote-tracking branch 'upstream/master' into installer-updater
2017-02-12 16:30:12 +09:00
Dean Herbert
37e75e9a54
Add null check when loading beatmap background.
2017-02-12 16:13:44 +09:00
Dean Herbert
870aa2750f
Don't attempt to import command line arguments as beatmaps.
2017-02-12 14:53:33 +09:00
Dean Herbert
ac548dc9ec
Rework notifications to be more flexible.
2017-02-12 14:50:42 +09:00
Dean Herbert
a14b7eb598
NotificationManager should become visible when receiving a notification (until we implement toasts).
2017-02-12 14:50:02 +09:00
Thomas Müller
d3380631e8
Handle preferred audio device correctly when it is unavailable
...
This commit allows loading, storing, and displaying a preferred audio
device from config even when it is unavailable.
2017-02-11 16:33:54 +01:00
Thomas Müller
d79c8b9695
Update AudioDevicesOptions when devices are found or lost
...
This commit hooks up AudioDevicesOptions to the new events exposed by
the AudioManager of osu-framework. The device list is now updated when
new devices become available or are lost.
2017-02-11 16:29:33 +01:00
Thomas Müller
8394e2ff38
Update OptionDropDown value when items change
...
Items of OptionDropDown could previously already be changes on-the-fly,
but the selected value was not correctly updated (it kept the same index).
This commit addresses this problem.
2017-02-11 16:27:15 +01:00
Thomas Müller
2c4ecb990d
Remove line break in MusicController
2017-02-11 16:23:15 +01:00
Dean Herbert
7efa3415a4
Merge branch 'master' into followpoints
2017-02-10 20:59:45 +09:00
Damnae
2d155f6a5c
Bring back the delay to what it was before.
2017-02-10 10:48:25 +01:00
Damnae
6f37c02868
Fix followpoints needing a DelayReset.
2017-02-10 10:07:52 +01:00
Dean Herbert
e23202c449
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests
2017-02-10 17:22:38 +09:00
Dean Herbert
398ac6f459
Add assert to ensure complete is only called once.
2017-02-10 16:58:40 +09:00
Dean Herbert
dd8ec70bd5
Remove excess newline.
2017-02-10 16:57:49 +09:00
Dean Herbert
2da5628184
Merge remote-tracking branch 'upstream/master' into notifications-manager
2017-02-10 16:54:56 +09:00
Thomas Müller
0f7cee230b
Merge pull request #343 from peppy/general-fixes
...
Add pink glow to cursor because I can't fucking see it against white.
2017-02-10 08:45:00 +01:00
Dean Herbert
8ec927899f
Implement notifications.
2017-02-10 16:30:23 +09:00
Dean Herbert
d5b7a8ce9e
Add pink glow to cursor because I can't fucking see it against white.
2017-02-10 16:24:40 +09:00
Damnae
77ee161be8
Add follow points.
2017-02-10 06:19:59 +01:00
Damnae
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
Andrey Zavadskiy
e06aa44c4c
Warning Fixes
2017-02-09 16:18:08 +03:00
Dean Herbert
becb65f702
Fix ParallaxContainer breaking with no mouse state present.
2017-02-09 19:25:04 +09:00
Dean Herbert
829fb2605b
Fix visualtest regression.
2017-02-09 17:47:11 +09:00
Dean Herbert
60e206e587
Merge pull request #336 from Damnae/hitobject_stacking
...
Add hit object stacking.
2017-02-09 17:01:52 +09:00
Thomas Müller
90e6112d57
Merge pull request #332 from peppy/unicode-support
...
Preliminary CJK support
2017-02-09 08:45:41 +01:00
Dean Herbert
d73093867d
Merge pull request #320 from default0/audio-device-selection
...
Audio device selection
2017-02-09 16:45:29 +09:00
Thomas Müller
b7fd65070e
Merge pull request #335 from peppy/overlay-improvements
...
Overlay improvements
2017-02-09 08:43:58 +01:00
Dean Herbert
23bc84fa3c
Fix borked header.
2017-02-09 16:38:39 +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
Damnae
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
Dean Herbert
0937424e0c
Add base.PopOut calls to allow for passing away focus.
2017-02-09 13:57:52 +09:00
Dean Herbert
30bec0876d
Make MusicController a focused overlay.
2017-02-09 13:57:49 +09:00
Dean Herbert
581ec765fb
Improve transitions of MusicController.
2017-02-09 13:57:47 +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
faa805e437
Fix SearchTextBox's handling of keyboard input to allow for IME input.
2017-02-09 12:33:24 +09:00
Dean Herbert
f6956fc51c
Fix MusicController doing work in the background when not visible.
2017-02-09 11:36:45 +09:00
Dean Herbert
4fc2cd227c
Add CJK support via font Noto Medium.
2017-02-09 10:35:25 +09:00
Dean Herbert
d230c3f9ac
Correct masking layers on song select.
2017-02-08 20:39:17 +09:00
Dean Herbert
050fa7fbe8
Adjust FilterControl to match design and give an absolute height.
2017-02-08 20:30:45 +09:00
Dean Herbert
b6398a1c77
Centralise toolbar size variables and adjust to design.
2017-02-08 20:30:45 +09:00
Dean Herbert
143cfae93a
Login overlay should disappear when toolbar is hidden.
2017-02-08 20:30:45 +09:00
Dean Herbert
a7dac15d05
Toolbar is now toggled by the main menu.
2017-02-08 20:30:45 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better.
2017-02-08 20:30:45 +09:00
Dean Herbert
3cee23fc00
Toggle toolbar with Ctrl-T.
2017-02-08 20:30:45 +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
06695dbf9b
Method name update.
2017-02-08 16:01:48 +09:00
Dean Herbert
417b0817a9
Improve arrow key redirection at song select.
2017-02-08 15:30:20 +09:00
