iiSaLMaN
|
0fcc6c1676
|
Add DimLevel property
|
2019-08-08 22:13:48 +03:00 |
|
iiSaLMaN
|
bedb744a2e
|
Add parentheses
|
2019-08-08 17:11:26 +03:00 |
|
iiSaLMaN
|
88b9942b2a
|
Move EnableUserDim check to defualt value of ShowDimContent
|
2019-08-08 17:07:06 +03:00 |
|
Dean Herbert
|
2172c5a52b
|
Merge branch 'master' into use-bindable-break-time-in-player
|
2019-08-08 14:24:52 +09:00 |
|
Dean Herbert
|
7d42561da9
|
Remove linq usage in BreakOverlay update
|
2019-08-08 12:58:20 +09:00 |
|
Salman Ahmed
|
3f9f9e7bc9
|
Merge branch 'master' into use-bindable-break-time-in-player
|
2019-08-08 05:36:45 +03:00 |
|
Dean Herbert
|
99f5ca07ce
|
Remove redundant comment
|
2019-08-08 10:42:54 +09:00 |
|
Dean Herbert
|
40a33b3382
|
Move IsLoaded check to more correct place
|
2019-08-08 10:41:23 +09:00 |
|
Dean Herbert
|
a2e3ab6463
|
Merge branch 'master' into add-bindable-for-break-times
|
2019-08-08 10:13:14 +09:00 |
|
iiSaLMaN
|
ba269a49ee
|
Expose break fade duration and add it in the calculation
|
2019-08-07 16:59:35 +03:00 |
|
iiSaLMaN
|
d3657d82cd
|
Simplify final check for break time
|
2019-08-07 16:28:16 +03:00 |
|
iiSaLMaN
|
c2b3c28c79
|
Use IsBreakTime for checking if currently in a break
Rather than iterating over all breaks to find which is in current time
|
2019-08-07 16:15:53 +03:00 |
|
Dean Herbert
|
dda078277a
|
Minor variable name changes
|
2019-08-06 23:05:12 +09:00 |
|
iiSaLMaN
|
2a68bb2749
|
onCompletionEvent -> pushResults
|
2019-08-06 14:11:43 +03:00 |
|
iiSaLMaN
|
dd701eaa62
|
Safely cancel the completion task on restart or immediate exit
|
2019-08-06 14:10:03 +03:00 |
|
iiSaLMaN
|
e6e315e07b
|
Expose current break index
|
2019-07-30 13:29:41 +03:00 |
|
iiSaLMaN
|
5bf0277fd4
|
Remove unnecessary quick check
Not saving for anything
|
2019-07-28 09:17:13 +03:00 |
|
iiSaLMaN
|
1dd3a66300
|
Remove unnecessary index resets
|
2019-07-28 09:16:19 +03:00 |
|
iiSaLMaN
|
95b568eb46
|
Remove unnecessary condition
|
2019-07-27 15:52:30 +03:00 |
|
iiSaLMaN
|
6c580ac9d5
|
Use while loops instead
|
2019-07-27 15:52:01 +03:00 |
|
Salman Ahmed
|
934439e138
|
Merge branch 'master' into add-bindable-for-break-times
|
2019-07-26 12:57:52 +03:00 |
|
iiSaLMaN
|
4c9e8527d8
|
Modify global index directly in the for loop
Moves the global index to a near break if not in a break yet
|
2019-07-26 09:24:53 +03:00 |
|
iiSaLMaN
|
5a94a22314
|
Add a quick check if we're not in a break with current index
|
2019-07-26 09:17:39 +03:00 |
|
iiSaLMaN
|
3fa6804501
|
Use better loops for moving index
Easy to read, suggested by peppy
|
2019-07-26 08:12:32 +03:00 |
|
iiSaLMaN
|
806d41daf4
|
Add function to reset break index
|
2019-07-26 08:11:13 +03:00 |
|
iiSaLMaN
|
91fa8a6552
|
Simplify null and any check
|
2019-07-26 08:09:18 +03:00 |
|
iiSaLMaN
|
44895c4b69
|
Use IReadOnlyList for break periods list
|
2019-07-26 05:41:10 +03:00 |
|
iiSaLMaN
|
b4c93b1777
|
Use lookup direction than 2 while loops
|
2019-07-26 05:11:01 +03:00 |
|
iiSaLMaN
|
a08d54eb06
|
Remove unnecessary checks
|
2019-07-26 03:11:59 +03:00 |
|
Shane Woolcock
|
1d6c321e14
|
Ensure we don't ping-pong nearestBreakIndex between breaks
|
2019-07-26 08:34:18 +09:30 |
|
Shane Woolcock
|
5e51012800
|
Rewrite updateBreakTimeBindable
|
2019-07-25 22:54:05 +09:30 |
|
iiSaLMaN
|
cdda264c49
|
Use global index and move it to find if break time
Avoid using iterations
|
2019-07-25 12:28:21 +03:00 |
|
iiSaLMaN
|
5a55433d6c
|
Return if breaks are null
Fixes a test
|
2019-07-25 11:53:32 +03:00 |
|
iiSaLMaN
|
172a9ce33a
|
Use a for loop instead of foreach
avoid allocating an iterator
|
2019-07-25 11:40:45 +03:00 |
|
iiSaLMaN
|
9bd66b6e7a
|
Better xmldoc
|
2019-07-25 11:27:32 +03:00 |
|
iiSaLMaN
|
69d2f57f4f
|
Avoid using LINQ
|
2019-07-25 11:27:01 +03:00 |
|
iiSaLMaN
|
0ea0a10ca4
|
Expose as IBindable<bool>
|
2019-07-25 11:26:38 +03:00 |
|
iiSaLMaN
|
7b82d184bd
|
Add bindable boolean for break times
|
2019-07-25 11:07:53 +03:00 |
|
Dan Balasescu
|
986031e127
|
Merge branch 'master' into storyboard-clock-di
|
2019-07-12 23:14:12 +09:30 |
|
Dean Herbert
|
8b67f88d16
|
Don't expose dimmable container creation in player
|
2019-07-12 12:04:45 +09:00 |
|
Dean Herbert
|
46f7bb885b
|
Move classes to local namespaces
Also renames test scene to more appropriate name.
|
2019-07-12 11:50:06 +09:00 |
|
Dean Herbert
|
ecbd0f7eff
|
Merge branch 'master' into fix-skip-button-clickability
|
2019-07-11 23:10:28 +09:00 |
|
David Zhao
|
6c0de0b436
|
Merge remote-tracking branch 'upstream/master' into storyboard-clock-di
|
2019-07-11 13:33:35 +09:00 |
|
David Zhao
|
321266e96f
|
Make UserDimContainer abstract
|
2019-07-11 13:17:28 +09:00 |
|
David Zhao
|
7929104b8a
|
move default into StoryboardContainer, fix load bug, remove comment
|
2019-07-10 12:24:05 +09:00 |
|
David Zhao
|
41afe89c0b
|
delete no longer needed bindable
|
2019-07-10 00:46:34 +09:00 |
|
David Zhao
|
5bb21ecae0
|
remove storyboard region
|
2019-07-09 16:50:37 +09:00 |
|
David Zhao
|
89cb8a0cac
|
Move storyboard initialization to new StoryboardContainer
|
2019-07-09 16:23:59 +09:00 |
|
Dean Herbert
|
8a98aff318
|
Merge branch 'master' into replay-local-mods
|
2019-07-08 22:38:02 +09:00 |
|
Dean Herbert
|
54f5e6aedf
|
Add assertion and comment about lease logic
|
2019-07-08 22:37:39 +09:00 |
|
David Zhao
|
0cf4bf2352
|
Manually set clock for storyboard if loading before being given a parent
|
2019-07-08 18:46:12 +09:00 |
|
David Zhao
|
d489a77fe1
|
remove new container and comment
|
2019-07-08 17:57:29 +09:00 |
|
David Zhao
|
fbd300e664
|
Move ruleset into ReplayPlayerLoader as well
|
2019-07-08 17:37:20 +09:00 |
|
David Zhao
|
e78e326f34
|
remove unused using
|
2019-07-08 17:02:42 +09:00 |
|
David Zhao
|
ef22ab9340
|
remove bindable
|
2019-07-08 16:32:11 +09:00 |
|
David Zhao
|
6a86f62d17
|
Get mods from score info
|
2019-07-08 16:13:03 +09:00 |
|
David Zhao
|
5853a877c2
|
create base dependencies before caching, create player in playerloader
|
2019-07-08 15:40:10 +09:00 |
|
David Zhao
|
2747d7692b
|
Create ReplayPlayerLoader for local mod caching
|
2019-07-08 14:55:05 +09:00 |
|
Dean Herbert
|
8f2ec73626
|
Move logic inside of HUDOverlay
Add vertical offset adjust.
|
2019-07-07 05:30:53 +09:00 |
|
Salman Ahmed
|
dfabed3d85
|
Merge branch 'master' into applicable-to-hud
|
2019-07-06 16:30:02 +03:00 |
|
Dan Balasescu
|
3a9f16ccf2
|
Merge branch 'master' into idle-still-starts
|
2019-07-06 00:08:59 +09:30 |
|
Dean Herbert
|
b902457f8d
|
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel
|
2019-07-05 15:32:07 +09:00 |
|
iiSaLMaN
|
d624157c45
|
Remove unnecessary fading
|
2019-07-05 05:17:36 +03:00 |
|
Dean Herbert
|
db24ac28ec
|
Add tests
|
2019-07-04 16:53:08 +09:00 |
|
Dean Herbert
|
a20d5baa57
|
Fix skip button not being clickable after fade out
|
2019-07-04 16:21:01 +09:00 |
|
Dean Herbert
|
23acddcb56
|
Rename download buttons to avoid ambiguity
|
2019-07-03 12:02:35 +09:00 |
|
Salman Ahmed
|
8b4ef52c13
|
Revert unnecessary changes
|
2019-07-03 07:27:24 +03:00 |
|
naoey
|
eaa19d5a49
|
Remove unused/unnecessary fields
|
2019-07-02 16:13:47 +05:30 |
|
naoey
|
ee516d2515
|
Make direct panel download and replay buttons share UI
|
2019-07-02 15:55:30 +05:30 |
|
Dean Herbert
|
6539c6da17
|
Merge branch 'master' into watch-replays-4
|
2019-07-02 13:24:16 +09:00 |
|
Salman Ahmed
|
744e651a37
|
Merge branch 'master' into applicable-to-hud
|
2019-07-02 05:24:56 +03:00 |
|
Salman Ahmed
|
6a79349f4a
|
Move health display out of the visibility container
|
2019-07-02 02:19:59 +03:00 |
|
Dean Herbert
|
60ea3d4e1a
|
Fix skinning support for combobreak
|
2019-06-30 21:58:30 +09:00 |
|
naoey
|
bfcbb47b77
|
Clean up some more leftover code
|
2019-06-30 10:56:20 +05:30 |
|
welsar55
|
d6561531a3
|
Merge branch 'master' into combobreak
|
2019-06-29 11:55:10 -05:00 |
|
Welsar55
|
a22c166575
|
Make ComboEffects its own class
|
2019-06-29 11:28:40 -05:00 |
|
naoey
|
d8f6bbc90e
|
Disable replay button when replay is unavailable
|
2019-06-29 12:49:03 +05:30 |
|
naoey
|
7d9e215744
|
Code quality fixes
|
2019-06-29 12:29:12 +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 |
|
Welsar55
|
a57218e50e
|
Move to LocalSkinOverride
|
2019-06-28 20:45:11 -05:00 |
|
iiSaLMaN
|
d37cefbad8
|
Implement IApplicableToHUD
|
2019-06-29 04:23:59 +03:00 |
|
naoey
|
53d6d74537
|
Update to match upstream changes
|
2019-06-28 09:33:13 +05:30 |
|
naoey
|
ab0bb8b678
|
Implement replay downloading with ArchiveDownloadModelManager
|
2019-06-28 09:33:13 +05:30 |
|
Welsar55
|
826699a7e7
|
Remove unneeded bindable
|
2019-06-26 12:16:44 -05:00 |
|
Welsar55
|
7dd1479050
|
Add combobreak sound
|
2019-06-26 00:20:33 -05:00 |
|
Dean Herbert
|
40cf573368
|
Fix pause not correctly showing pause screen
|
2019-06-25 23:15:58 +09:00 |
|
Dean Herbert
|
f9dad0f640
|
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
|
2019-06-25 20:23:49 +09:00 |
|
smoogipoo
|
8c96e4c1fa
|
Move back button to OsuGame
|
2019-06-25 18:33:08 +09:00 |
|
Dean Herbert
|
7bc7df2249
|
Reduce background brightness at PlayerLoader
|
2019-06-25 17:22:10 +09:00 |
|
Dean Herbert
|
f91467eddc
|
Fix licence header
|
2019-06-24 18:34:23 +09:00 |
|
Dean Herbert
|
fad1ced1b5
|
Add correct conditionals to allow exit
|
2019-06-24 18:15:27 +09:00 |
|
Dean Herbert
|
d70248338d
|
Merge remote-tracking branch 'upstream/master' into quickEscape
|
2019-06-24 18:14:48 +09:00 |
|
Dean Herbert
|
26d5c2d85a
|
Remove local implementation of bindable in OsuCheckbox
|
2019-06-17 19:37:24 +09:00 |
|
Dean Herbert
|
021d0273f9
|
Split out user activity from user status (#4619)
Split out user activity from user status
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-12 20:14:03 +09:00 |
|
Dean Herbert
|
20b43c20c8
|
Rename variables to remove redundant "screen" terminology
|
2019-06-12 16:33:15 +09:00 |
|
Dean Herbert
|
a9c229b1ec
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-12 16:00:35 +09:00 |
|
Lucas A
|
15893bbb75
|
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
|
2019-06-11 19:41:48 +02:00 |
|
Dean Herbert
|
606be3d7ce
|
Merge branch 'master' into backgrounded-beatmap-status-lookups
|
2019-06-12 00:22:47 +09:00 |
|
Dean Herbert
|
00ee45fe46
|
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
|
2019-06-11 19:36:13 +09:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
Lucas A
|
141775d98c
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-10 21:41:00 +02:00 |
|
smoogipoo
|
f090e292c9
|
Move ArchiveModelManager import process to async flow
|
2019-06-10 13:42:22 +09:00 |
|
Dean Herbert
|
5c2ea0b1a7
|
Move dispose to end of file
|
2019-06-10 01:14:46 +09:00 |
|
Dean Herbert
|
d964f6ba9e
|
Tween track frequency on pause
|
2019-06-10 00:56:35 +09:00 |
|
Lucas A
|
a2bc5b538e
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-05 16:59:38 +02:00 |
|
Dean Herbert
|
9c214c3f0e
|
Add animation on failing
|
2019-06-04 16:13:16 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +09:00 |
|
Lucas A
|
a819dd764f
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-25 11:02:19 +02:00 |
|
Dean Herbert
|
359e5b71a5
|
Fix race condition causing player to never restart
|
2019-05-16 17:13:03 +09:00 |
|
Lucas A
|
55663b3576
|
Nest all UserActivities into UserActivity
|
2019-05-12 17:38:02 +02:00 |
|
Lucas A
|
5ac6bd8204
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-12 11:53:30 +02:00 |
|
Dean Herbert
|
038e49701e
|
Move conditional to within BreakPeriod
|
2019-05-12 16:25:25 +09:00 |
|
Dean Herbert
|
1391aa342c
|
Merge branch 'master' into break-pause
|
2019-05-12 16:15:24 +09:00 |
|
smoogipoo
|
bde2d552b6
|
Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
# Conflicts:
# osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
|
2019-05-10 22:16:59 +09:00 |
|
smoogipoo
|
01eb1a34a9
|
Remove unused variable
|
2019-05-10 22:15:33 +09:00 |
|
smoogipoo
|
d2479acbf2
|
Fix incorrect value being clamped
|
2019-05-10 18:04:58 +09:00 |
|
Dean Herbert
|
fdf67aaa11
|
Clamp values
|
2019-05-10 17:18:39 +09:00 |
|
smoogipoo
|
6a957ad27f
|
Fix pause triggered when already paused
|
2019-05-10 15:51:12 +09:00 |
|
smoogipoo
|
7c105fd99f
|
Fix testcase players pausing on window unfocus
|
2019-05-10 15:39:25 +09:00 |
|
Dean Herbert
|
9248e6290c
|
Use FrameStabilityClock to denote current position on song progress
|
2019-05-09 18:09:26 +09:00 |
|
Dean Herbert
|
5942072128
|
Add a tween when clicking to seek
|
2019-05-09 18:07:38 +09:00 |
|
Dean Herbert
|
9457a6128e
|
Fix game pausing when made inactive while watching a replay
|
2019-05-09 10:57:55 +09:00 |
|
Dean Herbert
|
0693290ad4
|
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
|
2019-05-08 18:43:21 +09:00 |
|
Dean Herbert
|
bace829629
|
Add ability to avoid expand animation in ModDisplay
|
2019-05-08 18:42:26 +09:00 |
|
Lucas A
|
a5f758b977
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-07 18:27:14 +02:00 |
|
Dan Balasescu
|
288b3deb94
|
Merge branch 'master' into fix-rank-display
|
2019-05-07 15:00:51 +09:00 |
|
Dean Herbert
|
8bc313fb33
|
Merge branch 'master' into fix-new-inspections
|
2019-05-07 14:14:40 +09:00 |
|
Dean Herbert
|
c878d814f6
|
Merge branch 'master' into pause-via-inactive
|
2019-05-07 13:35:23 +09:00 |
|
Dean Herbert
|
f7a570d67a
|
Fix double confirmation
|
2019-05-07 13:34:06 +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 |
|
Dan Balasescu
|
8b9cfadd64
|
Merge branch 'master' into fix-retry-sound
|
2019-05-07 12:37:22 +09:00 |
|
Lucas A
|
d5d31282e5
|
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
|
2019-05-05 20:55:42 +02:00 |
|
Dean Herbert
|
7fdc79dd68
|
Improve skip boundary logic to be closer to expectations
Supersedes #4693.
Closes #4676.
|
2019-05-05 20:20:41 +09:00 |
|
Dean Herbert
|
3e3f12f277
|
Use more local bindables
|
2019-05-04 17:53:17 +09:00 |
|
Dean Herbert
|
b9a39fb788
|
Fix instant pausing when game becomes inactive
Resolves #4685.
|
2019-05-04 14:54:29 +09:00 |
|
Lucas A
|
a4a2ce5ec0
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-02 21:36:28 +02:00 |
|
Lucas A
|
5d4aa5a12e
|
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
|
2019-05-02 20:51:19 +02:00 |
|
iiSaLMaN
|
3b03ca802a
|
Merge branch 'master' into sh-xh-grading-2
|
2019-04-30 18:55:35 +03:00 |
|
Lucas A
|
7e42068a14
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-04-28 19:48:35 +02:00 |
|
Dean Herbert
|
5a9277ec0e
|
Merge branch 'master' into fix-retry-sound
|
2019-04-28 23:38:14 +09:00 |
|
Dean Herbert
|
db75516e79
|
Merge branch 'master' into fix-lead-in-issues
|
2019-04-27 21:01:21 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
iiSaLMaN
|
b08fb5136e
|
Merge branch 'master' into sh-xh-grading-2
|
2019-04-26 10:38:10 +03:00 |
|
Dean Herbert
|
a680a38e81
|
Merge pull request #4675 from nyquillerium/playerloader-tracking
Prevent PlayerLoader from tracking the logo after it has been exited.
|
2019-04-26 13:21:13 +09:00 |
|
KingLuigi4932
|
4e0f21102b
|
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
|
2019-04-25 14:04:12 +03:00 |
|
KingLuigi4932
|
c6b3197dd0
|
Add AdjustRank and use it in Hidden Mod
|
2019-04-25 13:56:57 +03:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
Dean Herbert
|
6fdcd98caa
|
Don't play screen "back" sample when retrying
|
2019-04-25 14:15:07 +09:00 |
|
David Zhao
|
8222923ab8
|
Only track logo if we're still the current screen
|
2019-04-24 16:20:51 +09:00 |
|