1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 18:07:28 +08:00
Commit Graph

3979 Commits

Author SHA1 Message Date
Dan Balasescu
d2a889d2bb Merge pull request #613 from ppy/peppy/general-fixes
Peppy/general fixes
2017-04-10 10:53:33 +09:00
smoogipooo
05ac73edcb Apply width modification to hit object container instead of hit objects, to preserve original size. 2017-04-10 10:33:52 +09:00
Dan Balasescu
862c7c7f3c Merge branch 'master' into peppy/general-fixes 2017-04-10 10:17:10 +09:00
smoogipooo
39adb60952 Update framework. 2017-04-10 10:16:07 +09:00
Dean Herbert
8c6e3e7e54 Merge pull request #610 from peppy/vscode-updates
Bring vscode launch/task configurations up to date.
2017-04-10 10:06:40 +09:00
smoogipooo
e95c7dfa37 Update framework. 2017-04-10 09:33:46 +09:00
smoogipooo
88666c865f Make hit objects default size relative to play field size, not the other way around. 2017-04-10 09:23:00 +09:00
smoogipooo
c882b9bafd Make taiko playfield scale by height. 2017-04-10 05:08:05 +09:00
Dean Herbert
1fe6b84dfc Update with new input changes from framework. 2017-04-10 01:24:50 +09:00
Andrey Zavadskiy
a7264aa84c Warning fix 2017-04-09 17:53:16 +03:00
Andrey Zavadskiy
425e96c45c Moved logic to it's own class 2017-04-09 17:44:19 +03:00
Andrey Zavadskiy
4ab4f65c83 Retry on Tilde key 2017-04-09 16:26:31 +03:00
Dean Herbert
667b52156a Bring vscode launch/task configurations up to date. 2017-04-09 18:59:43 +09:00
Jorolf
bcef1ce2b6 replace space in text with Spacing in FillFlowContainer 2017-04-08 13:59:22 +02:00
Jorolf
f7a9a11ae5 Bar uses AccentColour aswell 2017-04-08 13:53:11 +02:00
Dean Herbert
adc16b0727 Merge pull request #608 from Tom94/music-controller-button-animation
Music controller button animation
2017-04-08 20:48:39 +09:00
Jorolf
5e56e84c4a change SRGBColour to Color4 and use IHasAccentColour in some places 2017-04-08 13:31:55 +02:00
Dean Herbert
b5431c496b Fix osu! logo handling drags for no reason. 2017-04-08 19:34:04 +09: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
Jorolf
841d101be7 renaming 2017-04-07 20:41:03 +02:00
Jorolf
c60a55285c updated TestCase and some null checks 2017-04-07 20:32:09 +02:00
Jorolf
6a87fd6112 retries and fails hide if they're not present 2017-04-07 20:19:03 +02:00
Jorolf
899e559b5c ratings hide now + remove unnessary stuff 2017-04-07 19:58:49 +02:00
Jorolf
65d9f4fc45 hide MetadataSegments without content and remove fail/retry initialisations 2017-04-07 19:27:14 +02:00
Dean Herbert
b6ece111a4 Merge pull request #606 from Tom94/fix-audio-crash
Fix crash caused by multiple identical audio device names
2017-04-08 01:31:54 +09:00
Thomas Müller
e2756b7f8b Merge pull request #607 from peppy/general-fixes
General improvements
2017-04-07 18:31:02 +02:00
Jorolf
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
Jorolf
187a0e3613 Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-07 18:14:14 +02:00
Jorolf
eb4b3772e9 put Bar into its own file and let it only add a background if BackgroundColour is changed 2017-04-07 18:13:55 +02:00
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
06a655af5d
Move initial position of KeyCounter upwards. 2017-04-07 20:51:37 +09:00
Dean Herbert
0d4f457265
Improve transitions when exiting play mode. 2017-04-07 20:46:35 +09:00
Dean Herbert
54d1afb655
Fade in HitRenderer post entering animation. 2017-04-07 20:38:57 +09:00
Dan Balasescu
53c491d4ef Merge pull request #604 from peppy/taiko-fixes
Minor taiko improvements
2017-04-07 17:28:06 +09:00
Dean Herbert
aa45515a7c
Add flash effect when hitting taiko hits. 2017-04-07 16:56:12 +09:00
Dean Herbert
39175905e4
Fix crashes on completing a taiko map (where a strong his is the last hit in the map). 2017-04-07 16:56:09 +09:00
Dean Herbert
7e99fc47e2
wip 2017-04-07 16:54:54 +09:00
Dan Balasescu
f5f65fa230 Merge pull request #603 from peppy/music-controller-improvements
Improve clickability and visuals of MusicController buttons.
2017-04-07 16:07:19 +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