Bartłomiej Dach
8b4e6d2911
Remove no longer necessary FinishTransforms(true)
call
...
As the component no longer has any transition transforms applied.
2021-05-14 22:03:35 +02:00
Salman Ahmed
6cc678f497
Remove nullability and transition support from star rating display
2021-05-14 16:05:40 +03:00
Salman Ahmed
afc9a1bf23
Remove rolling support and apply few adjustments
2021-05-10 10:16:52 +03:00
Salman Ahmed
1c49590ba2
Apply further refactoring to star rating display UX-wise
2021-05-10 08:56:30 +03:00
Salman Ahmed
301dab1ce8
Refactor StarRatingDisplay
to be mutable with a current bindable
2021-05-10 08:56:30 +03:00
Dean Herbert
b5954a55ad
Remove empty <returns> xmldoc
2021-04-12 17:46:14 +09:00
Dean Herbert
90e8308716
Merge branch 'master' into localisation-refactor-framework
2021-02-25 17:28:55 +09:00
Dean Herbert
e82eaffaed
Flip order back to original for romanisable strings
2021-02-25 14:14:07 +09:00
Dean Herbert
fa6d797adf
Remove redundant prefix
2021-02-24 20:30:17 +09:00
Dean Herbert
5dc0aefb2b
Cancel request on leaving results screen
2021-02-24 19:54:52 +09:00
Dean Herbert
8a97e2e28d
Update LocalisedString usages to RomanisedString
2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb
Apply changes to UI components overriding functions with changing signatures
2021-02-22 19:01:42 +09:00
Salman Ahmed
1f12b2bd09
Rename download state Downloaded
to Importing
2021-01-13 18:04:53 +03:00
Dean Herbert
b3f08b29ca
Ensure that all changes to screen backgrounds are on the correct thread
2021-01-05 15:22:50 +09:00
Dean Herbert
a3e4e2f6c3
Switch ResultsScreen and SongSelect inheritance and remove local implementation
2021-01-05 15:22:50 +09:00
smoogipoo
5b4197a9ef
Disable watching replays from realtime results screen
2020-12-21 00:14:54 +09:00
Bartłomiej Dach
b62a873502
Merge branch 'master' into remove-default-retry-balue
2020-11-22 10:54:40 +01:00
Bartłomiej Dach
875f986979
Remove default from base ResultsScreen too
2020-11-21 14:38:38 +01:00
Dean Herbert
2db42f8e67
Remove default allowRetry parameter value from ResultsScreen
2020-11-20 14:35:44 +09:00
Dean Herbert
8c32d3f781
Don't play flair animations / sounds when watching autoplay or viewing a result directly
...
I think this is a pretty good place to be for now. The flair will play
if you just watched a play (local, replay or spectator) but will not
play if you are coming from song select (viewing a replay's result
screen from the leaderboard) or in the case of autoplay.
Closes #10762 .
2020-11-20 14:32:31 +09:00
Dean Herbert
c5b172d0dd
Remove synchronous lookup path from BeatmapDifficultyCache
2020-11-06 14:53:15 +09:00
Dean Herbert
0103b12575
Add basic base class to begin to standardise function across caching components
2020-11-06 13:26:39 +09:00
Dean Herbert
14bb079feb
Rename ScorePerformanceManager to ScorePerformanceCache
2020-11-06 13:15:33 +09:00
Dean Herbert
5113d4af8f
Rename BeatmapDifficultyManager to BeatmapDifficultyCache
2020-11-06 13:14:29 +09:00
Dean Herbert
73b290aca3
Merge branch 'master' into results-dynamic-pp-calc
2020-11-02 14:47:33 +09:00
Lucas A
6bfff43634
Extract StatisticCounter to a separate class and use it instead.
2020-11-01 13:25:36 +01:00
Dean Herbert
6a293dd536
Add missing ctor parameters back
2020-10-31 18:56:30 +09:00
Dean Herbert
979eb1685b
Merge branch 'master' into results-screen-applause
2020-10-31 18:47:49 +09:00
Dean Herbert
46d89d55f4
Add note about ScheduleAfterChildren requirement
2020-10-30 12:47:04 +09:00
Dean Herbert
0c1d12460f
Remove unused parameter
2020-10-30 10:30:11 +09:00
Dean Herbert
404885af89
Merge branch 'results-screen-animate-once' into results-screen-applause
2020-10-29 18:52:54 +09:00
Dean Herbert
3491dea9e2
Fix scroll logic running before children may be alive in flow
2020-10-29 18:51:54 +09:00
Dean Herbert
f1b8a8f7f5
Remove unused using
2020-10-29 18:16:04 +09:00
Dean Herbert
0a0239a7c7
Only play results panel animation once (and only for the local user)
2020-10-29 17:08:59 +09:00
Dean Herbert
11f85779d5
Fix panel expanded state being updated multiple times unnecessarily
2020-10-29 17:08:59 +09:00
Dean Herbert
71e373ff51
Make results panels aware of whether they are a local score that has just been set
2020-10-29 17:08:59 +09:00
Dean Herbert
4a26084df8
Only play results panel animation once (and only for the local user)
2020-10-29 17:04:33 +09:00
Dean Herbert
f1ce09930e
Fix panel expanded state being updated multiple times unnecessarily
2020-10-29 17:03:45 +09:00
Dean Herbert
5d5b0221e5
Add skinning support for legacy applause playback
2020-10-29 16:32:29 +09:00
Dean Herbert
fb82c043a5
Add rank appear sound (new default)
2020-10-29 16:11:37 +09:00
Dean Herbert
a8e9c62583
Make results panels aware of whether they are a local score that has just been set
2020-10-29 16:11:25 +09:00
Dean Herbert
9141f48b04
Remove beatmap-based ctor to promote single flow
2020-10-23 14:57:27 +09:00
Lucas A
cf69eacae9
Make StarRatingDisplay dynamic.
2020-10-21 19:05:14 +02:00
Bartłomiej Dach
ba818e3ae0
Merge branch 'master' into results-dynamic-pp-calc
2020-10-19 21:41:07 +02:00
Bartłomiej Dach
68b505ab86
Extract helper function for pp value handling
2020-10-12 22:14:45 +02:00
Joehu
8faa86b048
Add ability to toggle extended statistics using space or enter
2020-10-10 18:32:22 -07:00
Lucas A
e845cc92b8
Round pp values to nearest integer.
2020-10-10 19:58:06 +02:00
Lucas A
de522d53ea
Make CalculatePerformanceAsync() nullable.
2020-10-10 19:16:21 +02:00
Dan Balasescu
a6d19cd2d6
Merge pull request #10431 from peppy/fix-distribution-graph-rounding
...
Fix incorrect timing distribution display due to lack of rounding
2020-10-09 18:12:29 +09:00
Dean Herbert
8be19fd820
Increase height of contracted score panel to fit mods again
2020-10-09 13:26:09 +09:00
Dean Herbert
ff5a1937f5
Fix test logic and stabilise rounding direction
2020-10-09 05:04:03 +09:00
Dean Herbert
a5b2c4195e
Fix incorrect timing distribution display due to lack of rounding
2020-10-09 04:41:45 +09:00
Lucas A
a425cf4a31
Fix broken class reference.
2020-10-07 13:29:10 +02:00
Lucas A
7f5cf04b2b
Fix merge conflicts.
2020-10-07 13:28:49 +02:00
Dean Herbert
f77ad8cf39
Remove unused using
2020-10-07 17:03:34 +09:00
Dean Herbert
31d347be5c
Make extended score panel taller to better fit all information
2020-10-07 16:50:00 +09:00
Dean Herbert
67398b5d95
Move timestamp text out of flow and attach to bottom edge
2020-10-07 16:30:14 +09:00
Dean Herbert
6ac70945f2
Show bonus judgements on expanded panel
2020-10-07 16:17:28 +09:00
Dean Herbert
c0bc6a75b3
Show auxiliary judgements on next line
2020-10-07 16:17:17 +09:00
Dean Herbert
e281d724b8
Consume display name logic
2020-10-07 15:43:52 +09:00
Bartłomiej Dach
2b1ef16f89
Replace comparison references to HitResult.Miss with IsHit
2020-10-02 23:31:24 +02:00
Lucas A
35f7de2084
Apply review suggestions.
2020-09-29 18:08:21 +02:00
Lucas A
6efc4c4250
Cache performance calculations to prevent recomputations.
2020-09-28 19:04:39 +02:00
Lucas A
ddede85704
Split performance calculation to its own class.
2020-09-27 12:44:29 +02:00
Lucas A
3cb9103fe0
Inherit PerformanceStatistic from CounterStatistic
2020-09-27 09:37:57 +02:00
Lucas A
4d94bf3163
Rename CalculateScorePerformance -> CalculatePerformance
2020-09-25 19:16:33 +02:00
Lucas A
77a9d92f42
Add dynamic pp calculation to score panels for local scores
2020-09-25 19:15:40 +02:00
smoogipoo
a07597c369
Adjust displays to use new results/orderings
2020-09-25 20:22:59 +09:00
Dan Balasescu
f84b5087bd
Merge pull request #10226 from peppy/results-fix-relayout-misalignment
...
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 15:50:31 +09:00
Dan Balasescu
02d8355321
Merge pull request #10224 from peppy/results-statistics-replay-button
...
Add more descriptive description and download button when statistics not available
2020-09-24 14:31:38 +09:00
Dean Herbert
5612357574
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 12:49:32 +09:00
Dean Herbert
fda6e88dd3
Fix braces style
2020-09-24 12:39:08 +09:00
Dean Herbert
cb903ec9e2
Fix extended statistics not being vertically centered
2020-09-24 12:21:46 +09:00
Dean Herbert
f4d2c2684d
Add more descriptive description and download button when statistics not available
2020-09-24 12:21:08 +09:00
smoogipoo
37a659b2af
Refactor/add xmldocs
2020-09-09 17:36:47 +09:00
smoogipoo
117c7ec6b2
Merge branch 'master' into score-recalc
2020-09-09 14:38:36 +09:00
Bartłomiej Dach
3ca2a7767a
Exclude misses and empty window hits from UR calculation
2020-08-31 14:29:37 +02:00
Bartłomiej Dach
3b22b891d1
Add failing test cases
2020-08-31 14:29:18 +02:00
Bartłomiej Dach
88ae9ca91d
Merge branch 'master' into fix-unhide-hud-not-updating-stats
2020-08-31 11:48:19 +02:00
Dean Herbert
a171d0e292
Remove unused methods and classes
2020-08-31 18:14:22 +09:00
Dean Herbert
abdb991923
Hide misses from timing distribution graph
2020-08-31 14:15:47 +09:00
Joehu
0a643fd5e5
Fix replay download button always being disabled when initial score's replay is unavailable
2020-08-29 09:33:01 -07:00
smoogipoo
c1838902a6
Add to more places
2020-08-28 22:51:48 +09:00
Bartłomiej Dach
6846a245f4
Reapply lost anchoring fix
2020-08-27 20:51:28 +02:00
Bartłomiej Dach
ea1f07e311
Simplify/rename SimpleStatisticRow mess
2020-08-27 20:37:10 +02:00
Bartłomiej Dach
ce013ac9b4
Make statistic header optional
2020-08-27 20:18:53 +02:00
Bartłomiej Dach
f152e1b924
Revert IStatisticRow changes
2020-08-27 20:13:44 +02:00
Bartłomiej Dach
f8042e6fd3
Add fade to prevent jarring transitions
2020-08-26 22:34:28 +02:00
Bartłomiej Dach
c3197da3da
Adjust simple statistic item font sizes
2020-08-26 22:34:28 +02:00
Bartłomiej Dach
d81d538b7e
Move out row anchor/origin set to one central place
2020-08-26 22:34:27 +02:00
Bartłomiej Dach
5973e2ce4e
Add component for unstable rate statistic
2020-08-26 22:06:27 +02:00
Bartłomiej Dach
7c3368ecbe
Reintroduce SimpleStatisticRow as a data class
2020-08-26 19:33:33 +02:00
Bartłomiej Dach
f5e52c80b4
Rename {-> Drawable}SimpleStatisticRow
2020-08-26 19:25:59 +02:00
Bartłomiej Dach
927a2a3d2d
Introduce IStatisticRow interface
2020-08-26 19:19:42 +02:00
Bartłomiej Dach
f09f882cc7
Add component for displaying simple statistics on result screen
2020-08-25 22:51:40 +02:00
Salman Ahmed
ee9fa11d14
Use With(s => ...)
extension for better readability
2020-08-19 07:47:02 +03:00
Salman Ahmed
9d10658e3c
Allow providing custom sprite text for RollingCounter<T>
2020-08-03 20:14:17 +03:00
smoogipoo
308f8bf9bf
Fix inverted naming
2020-07-31 23:11:42 +09:00
Dan Balasescu
d63f040477
Merge branch 'master' into multi-position
2020-07-31 23:10:25 +09:00
Dean Herbert
909b38a019
Merge branch 'master' into multi-pagination
2020-07-31 22:41:24 +09:00
smoogipoo
b361761d86
Add position display in contracted score panels
2020-07-31 22:02:25 +09:00
smoogipoo
17018ffa8b
Fix potentially triggering new requests too early
2020-07-31 21:33:04 +09:00
smoogipoo
9966d4f3b3
Add more loading spinners
2020-07-31 19:57:05 +09:00
smoogipoo
9f6446d836
Add xmldocs + refactoring
2020-07-28 21:45:12 +09:00
smoogipoo
42e88c53d7
Embed behaviour into UserCoverBackground
2020-07-28 20:50:55 +09:00
smoogipoo
54d2f2c8cd
Delay loading of cover backgrounds in score panels
2020-07-28 20:34:09 +09:00
smoogipoo
255b733fe8
Merge branch 'master' into multi-pagination
2020-07-28 20:20:54 +09:00
smoogipoo
46ea775cfb
Implement paging
2020-07-22 20:24:55 +09:00
Dean Herbert
cccb47e6e0
Add user cover background to expanded version of score panel
2020-07-22 11:29:23 +09:00
Dean Herbert
0125a7ef3b
Fix single-frame glitch in SS grade display animation
2020-07-15 15:36:17 +09:00
Joehu
daa7430fd8
Fix statistics screen blocking retry, home, and alt f4
2020-07-14 00:00:43 -07:00
Joehu
718f06c690
Use Mod.AdjustRank() instead
2020-07-02 12:35:32 -07:00
Joehu
fa252d5e95
Fix score panel not showing silver s/ss badges on hd/fl plays
2020-07-01 17:37:38 -07:00
Joehu
5c1f1ab622
Fix avatar in score panel being unclickable when statistics panel is visible
2020-07-01 14:31:06 -07:00
smoogipoo
1701c844a6
Fix scroll container height on smaller ui scales
2020-06-30 16:36:53 +09:00
Derrick Timmermans
bb81f908fb
Exclude EmptyHitWindow from being considered in TimingDistributionGraph
2020-06-29 15:53:56 +08:00
Dean Herbert
6bcc693c2f
Add ability to close statistics by clicking anywhere
2020-06-23 15:21:23 +09:00
smoogipoo
1bf00e0c82
Schedule continuation
2020-06-22 23:22:49 +09:00
smoogipoo
ff2f3a8484
Fix div-by-zero errors with autoplay
2020-06-22 20:32:04 +09:00
smoogipoo
5c4df2e32c
Cancel load on dispose
2020-06-22 20:20:42 +09:00
smoogipoo
988baad16f
Expand statistics to fill more of the screen
2020-06-22 19:20:43 +09:00
smoogipoo
261adfc4e6
Create a local playable beatmap instead
2020-06-22 18:38:41 +09:00
smoogipoo
3ede095b9c
Apply refactorings from review
2020-06-22 15:42:55 +09:00
smoogipoo
33fdd7466c
Merge branch 'master' into results-screen-statistics-overlapping-transition
2020-06-22 15:38:48 +09:00
smoogipoo
037bd3b463
Fix possible nullref
2020-06-19 22:48:21 +09:00
smoogipoo
4cb49cd606
Add minimum height to the timing distribution graph
2020-06-19 22:21:34 +09:00
smoogipoo
486b899e8f
Rename method
2020-06-19 22:11:29 +09:00
smoogipoo
25abdc2903
General cleanups
2020-06-19 21:41:48 +09:00
smoogipoo
8aea8267fb
Add some padding
2020-06-19 20:58:05 +09:00
smoogipoo
5ce2c712d3
Fix statistics not being wrapped by containers
2020-06-19 20:53:43 +09:00
smoogipoo
34a8fcfd2f
Fix potential off-by-one
2020-06-19 20:53:30 +09:00
smoogipoo
83e6c3efdb
Adjust API for returning statistics
2020-06-19 20:31:52 +09:00
smoogipoo
1cbbd6b442
Move timing distribution graph to osu.Game
2020-06-19 20:03:18 +09:00
smoogipoo
a3ff25177a
Asyncify statistics load
2020-06-19 19:12:55 +09:00
smoogipoo
55196efe6e
Fix panel depth ordering
2020-06-19 18:02:54 +09:00
smoogipoo
ec16b0fc5a
Rework score panel tracking to fix visual edge cases
2020-06-19 17:28:35 +09:00
smoogipoo
85a0f78600
Hide statistics panel on first exit
2020-06-18 22:48:52 +09:00
smoogipoo
53f507f51a
Fade background
2020-06-18 22:27:10 +09:00
smoogipoo
ecdfcb1955
Display placeholder if no statistics available
2020-06-18 22:21:30 +09:00
smoogipoo
6c8a24260b
Add padding
2020-06-18 17:06:05 +09:00
smoogipoo
c31a05977d
Re-implement statistics as a click-in panel
2020-06-18 16:50:45 +09:00
smoogipoo
725b2e540b
wip
2020-06-17 22:29:00 +09:00
smoogipoo
5e74985eda
Add scrolling capability to results screen
2020-06-17 19:28:40 +09:00
smoogipoo
e7687a0927
Temporary placement inside results screen
2020-06-16 17:49:43 +09:00
smoogipoo
a2ddb4edb4
Change interface for creating statistic rows
2020-06-16 17:49:28 +09:00
smoogipoo
89b54be673
Add initial implementation of the statistics panel
2020-06-15 22:45:18 +09:00
Dean Herbert
c3c5a99a22
Load imported scores to results screen rather than gameplay
2020-06-15 20:23:35 +09:00
smoogipoo
7b012f1def
Fix test failures
2020-06-11 14:55:49 +09:00
smoogipoo
05b1edb9d8
Fix incorrect beatmap showing
2020-06-09 19:01:02 +09:00
Dean Herbert
5d1770dec8
Merge pull request #9212 from smoogipoo/fix-scorepanel-input
...
Fix score panel not receiving input in some places
2020-06-05 00:26:02 +09:00
smoogipoo
afcefe01bf
Fix score panel not receiving input in some places
2020-06-04 21:48:55 +09:00
smoogipoo
5d7bb8cb4e
Change format of date on score panel
2020-06-04 21:33:38 +09:00
Shane Woolcock
b174daa94a
Remove unused using
2020-06-03 11:58:56 +09:30
Shane Woolcock
96e3c6e8e8
Move check to SoloResultsScreen
2020-06-03 11:36:47 +09:30
Shane Woolcock
90213d079d
Include submission status in check
2020-06-03 10:48:27 +09:30
Shane Woolcock
f4f84ede6a
Fix results screen crashing for beatmaps with no online ID
2020-06-03 10:43:16 +09:30
Dean Herbert
f2dadeeeb5
Allow horizontal scroll on results screen when not hovering expanded panel
2020-05-31 13:50:42 +09:00
smoogipoo
013461377e
Fix potential nullref
2020-05-28 21:46:02 +09:00
smoogipoo
47d5974f04
Improve results screen behaviour when changing selected score
2020-05-28 21:40:01 +09:00
smoogipoo
ad99d85468
Resolve several positioning errors
2020-05-28 21:29:16 +09:00
smoogipoo
666cbd0f40
Allow selected score to be programmatically changed
2020-05-28 21:09:03 +09:00
smoogipoo
a55ce26130
Allow null score
2020-05-28 20:46:17 +09:00
smoogipoo
c07a33b24f
Fix ctor accessibility
2020-05-26 17:31:50 +09:00
smoogipoo
de0b6ec9f1
Create abstract implementation
2020-05-26 17:00:41 +09:00
smoogipoo
c86a003ef9
Adjust transition for smaller sizes
2020-05-26 16:27:41 +09:00
smoogipoo
906a317a3d
Reduce casting
2020-05-26 16:26:53 +09:00
smoogipoo
1768cbd131
Format score same as expanded panel
2020-05-26 15:56:56 +09:00
smoogipoo
80388feac4
Disable scroll user scroll controls in list
2020-05-22 20:39:02 +09:00
smoogipoo
6bcc4c95cc
Schedule api callback
2020-05-22 20:19:23 +09:00
smoogipoo
899b9f8060
Fix incorrect sorting order
2020-05-21 22:26:04 +09:00
smoogipoo
45244683de
Fix scrolling (1-frame + maintain scroll position)
2020-05-21 22:07:06 +09:00
smoogipoo
d0f74c2b68
Refactor initial state
2020-05-21 20:48:25 +09:00
smoogipoo
7b82a5d792
Fix score order
2020-05-21 20:48:08 +09:00
smoogipoo
717869225e
Rework list to use a scroll container + add spacing
2020-05-21 19:51:36 +09:00
smoogipoo
b6a1d1a2fc
Improve transforms between state changes
2020-05-21 18:07:31 +09:00
smoogipoo
700b5e0c73
Adjust design
2020-05-21 17:47:27 +09:00
smoogipoo
acba1f3ad6
Integrate score panel list into results screen
2020-05-20 23:46:54 +09:00
smoogipoo
1b8d657ead
Implement score panel list
2020-05-20 23:46:47 +09:00
smoogipoo
e3c1112b5a
Initial integration into results screen
2020-05-16 19:00:20 +09:00
smoogipoo
8c5ccf574b
Add better fix for 1px bleed
2020-05-16 18:33:21 +09:00
smoogipoo
2bde4fc3ee
Initial implementation of contracted score panel
2020-05-16 18:20:19 +09:00
Joehu
700214d249
Truncate beatmap title and artist on score panel
2020-04-30 22:13:38 -07:00
Joehu
88cc552534
Fix results star rating display not being centered when no mods are present
...
Needed or the spacing will apply to the fill flow container, causing alignment issues.
2020-04-03 11:30:22 -07:00
Joehu
493b654011
Remove horizontal margin from mod display
...
Can skew center alignment on fill flow containers.
Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.
2020-04-03 11:30:02 -07:00
Dean Herbert
113660b621
Merge if statements
2020-03-30 18:56:35 +09:00
Dean Herbert
6e68b968f8
Hide "retry" button on results screen after watching a replay
2020-03-29 23:52:50 +09:00
Dean Herbert
66a990cd5e
Remove redundant this
2020-03-29 23:50:16 +09:00
Dean Herbert
653480b2f8
Add regression test
2020-03-29 23:29:46 +09:00
Dean Herbert
c50784da93
Show 'D' rank badge on accuracy circle
2020-03-19 11:58:52 +09:00
Dean Herbert
90e1f6efbf
Merge pull request #8341 from smoogipoo/score-panel-scrolling
...
Make score panel scroll if off-screen
2020-03-18 19:00:48 +09:00
Dean Herbert
25983cfe0e
Merge pull request #8340 from smoogipoo/results-date-played
...
Add date played to score panel
2020-03-18 18:55:26 +09:00
Dean Herbert
6c45694f01
Merge pull request #8338 from smoogipoo/colourise-hit-statistics
...
Colourise results screen hit statistics
2020-03-18 18:55:10 +09:00
smoogipoo
1d211cb563
Make score panel scroll if off-screen
2020-03-18 18:28:42 +09:00
smoogipoo
63531a8564
Add date played to score panel
2020-03-18 17:59:44 +09:00
smoogipoo
66558ca8c5
Colourise hit result statistics
2020-03-18 17:26:17 +09:00
Dan Balasescu
e1e0c40020
Merge branch 'master' into fix-perfect-display
2020-03-18 17:04:52 +09:00
Dean Herbert
ed419216f0
Merge pull request #8323 from skielred/acc-circle-use-osucolour
...
Re-use colors defined for each rank in result screen accuracy circle
2020-03-18 16:29:24 +09:00
Dean Herbert
fdcb60706b
Use TryGetValue to make tests happy
2020-03-18 15:49:24 +09:00
Dean Herbert
44cfed8af1
Fix perfect display showing when misses are present
2020-03-18 15:03:01 +09:00
Dan Balasescu
27f7808a86
Merge pull request #8320 from recapitalverb/fix-mapper-alignment
...
Fix mapper info alignment in score panel
2020-03-18 10:59:05 +09:00
Joehu
3c07f73c7b
Fix results' beatmap title and artist language setting being swapped
2020-03-17 17:32:58 -07:00
recapitalverb
139ae2bc1e
Use existing variables instead
2020-03-18 01:24:58 +07:00
Tina
100c9d422f
Re-use colors defined for each rank in result screen accuracy circle
2020-03-17 18:55:30 +01:00
recapitalverb
431571dfa0
Check nulls
2020-03-18 00:15:43 +07:00
recapitalverb
d18b21ba32
Use local variable for metadata instead
2020-03-17 23:23:51 +07:00
recapitalverb
99409fb7d1
Fix mapper info alignment in score panel
2020-03-17 23:02:39 +07:00
recapitalverb
592d8cbd13
Fix mapper name in score panel
2020-03-17 22:45:28 +07:00
Dean Herbert
dd3a6c5673
Use working beatmap to retrieve metadata for now
2020-03-17 23:13:31 +09:00
Dean Herbert
27cc68152d
Fix potentially missing metadata on local score display
2020-03-17 22:54:02 +09:00
Dean Herbert
24b944fc8e
Make footer buttons wider
2020-03-17 22:24:28 +09:00
Dean Herbert
48cbec7a31
Add scroll view because
2020-03-17 22:21:16 +09:00
Dean Herbert
2d6dcb3ba9
Merge branch 'master' into results-screen
2020-03-17 22:03:36 +09:00
Dean Herbert
b27bb4aeae
Merge branch 'master' into results-middle-content
2020-03-17 21:37:23 +09:00
Dean Herbert
75695938e2
Merge branch 'master' into results-top-content
2020-03-17 20:42:02 +09:00
Dean Herbert
3b9c64b76f
Merge branch 'master' into results-scorepanel
2020-03-17 20:06:11 +09:00
Dean Herbert
df119eb95a
Adjust animations
2020-03-17 18:04:38 +09:00
Dean Herbert
f06c170d63
Display SS badge earlier (when entering virtual ss area)
2020-03-17 18:04:15 +09:00
smoogipoo
6f569d1485
Fix colour conflicts for expert-plus
2020-03-17 18:01:46 +09:00
smoogipoo
86a336d585
Add back retry overlay
2020-03-17 17:45:25 +09:00
smoogipoo
1c4296f5e7
Implement the new results screen
2020-03-17 17:43:16 +09:00
smoogipoo
afed01d781
Merge branch 'results-middle-content' into results-screen
2020-03-17 17:35:40 +09:00
smoogipoo
6f801e1695
Add xmldoc
2020-03-17 17:35:14 +09:00
smoogipoo
2ee480f1d8
Add xmldocs / cleanup
2020-03-17 17:34:16 +09:00
smoogipoo
1521f25c96
Implement middle panel contents
2020-03-17 17:25:24 +09:00
smoogipoo
19106daf8b
Merge branch 'results-circle' into results-middle-content
2020-03-17 17:09:15 +09:00
smoogipoo
7cc1a6040f
Implement top panel contents
2020-03-17 17:01:38 +09:00
smoogipoo
05789e6fe4
Implement the score panel
2020-03-17 16:59:34 +09:00
smoogipoo
dca2e1d816
Implement the accuracy circle
2020-03-17 16:37:56 +09:00
TheWildTree
2770fb71b2
Use SortedStatistics where needed
2020-02-07 21:12:21 +01:00
recapitalverb
9898a926b2
Use ScoreInfo.DisplayAccuracy everywhere
2020-02-03 22:11:36 +07:00
Dean Herbert
cd5290b030
Enforce using get-only auto property where possible
2020-01-20 13:50:27 +09:00
Revel
a86fb2113e
fix tooltip capitalization
2020-01-14 14:26:54 -05:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info
2019-12-04 11:47:27 +09:00
Dean Herbert
f0d49d0cdf
Decouple APILegacyScoreInfo from ScoreInfo
2019-12-03 15:31:11 +09:00
Dean Herbert
b51ebe4431
Fix ScoreResultsPage usage
2019-11-29 15:50:50 +09:00
Dean Herbert
2663e5d756
Add some more missing LongRunningLoad flags
2019-11-29 13:52:23 +09:00
Dean Herbert
4063135a3a
Fix result mode button's corner exponent
2019-11-22 20:45:05 +09:00
Bartłomiej Dach
539f8ad6dd
Remove overlay when viewing leaderboard scores
...
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
2019-11-04 01:57:31 +01:00
Dan Balasescu
5be7d439ae
Add null check for nullable dependency
2019-11-02 10:32:23 +09:00
Dean Herbert
156d0ae9b9
Remove braces
...
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2019-11-01 16:08:44 +09:00
Dean Herbert
14453da1d2
Centralise MakeCurrent call
2019-11-01 15:51:10 +09:00
Dean Herbert
c532f77657
Add hold-to-retry support to results
2019-11-01 15:49:42 +09:00
Dean Herbert
84d17f3702
Add retry button
2019-11-01 15:41:51 +09:00
Dean Herbert
14fec6f1f3
Move ReplayDownloadButton to correct namespace
2019-11-01 15:06:36 +09:00
Dean Herbert
e5b5d286fd
Increase spacing to closer match the design
2019-10-25 12:48:34 +09:00
Dean Herbert
07f7944fc6
Fix DateTime display sizing on results screen
2019-10-25 12:22:19 +09:00
Dean Herbert
a6ddcd78d4
Fix results screen not showing first tab correctly
2019-07-18 01:08:12 +09:00
naoey
ee516d2515
Make direct panel download and replay buttons share UI
2019-07-02 15:55:30 +05:30
naoey
424711d24b
Fix replay button shake container
...
- Add license headers
- Slightly reduce bottom margin of button in score screen
2019-06-29 12:26:37 +05:30
naoey
bc52f76556
Move replay button to score card
2019-06-29 10:55:30 +05:30
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +09:00
KingLuigi4932
794ba17a2f
Seperate UpdateableRank from DrawableRank and use it
2019-06-17 20:04:09 +03:00
Dean Herbert
e87123342c
Load results pages asynchronously
...
Reduces performance burden when first displaying pages. Closes #4977 .
2019-06-10 23:51:09 +09:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f
Adjust namespaces
2019-04-02 14:51:28 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
David Zhao
15637f9c4a
Rework instant blur logic such that updateVisuals doesn't need to be public
2019-03-20 14:17:35 +09:00
David Zhao
8cdfb1fd61
Remove BlurrableBackgroundScreen, rework tests
2019-03-14 16:09:17 +09:00
David Zhao
8714902349
Handle all blurring directly from background
2019-03-14 14:02:46 +09:00
David Zhao
de6d8fc637
Move user blurring into VIsualSettingsContainer
2019-03-13 18:25:22 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
smoogipoo
4db5531e4b
Replace copy-constructor/method with extension method
2019-02-20 19:32:30 +09:00
smoogipoo
dbfa95b9e7
Made medium the default font weight
2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Dean Herbert
67e200e1b2
Leaderboard design updates
2018-12-27 15:52:40 +09:00
Dean Herbert
005c6ff40c
Add tooltip text to results screen pages
2018-12-22 16:30:06 +09:00
Dean Herbert
a35d9178f0
Quick rename
2018-12-22 16:20:29 +09:00
Dean Herbert
e7508cbd5e
Fix CI issues
2018-12-22 15:55:10 +09:00
Dean Herbert
e404a0bc20
Clean-ups and renames
2018-12-22 15:51:00 +09:00
smoogipoo
daa6292e08
Split results screen to allow for extensibility
2018-12-22 15:39:06 +09:00
smoogipoo
e657f13c15
Separate out Leaderboard into BeatmapLeaderboard
2018-12-22 14:44:36 +09:00
Dean Herbert
94045413ce
Change statistics to be int for now
2018-12-05 19:44:01 +09:00
Dean Herbert
3727955911
Refactors/renames
2018-11-30 16:35:45 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
5b409a5ae5
Fix missed renames
2018-11-28 17:27:22 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
28f31540c4
Apply changes in-line with framework localisation changes
2018-09-19 14:07:46 +09:00
smoogipoo
92386edb32
Scale the results screen score to keep it in view
2018-09-10 18:13:44 +09:00
Dean Herbert
f149a66a4d
Use LargeTextureStore for all online texture retrieval
...
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885 .
2018-09-09 02:45:37 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
smoogipoo
5be46307fd
Fix results screen parallax being cut off
...
Alternative to / closes #2549 .
Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Dean Herbert
36a671e306
Fix new detections in rider 2018.1
2018-04-23 14:56:45 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
2079b7239c
Merge branch 'master' into result-page-date-order
2017-12-31 13:11:55 +09:00
Aergwyn
3d66b879a7
use ToShortTimeString to create a time depending on current culture
2017-12-30 22:45:28 +01:00
Aergwyn
2a0699f13c
use ToShortDateString to create a date depending on current culture
2017-12-30 22:41:01 +01:00
Aergwyn
0dad9cbe53
change date to be more friendly to read
2017-12-30 21:49:05 +01:00
Aergwyn
d6af8ad748
swap date and time in ResultsPageScore
2017-12-30 21:48:49 +01:00
Aergwyn
61bbb66996
sort resultpage hitresults descending
...
HitCount was good to bad but HitResult is the opposite. To account for this just descending order on the result page.
2017-12-30 21:27:15 +01:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Aergwyn
1ef4ff6776
order statistics before adding to resultpage
2017-12-30 18:07:53 +01:00
Aergwyn
138d78309f
add HitCount enum and replace string usage with enum
2017-12-30 18:07:30 +01:00
Dean Herbert
3182c22c7d
Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info
2017-12-26 20:36:22 +09:00
Dean Herbert
3c1654e5e4
Fix many instances of non-osu-prefixed text classes being used
...
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Aergwyn
6a8fd74e05
fix failing tests
...
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Aergwyn
0b5614e4ee
fix result screen not showing name of mapper
2017-11-18 22:12:15 +01:00
Dean Herbert
6fa02ce9bb
Use internal less
...
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
4eaf6b4b94
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
2017-09-28 00:14:04 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32
Use Colour instead of ColourInfo
2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737
Try different formatting style
2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4
Replace several usages of BeginDelayedSequence with LINQ-style
2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Dean Herbert
54f6befd67
Merge branch 'master' into fix-track-rotation
2017-07-12 13:18:16 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Dean Herbert
9bbcc0526d
Disable beatmap changes in specified screens
2017-07-11 18:39:10 +09:00
Thomas Müller
40225238d9
Set RelativeSizeAxes for updated FillMode behavior
2017-06-28 12:24:23 +03:00
Thomas Müller
1bca9ca0e9
Update framework with better children list
2017-06-24 12:56:35 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
3efe8629d6
Fix hacky tabs
2017-06-12 18:39:22 +09:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
John Neijzen
4abad17b92
Fix Black Space after } and Symbol Spacing
2017-06-08 14:48:42 +08:00
John Neijzen
431d225a60
Keyword Spacing and Brackets Fixing
2017-06-08 14:35:10 +08:00
Huo Yaoyuan
d929de466a
DateDisplay -> DateTimeDisplay for more exactly.
2017-05-16 21:16:52 +08:00
Huo Yaoyuan
d213706d07
Use DateTimeOffset.
2017-05-16 21:14:50 +08:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
smoogipooo
c95a6fbd09
Use single line for GetUnicodePreference.
2017-04-28 14:14:14 +09:00
Dan Balasescu
658ff61e8a
Merge branch 'master' into locale
2017-04-28 13:51:36 +09:00
Dean Herbert
94c259bd59
Remove most usages of DelayReset
...
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09:00
Huo Yaoyuan
4cb18361c1
Use localisation engine for unicode text.
2017-04-26 19:50:38 +08:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
...
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
c7411c47d6
Update User API stuff.
2017-04-20 19:51:28 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary).
2017-04-20 11:03:11 +09:00
Dean Herbert
015eacb3b8
Merge branch 'results-screen' into score-statistics
2017-04-19 20:51:23 +09:00
Dean Herbert
7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen
...
# Conflicts:
# osu.Game/Users/User.cs
2017-04-19 20:51:05 +09:00
Dean Herbert
1f7ed72dc6
Update font/size.
2017-04-19 17:32:30 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!).
2017-04-19 16:29:27 +09:00
Dean Herbert
2f53f2e248
Add license headers.
2017-04-18 22:35:21 +09:00
Dean Herbert
49f4981f1c
Fix CI issues.
2017-04-18 22:28:16 +09:00
Dean Herbert
2bf560a371
Disable page three for now.
2017-04-18 22:22:14 +09:00
Dean Herbert
e8d55b5bb5
Add back button.
2017-04-18 22:22:14 +09:00
Dean Herbert
4a3fc710c4
Add temporary combo/accuracy display.
2017-04-18 22:22:14 +09:00
Dean Herbert
f1bd64a74d
Adjust colour metrics.
2017-04-18 22:22:14 +09:00
Dean Herbert
32df625d82
Adjust text size and padding.
2017-04-18 22:22:14 +09:00
Dean Herbert
28835bd5bd
Add back comma separator to score display.
2017-04-18 22:22:14 +09:00
Dean Herbert
782019e0c7
Make line gradient correct.
2017-04-18 22:22:14 +09:00
Dean Herbert
886ac1fb40
Add progress graph background and update ruleset references.
2017-04-18 22:22:14 +09:00
Dean Herbert
968d46a10f
whitespace.
2017-04-18 22:22:14 +09:00
Dean Herbert
49fc91cf37
Add an exit transition.
2017-04-18 22:22:14 +09:00
Dean Herbert
72fcc09a98
Add beatmap info and score date.
...
Also adjusts design metrics.
2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen.
2017-04-18 22:22:14 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01:00
Thomas Müller
4d28696479
FlowDirection -> FillDirection
2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465
Update framewörk
2017-03-01 19:33:01 +01:00
default0
03889e6ca6
Update References to FlowStrategies
...
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
default0
8d91519d59
Update usage of FlowContainer and its subclasses
2017-02-26 21:32:43 +01:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing.
2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
Dean Herbert
74e3a87f78
Add *very* basic ranking screen.
2016-11-29 23:59:56 +09:00
Dean Herbert
9871960112
Basic score flow.
2016-11-29 17:34:16 +09:00
Dean Herbert
0f4538f69f
Rename GameModes namespace to Screens.
2016-11-14 17:23:33 +09:00