1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
Commit Graph

29953 Commits

Author SHA1 Message Date
Dean Herbert
b289beca53 Fix samples being played too early 2020-06-23 13:33:33 +09:00
Dean Herbert
0933d44ceb Merge branch 'master' into fallback-intro 2020-06-22 21:36:21 +09:00
Dean Herbert
f60a80b263 Fix animations and general code quality 2020-06-22 21:35:52 +09:00
Dan Balasescu
412011d4ec
Merge pull request #9186 from power9maker/master
Add cursor rotation on right mouse drag
2020-06-22 20:14:53 +09:00
Dan Balasescu
e7e4862517
Merge branch 'master' into master 2020-06-22 19:03:29 +09:00
Dean Herbert
8d3ed05848 Update welcome text sprite location 2020-06-22 17:42:54 +09:00
Dean Herbert
628e05f655 Update resources 2020-06-22 17:09:22 +09:00
Dean Herbert
e3420dfad6
Merge branch 'master' into fallback-intro 2020-06-22 17:09:08 +09:00
Dean Herbert
12c3b086a4
Merge pull request #9051 from MiraiSubject/custom-ipc-location 2020-06-22 17:08:58 +09:00
Dean Herbert
fc31d49629 try-catch registry lookup to avoid crashes on non-windows platforms 2020-06-22 16:34:04 +09:00
Dean Herbert
2d121b4e3d Simplify lookup fallback code 2020-06-22 16:32:27 +09:00
Dean Herbert
1df89c6a59
Merge branch 'master' into custom-ipc-location 2020-06-22 16:22:04 +09: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
Dan Balasescu
04e63c9f7e
Merge pull request #9334 from bdach/base-legacy-skin-transformer
Extract base legacy skin transformer
2020-06-22 14:45:13 +09:00
Dean Herbert
b678f28e6c
Merge branch 'master' into base-legacy-skin-transformer 2020-06-22 11:54:14 +09:00
Dean Herbert
eb0433e04d
Merge pull request #9333 from bdach/ruleset-sample-tests
Extract abstract hitobject sample test class
2020-06-22 11:53:58 +09:00
Bartłomiej Dach
1bc5f36184 Adjust test usage 2020-06-21 23:06:55 +02: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
Bartłomiej Dach
4a8a673d41 Decouple abstract sample test from TestResources 2020-06-21 22:28:19 +02:00
Bartłomiej Dach
599543acb6 Extract abstract hitobject sample test class 2020-06-21 22:28:19 +02:00
Dan Balasescu
ca65aaae82
Merge pull request #9276 from mcendu/mania-element-lookup-refactor
Refactor lookup of mania skin configuration entries
2020-06-21 23:40:05 +09:00
Dan Balasescu
9c7031965f
Merge branch 'master' into mania-element-lookup-refactor 2020-06-21 22:36:53 +09:00
Dean Herbert
26f049ab16
Merge pull request #9330 from smoogipoo/reduce-mania-hp-drain
Reduce mania's HP drain by 20%
2020-06-21 19:58:15 +09:00
smoogipoo
9fbe2fa80a Add comments, change to clamp 2020-06-21 19:31:00 +09:00
Dean Herbert
d06fe3a03a
Merge pull request #9329 from smoogipoo/mania-tick-combo-score
Make hold note ticks affect combo score rather than bonus
2020-06-21 18:34:45 +09:00
smoogipoo
44925b3951 Reduce mania's HP drain by 20% 2020-06-21 18:05:26 +09:00
smoogipoo
19eb6fad7f Make hold note ticks affect combo score rather than bonus 2020-06-21 17:42:17 +09:00
mcendu
ca555a6a52 rename per-column skin config retrieval to GetColumnSkinConfig
Removed parameter "index"; all these cases should use extension instead
2020-06-20 14:56:39 +08:00
mcendu
8298a2c8a9 inline stage light lookup and clarify behavior 2020-06-20 14:53:25 +08:00
Dan Balasescu
2bb212c2d8
Merge pull request #9318 from peppy/update-framework
Update framework
2020-06-20 01:44:00 +09:00
Dean Herbert
0f1d07ddff
Merge pull request #9317 from smoogipoo/fix-test-browser
Mark test scene as headless to fix test browser display
2020-06-20 00:52:47 +09:00
Dean Herbert
3021bdf305 Update framework 2020-06-20 00:34:01 +09:00
smoogipoo
22f3fd487b Mark test as headless 2020-06-19 22:43:25 +09:00
Dan Balasescu
98cd1f2a22
Merge pull request #9313 from peppy/add-screen-suspend-blocking
Block screen suspend while gameplay is active
2020-06-19 12:49:40 +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
Shivam
693a760a19 Use RelativeSizeAxes for width 2020-06-16 15:44:59 +02:00
Shivam
d1086a49a3 Merge branch 'master' of https://github.com/ppy/osu into fallback-intro 2020-06-16 15:11:18 +02:00
Dan Balasescu
26ea75519c
Merge pull request #9299 from peppy/fix-android-build-number-parsing
Fix regression in android build parsing behaviour
2020-06-16 21:28:16 +09:00
Dan Balasescu
c5358cbb6b
Remove blank line 2020-06-16 21:01:10 +09:00
Dean Herbert
115ea244be Add note about substring usage 2020-06-16 20:20:46 +09:00
Dean Herbert
3f1b9edabe Fix regression in android build parsing behaviour 2020-06-16 20:19:56 +09:00
Dan Balasescu
66544aa72a
Merge pull request #9293 from peppy/update-framework
Update framework
2020-06-16 17:53:43 +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