1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 01:03:02 +08:00
Commit Graph

18702 Commits

Author SHA1 Message Date
BananeVolante
53107973a3
merged 2 lines
Co-authored-by: Salman Ahmed <email@iisalman.me>
2020-06-24 14:01:13 +02:00
Bartłomiej Dach
43be75d481
Merge branch 'master' into Issue#9170 2020-06-23 20:49:13 +02:00
Dan Balasescu
11446a7864
Merge pull request #9355 from peppy/update-framework
Update framework
2020-06-23 22:27:55 +09:00
Dan Balasescu
fd9ac3503f
Merge branch 'master' into fix-editor-drag-selection-while-playing 2020-06-23 21:56:31 +09:00
Dean Herbert
92cf2dd3bb
Merge pull request #9352 from smoogipoo/fix-editor-drag-exception
Fix exception when dragging after deleting object
2020-06-23 21:45:58 +09:00
Dean Herbert
9d753a4fc2 Update intro resource locations 2020-06-23 21:34:57 +09:00
Dean Herbert
5cdabbc8bb Update access to FrequencyAmplitudes via span 2020-06-23 21:33:03 +09:00
Dean Herbert
f2735a7797 Use new empty ChannelAmplitudes spec 2020-06-23 21:30:37 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Dean Herbert
61c4ed327c Update framework 2020-06-23 21:26:41 +09:00
smoogipoo
e7238e25f9 Fix exception when dragging after deleting object 2020-06-23 20:36:09 +09:00
BananeVolante
624ad65806 formating 2020-06-23 13:09:24 +02:00
Dean Herbert
a5eac716ec Make work for all editors based on track running state 2020-06-23 18:42:56 +09:00
Dean Herbert
53d542546e Fix editor drag selection not continuing to select unless the mouse is moved 2020-06-23 18:04:50 +09:00
Dean Herbert
a6c6e391ca Fix player not exiting immediately on Alt-F4 2020-06-23 17:38:30 +09:00
dependabot-preview[bot]
7a48ab1774
Bump ppy.osu.Game.Resources from 2020.602.0 to 2020.622.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.602.0 to 2020.622.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.602.0...2020.622.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-22 17:19:46 +00:00
BananeVolante
579d7cedcc Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
updated local source
2020-06-22 15:29:05 +02:00
BananeVolante
836386d03b removed duplicate lines 2020-06-22 15:22:13 +02:00
BananeVolante
9dea96e5fd added pause sound with fading 2020-06-22 14:02:21 +02:00
BananeVolante
a4eb6c81c5 undid changes to the file 2020-06-22 13:40:31 +02:00
Dean Herbert
e91c2ee5e2 Simplify logic by considering all buttons equally 2020-06-22 16:19:38 +09:00
Dean Herbert
88a8e13b55 Merge branch 'master' into power9maker-master 2020-06-22 16:19:20 +09:00
Bartłomiej Dach
ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00
Bartłomiej Dach
07cbc3e683 Privatise and seal whatever possible 2020-06-21 23:05:10 +02:00
Bartłomiej Dach
4bba0c7359 Move abstract sample test to main game project 2020-06-21 22:28:19 +02:00
smoogipoo
9fbe2fa80a Add comments, change to clamp 2020-06-21 19:31:00 +09:00
smoogipoo
44925b3951 Reduce mania's HP drain by 20% 2020-06-21 18:05:26 +09:00
Dean Herbert
3021bdf305 Update framework 2020-06-20 00:34:01 +09:00
Dean Herbert
290ae37346 Add assertion of only usage game-wide 2020-06-18 23:54:20 +09:00
Dean Herbert
7da56ec7fd Add null check and xmldoc 2020-06-18 23:52:35 +09:00
Dean Herbert
add1265d53 Block screen suspend while gameplay is active 2020-06-18 23:48:00 +09:00
Dean Herbert
c3d4ffed00 Update framework 2020-06-16 16:46:33 +09:00
Dean Herbert
8f7f6881d3 Merge branch 'master' into update-framework 2020-06-16 16:46:22 +09:00
Dean Herbert
c79d8a4251 Update ChannelTabControl in line with TabControl changes 2020-06-16 00:18:09 +09:00
Dan Balasescu
b4dfd2bbaa
Merge branch 'master' into score-results-screen 2020-06-15 22:58:33 +09:00
Dean Herbert
97067976f7 Add null check 2020-06-15 22:23:06 +09:00
Dean Herbert
53b7057ee0 Don't show update button when updates are not feasible 2020-06-15 22:19:11 +09:00
Dean Herbert
d2155c3da3 Fix thread safety 2020-06-15 22:19:02 +09:00
Dean Herbert
2a6faf6a8e Merge branch 'master' into update-button 2020-06-15 22:06:02 +09:00
Dean Herbert
1ce374ae2f Update framework 2020-06-15 20:34:46 +09:00
Dean Herbert
17a70bf6ee Add test coverage 2020-06-15 20:32:27 +09:00
Dean Herbert
90d69c1216 Allow legacy score to be constructed even if replay file is missing 2020-06-15 20:31:47 +09:00
Dean Herbert
c3c5a99a22 Load imported scores to results screen rather than gameplay 2020-06-15 20:23:35 +09:00
BananeVolante
4e7d60b6ff Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
updated local source
2020-06-15 12:58:47 +02:00
Dan Balasescu
dadbcfd9f2
Merge branch 'master' into cache-ruleset-dependencies-for-tests 2020-06-15 19:32:31 +09:00
Dean Herbert
ad5bd1f0c0 Update in line with other/unspecified switch
See 289f0f0a20.
2020-06-15 18:45:52 +09:00
Dean Herbert
7e0dc97fb4 Merge branch 'master' into genre-language-updates 2020-06-15 18:45:21 +09:00
Salman Ahmed
eb64c4752c
Merge remote-tracking branch 'upstream/master' into cache-ruleset-dependencies-for-tests 2020-06-15 11:31:12 +03:00
Salman Ahmed
60381d5817
Remove IRulesetTestScene and use OsuTestScene.CreateRuleset() instead 2020-06-15 11:30:48 +03:00
Dan Balasescu
c09868780e
Merge pull request #8778 from frenzibyte/test-scene-create-ruleset
Add method of creating a ruleset for testing with in OsuTestScene
2020-06-15 17:22:54 +09:00