1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 11:37:58 +08:00
Commit Graph

29984 Commits

Author SHA1 Message Date
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
Dan Balasescu
6db585f2bf
Merge pull request #9292 from peppy/score-results-screen
Load imported replays to results screen rather than gameplay
2020-06-15 23:26:20 +09:00
Dan Balasescu
b4dfd2bbaa
Merge branch 'master' into score-results-screen 2020-06-15 22:58:33 +09:00
Dan Balasescu
84596a166b
Merge pull request #8965 from Craftplacer/update-button
Add "Check for updates" button
2020-06-15 22:55:04 +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
Dan Balasescu
83f26bcb81
Merge pull request #8709 from frenzibyte/cache-ruleset-dependencies-for-tests
Cache ruleset dependencies for test scenes that require it
2020-06-15 20:17:11 +09:00
Dean Herbert
afbc3a87a9
Merge pull request #9291 from smoogipoo/tournament-songbar-temp-fix
Apply temporary fix for tournament song bar disappearance
2020-06-15 19:43:36 +09:00
Dan Balasescu
dadbcfd9f2
Merge branch 'master' into cache-ruleset-dependencies-for-tests 2020-06-15 19:32:31 +09:00
Dean Herbert
6460d9beab
Merge pull request #9270 from cl8n/genre-language-updates
Add new beatmap genres and languages
2020-06-15 19:22:12 +09:00
smoogipoo
d57b58a7dd Add temporary fix for tournament song bar disappearance 2020-06-15 18:47:55 +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
Dean Herbert
99121c7316
Merge pull request #9289 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.0.50
Bump Microsoft.Build.Traversal from 2.0.48 to 2.0.50
2020-06-15 18:41:34 +09:00