1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-20 01:32:57 +08:00
Commit Graph

21777 Commits

Author SHA1 Message Date
Andrei Zavatski
eb683b079b Adjust colours 2019-09-10 05:12:50 +03:00
Andrei Zavatski
18f123c1c6 Merge remote-tracking branch 'refs/remotes/ppy/master' into page-selector 2019-09-10 05:03:47 +03:00
Dean Herbert
fc7e8dcbfb
Open login overlay if user isn't signed in after intro sequence (#6038)
Open login overlay if user isn't signed in after intro sequence

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-10 09:27:13 +09:00
Andrei Zavatski
bee7760d29 Make MaxPages value a bindable 2019-09-10 01:36:25 +03:00
Andrei Zavatski
f5d54f8830 Merge remote-tracking branch 'refs/remotes/ppy/master' into page-selector 2019-09-10 01:18:04 +03:00
Dean Herbert
98e384129c Remove redundant initialisation 2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820 Add back local bool (required due to action limitations) 2019-09-10 01:18:02 +09:00
Dean Herbert
dce675d6a8
Merge branch 'master' into login-on-startup 2019-09-10 01:13:29 +09:00
Dean Herbert
f398f134e1 Remove unnecessary bool storage
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826 Show instead of toggle 2019-09-10 01:06:37 +09:00
Dean Herbert
570e211db0
Improve gameplay cursor test scene + refactor (#6045)
Improve gameplay cursor test scene + refactor

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-09 17:53:59 +09:00
Dean Herbert
98590e536e
Merge branch 'master' into cursor-test-improvement 2019-09-09 17:26:56 +09:00
Dean Herbert
401c4e7aa7
Make SkinnabbleTestScene use the stored classic skin (#6044)
Make SkinnabbleTestScene use the stored classic skin
2019-09-09 17:25:47 +09:00
smoogipoo
81bb8d9bc4 Make SkinnabbleTestScene use stored classic skin 2019-09-09 17:05:27 +09:00
smoogipoo
5b692915be Add required type 2019-09-09 17:03:14 +09:00
Dean Herbert
358b46beea
Merge pull request #6031 from iiSaLMaN/set-health-default-value-to-1
Fix results screen pushed at the beginning of a gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-09 15:04:08 +09:00
LeNitrous
ff49c4ae98 remove redundancies 2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa move logic to logo action 2019-09-09 13:30:48 +08:00
Dean Herbert
07fce8397b Move reset call to ctor 2019-09-09 14:24:17 +09:00
smoogipoo
74440dcfdc Make the cursors click every so often 2019-09-09 13:01:40 +09:00
smoogipoo
af09ed1b7f Make cursor test scene more automated 2019-09-09 12:48:38 +09:00
smoogipoo
7adfae3784 Reorder CursorTrail members 2019-09-09 12:35:15 +09:00
LeNitrous
04a4f9c9a3 use IsLoggedIn and remove useless clause 2019-09-09 11:26:51 +08:00
Dean Herbert
f0b1995c2a
Add android configuration defaults to props (#6033)
Add android configuration defaults to props
2019-09-09 11:17:21 +09:00
LeNitrous
be4f0cc2dd remove null conditional 2019-09-09 06:14:49 +08:00
miterosan
8862cdab9c Also set the default for Platform 2019-09-08 15:33:51 +02:00
miterosan
d790656b7e Revert shortening the condition 2019-09-08 15:33:16 +02:00
LeNitrous
a67a2899a9 move api state check to it's own clause 2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3 open login on enter main menu 2019-09-08 13:36:58 +08:00
Andrei Zavatski
0451b45fab Add missing blank line 2019-09-08 00:37:11 +03:00
Andrei Zavatski
b97f4a81db Add more testing 2019-09-08 00:27:40 +03:00
Andrei Zavatski
b0884d16fb Visual adjustments 2019-09-08 00:13:23 +03:00
Andrei Zavatski
df29465ba4 Implement a single PageItem component 2019-09-07 23:42:30 +03:00
Andrei Zavatski
ec8298ac53 Simplify redraw function 2019-09-07 22:33:26 +03:00
Andrei Zavatski
ba18f77b62 Use OsuHoverContainer for prev/next buttons 2019-09-07 22:31:08 +03:00
miterosan
6581e51d6a Add a default for the configuration into the android props.
This allows building even if no configuration is specified.
2019-09-07 18:03:33 +02:00
iiSaLMaN
be803fa921 Reset score processor before starting the simulation 2019-09-07 18:15:49 +03:00
miterosan
c397ab6282 Fix Android Builds. 2019-09-07 17:04:13 +02:00
iiSaLMaN
55b2bc1ed5 Set Health default value to 1 2019-09-07 18:03:04 +03:00
Andrei Zavatski
9bd4220e9f Add prev/next buttons 2019-09-07 09:20:11 +03:00
Andrei Zavatski
cea26baaef Implement placeholder and correct redraw algorithm 2019-09-07 08:46:16 +03:00
Andrei Zavatski
f77cd6582d Implement CurrentPage class 2019-09-07 08:20:09 +03:00
Andrei Zavatski
508b26ac69 Implement basic layout 2019-09-07 07:31:07 +03:00
Dan Balasescu
f51ff55328
Merge pull request #6020 from peppy/volume-at-pause
Allow global actions to propagate through pause screen
2019-09-06 20:03:52 +09:00
Dan Balasescu
f47f0e797c
Merge branch 'master' into volume-at-pause 2019-09-06 19:47:37 +09:00
Dan Balasescu
ae083ccc1f
Merge pull request #6022 from peppy/fix-drag-out-chat
Fix dragging from inside to outside an overlay incorrectly hiding
2019-09-06 19:45:36 +09:00
Dean Herbert
95baae5088 Fix dragging from inside to outside an overlay incorrectly hiding 2019-09-06 18:27:54 +09:00
Dean Herbert
88d0756107 Allow global actions to propagate through pause screen 2019-09-06 17:17:30 +09:00
Dean Herbert
e5c3a906d7
Merge pull request #5637 from iiSaLMaN/stop-counting-to-score-after-fail
Disallow adding to score after the player has failed

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-06 17:11:26 +09:00
Dean Herbert
b89fb5cdf7 Fix failing test 2019-09-06 16:51:30 +09:00