Dan Balasescu
|
3073508a23
|
Merge branch 'master' into fix-offset-seek-handling
|
2019-04-09 15:40:48 +09:00 |
|
smoogipoo
|
4c571acd67
|
Reinstantiate mods for every player
|
2019-04-09 13:33:16 +09:00 |
|
smoogipoo
|
56496d28ba
|
Reset mods when exiting match
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
cbb3fdaca8
|
Fix various crashes due to bindable being disabled
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
ad124bfeec
|
Reimplement select mod track adjustments
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
ca9f172a96
|
Use var
|
2019-04-09 12:58:10 +09:00 |
|
smoogipoo
|
93b6cc00df
|
Fix OsuScreenDependencies using the incorrect parent
|
2019-04-09 12:56:23 +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 |
|
David Zhao
|
8a01995668
|
Remove need for tracking bool and backing logo
|
2019-04-08 16:14:41 +09:00 |
|
David Zhao
|
a690302d00
|
Apply reviews
|
2019-04-08 15:24:09 +09:00 |
|
DrabWeb
|
e76897d6a7
|
Fix ResumeContainers appearing when resuming during breaks.
|
2019-04-07 16:32:55 -03:00 |
|
Lucas A
|
e948b11756
|
Merge branch 'master' into invert-login-notification-depth
|
2019-04-07 14:03:01 +02:00 |
|
Ferdinand Bachmann
|
d431ca4efc
|
BeatmapLeaderboard: use OrderByDescending instead of negation
(suggested by peppy)
|
2019-04-07 13:26:35 +02:00 |
|
Lucas A
|
3f2e6a9376
|
Allow loginOverlay to be null if there's no cached instance in DI (for testing cases)
|
2019-04-06 18:52:30 +02:00 |
|
Lucas A
|
394f14965b
|
Make appveyor happy with whitespaces
|
2019-04-06 18:23:56 +02:00 |
|
Lucas A
|
59410dbe3b
|
Open login overlay when notification asking for signing in to play multi is clicked
|
2019-04-06 18:05:13 +02:00 |
|
theFerdi265
|
cb3532e7d4
|
BeatmapLeaderboard: fix local scores not being sorted
|
2019-04-06 00:53:02 +02:00 |
|
Dean Herbert
|
46ecaf3d6c
|
Merge branch 'master' into facade-container
|
2019-04-05 21:14:21 +09:00 |
|
Dean Herbert
|
f93504c65a
|
Merge branch 'master' into button_fix
|
2019-04-05 20:47:08 +09:00 |
|
Dean Herbert
|
88445647c8
|
Merge branch 'master' into update-beatmap-scores-design
|
2019-04-05 18:27:30 +09:00 |
|
David Zhao
|
0208526837
|
Fix button system visual issue
|
2019-04-05 18:21:54 +09:00 |
|
smoogipoo
|
15fbb6f176
|
Use common AddUserLink method
|
2019-04-05 14:15:36 +09:00 |
|
David Zhao
|
b1d74e57e5
|
Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size
|
2019-04-05 13:56:08 +09:00 |
|
David Zhao
|
7047f305a1
|
Apply reviews, add safety for multiple facades
|
2019-04-05 12:02:47 +09:00 |
|
David Zhao
|
b2857384b8
|
Remove unnecessary logo assignment
|
2019-04-04 12:08:05 +09:00 |
|
David Zhao
|
15b2b6af7d
|
Clean up remaining assignments of logo relativePositionAxes
|
2019-04-04 11:28:36 +09:00 |
|
jorolf
|
ccc804a9b2
|
get everything working again
|
2019-04-04 00:24:42 +02:00 |
|
Samuel Van Allen
|
bb516da5b6
|
Removed redundant empty argument list
|
2019-04-03 22:57:05 +08:00 |
|
Samuel Van Allen
|
3660924441
|
Trimmed whitespace
|
2019-04-03 22:40:20 +08:00 |
|
Samuel Van Allen
|
4d60f6fb6a
|
Use collection initializer and added missing blank line
|
2019-04-03 22:37:50 +08:00 |
|
Samuel Van Allen
|
73c7c6c316
|
Hides "Details" button when OnlineBeatmapID is null
|
2019-04-03 21:44:36 +08:00 |
|
David Zhao
|
8a40b27e8f
|
Remove need for logo relativePositionAxes none
|
2019-04-03 20:32:53 +09:00 |
|
David Zhao
|
2ed945605e
|
Fix Axes.None requirement for FacadeContainer
|
2019-04-03 19:57:22 +09:00 |
|
Dean Herbert
|
efd7bea771
|
Add further xmldoc
|
2019-04-03 17:01:11 +09:00 |
|
Dean Herbert
|
50f8ab3dfb
|
Fix gameplay offset handling on seeks
|
2019-04-03 16:58:20 +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 |
|
smoogipoo
|
d8af5e1c5a
|
Update in-line with drawnode changes
|
2019-04-02 11:56:22 +09:00 |
|
David Zhao
|
020be50f03
|
Merge remote-tracking branch 'upstream/master' into facade-container
|
2019-04-02 11:28:44 +09:00 |
|
Dean Herbert
|
184403c7e1
|
Merge branch 'master' into resume-cursor-2
|
2019-04-01 14:24:00 +09:00 |
|
Dean Herbert
|
2b3c70b2d2
|
Refactor with constants and better method names
|
2019-04-01 13:13:56 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
LeNitrous
|
698e38c4e0
|
make menu flashes and visualisation colourable by skin
|
2019-03-31 20:10:44 +08:00 |
|
David Zhao
|
952a12bb19
|
Return logo relativepositionaxes on content out
|
2019-03-29 16:54:34 +09:00 |
|
Dean Herbert
|
81585a8283
|
Merge branch 'master' into resume-cursor-2
|
2019-03-29 15:56:46 +09:00 |
|
Dean Herbert
|
4225d41a84
|
Merge pull request #4443 from jorolf/screen-title-class
Add ScreenTitle class
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-03-29 15:02:38 +09:00 |
|
Dean Herbert
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +09:00 |
|
Dean Herbert
|
de47e0a8e8
|
Merge remote-tracking branch 'upstream/master' into screen-title-class
|
2019-03-29 14:01:08 +09:00 |
|
Dean Herbert
|
202a0086cc
|
Merge branch 'master' into better-player-flags
|
2019-03-29 13:45:45 +09:00 |
|
Dean Herbert
|
d6f8dbfd5c
|
Merge branch 'master' into wedge-fix
|
2019-03-29 12:23:42 +09:00 |
|
Dean Herbert
|
fed58fba3a
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 12:14:28 +09:00 |
|
Dean Herbert
|
26a73b4a65
|
Merge branch 'master' into correct-preview-loop
|
2019-03-29 12:00:58 +09:00 |
|
Dan Balasescu
|
d410054ec8
|
Merge branch 'master' into key-counter-display
|
2019-03-29 11:22:59 +09:00 |
|
Dean Herbert
|
7715606188
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-29 11:15:34 +09:00 |
|
Dan Balasescu
|
7ab24e35f9
|
Merge branch 'master' into gameplay-paused-no-update
|
2019-03-29 10:53:32 +09:00 |
|
Dean Herbert
|
759c5b3db9
|
Restore previous resume behaviour for the time being
|
2019-03-29 10:52:26 +09:00 |
|
Dean Herbert
|
3b1f83da1d
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-29 10:31:15 +09:00 |
|
Dean Herbert
|
2f5668f4e7
|
Fix remaining framework changes
|
2019-03-29 00:29:14 +09:00 |
|
David Zhao
|
f066bd1138
|
Adjust facade scale now that the size is different
|
2019-03-28 16:35:15 +09:00 |
|
David Zhao
|
9d66a5e4b2
|
Ensure logo stops tracking before suspend animation
|
2019-03-28 16:29:35 +09:00 |
|
David Zhao
|
039e451ab1
|
ensure logo is where it already needs to be on resume
|
2019-03-28 16:14:28 +09:00 |
|
David Zhao
|
bfe44eb33d
|
Remove SizeForFlow magic number
|
2019-03-28 15:40:58 +09:00 |
|
David Zhao
|
9b047d9b90
|
Add back menu logo transform
|
2019-03-28 12:00:50 +09:00 |
|
Dean Herbert
|
253b18b92f
|
Merge remote-tracking branch 'upstream/master' into better-player-flags
|
2019-03-28 11:18:54 +09:00 |
|
Dean Herbert
|
5c4f2cefea
|
Fix Loader and TestCaseLoaderAnimation
|
2019-03-27 22:28:25 +09:00 |
|
David Zhao
|
061527a260
|
Add new automated tests for logofacade, reset interpolation
|
2019-03-27 20:04:01 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Unknown
|
fea6adbf54
|
fix wedge bleeding into other elements (and being misaligned)
|
2019-03-27 10:12:09 +01:00 |
|
David Zhao
|
2e3791be1c
|
Fix incorrect usage of LogoFacade
|
2019-03-27 18:11:12 +09:00 |
|
David Zhao
|
ca7a20585d
|
Apply reviews, delete playerloader test
|
2019-03-27 17:28:53 +09:00 |
|
David Zhao
|
efeed71517
|
Add comment
|
2019-03-27 11:37:16 +09:00 |
|
David Zhao
|
384eee3395
|
Remove DI requirement for the Facade in PlayerLoader
|
2019-03-27 11:32:26 +09:00 |
|
David Zhao
|
3fe52be77f
|
Better tests, add documentation
|
2019-03-26 17:22:36 +09:00 |
|
Dean Herbert
|
a88f23e555
|
Convert remaining two flags to ctor parameters
|
2019-03-26 16:53:44 +09:00 |
|
Dean Herbert
|
83863d35c3
|
Remove AllowLeadIn flag
|
2019-03-26 16:35:00 +09:00 |
|
Dean Herbert
|
8658de5108
|
Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
|
2019-03-26 13:52:48 +09:00 |
|
Dean Herbert
|
b4d785c76c
|
Don't update gameplay loop while paused
|
2019-03-26 13:36:17 +09:00 |
|
Dean Herbert
|
e512d88899
|
Apply required refactor
|
2019-03-26 13:29:26 +09:00 |
|
Dean Herbert
|
256a579de0
|
Allow player to not pause on focus loss
|
2019-03-26 13:17:00 +09:00 |
|
Dean Herbert
|
4c0121a112
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-26 11:31:23 +09:00 |
|
Dean Herbert
|
b75ea295db
|
Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
|
2019-03-26 11:28:43 +09:00 |
|
David Zhao
|
35bf262d19
|
Merge remote-tracking branch 'upstream/master' into facade-container
|
2019-03-26 11:11:13 +09:00 |
|
David Zhao
|
a0f6718145
|
Better tests and implementation
|
2019-03-26 10:48:29 +09:00 |
|
Dean Herbert
|
15aea7f745
|
Update framework
|
2019-03-25 21:50:28 +09:00 |
|
Dean Herbert
|
245f463e3f
|
Don't update gameplay loop while paused
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
8ad4009c33
|
osu! resume overlay
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
9a6576c0a1
|
Merge remote-tracking branch 'upstream/master' into multi-background-stack
|
2019-03-25 12:40:31 +09:00 |
|
Dean Herbert
|
371166955e
|
Apply a few minor refactors
|
2019-03-25 12:39:40 +09:00 |
|
David Zhao
|
5169f7a43c
|
Change default for null screen parallax, apply reviews
|
2019-03-24 16:21:43 +09:00 |
|
David Zhao
|
d37968d88d
|
Add better test for facade containers
|
2019-03-24 15:18:38 +09:00 |
|
Dean Herbert
|
11b474e194
|
Handle released for safety
|
2019-03-24 12:19:09 +09:00 |
|
Dean Herbert
|
0d72104235
|
Refactor for formatting sanity
|
2019-03-24 12:03:06 +09:00 |
|
Dean Herbert
|
8ad19fc2d4
|
Merge branch 'master' into menu-globalaction-select
|
2019-03-24 11:58:52 +09:00 |
|
Dean Herbert
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
David Zhao
|
6e98a8dd7c
|
Initial implementation
|
2019-03-22 20:01:58 +09:00 |
|
David Zhao
|
e93311fdc9
|
DI facade
|
2019-03-22 19:01:32 +09:00 |
|
Dean Herbert
|
db89796752
|
Merge remote-tracking branch 'upstream/master' into multi-background-stack
|
2019-03-22 16:05:39 +09:00 |
|
Dan Balasescu
|
b4954c5a7f
|
Merge branch 'master' into pause-logic-simplification
|
2019-03-22 15:11:34 +09:00 |
|
Dean Herbert
|
9e6cdd7bd5
|
Combine conditionals and clarify comment
|
2019-03-22 14:42:51 +09:00 |
|
Dean Herbert
|
5b8fd6822e
|
Move storyboard logic region down
|
2019-03-22 14:39:20 +09:00 |
|
Dan Balasescu
|
5de99f3f5b
|
Merge branch 'master' into fix-random-select-crash
|
2019-03-22 14:11:06 +09:00 |
|
David Zhao
|
dcae86e39a
|
Add a new test for OsuScreenStack, fix parallax
|
2019-03-22 14:10:38 +09:00 |
|
jorolf
|
7873022a8b
|
Merge branch 'master' of git://github.com/ppy/osu into screen-title-class
|
2019-03-21 22:18:59 +01:00 |
|
jorolf
|
454c82c49e
|
Don't go outside of the container bounds
|
2019-03-21 22:18:45 +01:00 |
|
Dean Herbert
|
37010f97d7
|
Fix random select crashing
Closes #3383.
|
2019-03-21 21:02:54 +09:00 |
|
Dean Herbert
|
a10e43410a
|
Fix song select potentially starting play before the carousel (and bindables) have been initialised
|
2019-03-21 20:52:34 +09:00 |
|
Dean Herbert
|
4789aa81cb
|
Add an explicit flag for tracking song select's bindable binding
Not required (this change does not affect logic) but improves clarity.
|
2019-03-21 20:52:15 +09:00 |
|
Dean Herbert
|
96dba6a20d
|
Move nested method to bottom of class
|
2019-03-21 20:51:21 +09:00 |
|
Dean Herbert
|
e2503888a4
|
Expose carousel's loaded flag
|
2019-03-21 20:51:06 +09:00 |
|
Dean Herbert
|
15f9a6b9df
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-21 16:04:18 +09:00 |
|
David Zhao
|
ee0d7b6c6d
|
Merge remote-tracking branch 'upstream/master' into multi-background-stack
|
2019-03-21 15:35:14 +09:00 |
|
Dean Herbert
|
67a65b80fc
|
Merge branch 'master' into visual-settings-container
|
2019-03-20 20:48:30 +09:00 |
|
Dean Herbert
|
ba89bfee0c
|
Define explicit method to add background
Also cleans up some redundant/misplaced comments.
|
2019-03-20 20:16:45 +09:00 |
|
Dean Herbert
|
8865d53992
|
Reword comment
|
2019-03-20 20:04:07 +09:00 |
|
David Zhao
|
2e9d823af4
|
Add comment regarding HandlePositionalInput
|
2019-03-20 19:59:54 +09:00 |
|
David Zhao
|
2ff7aa6c2e
|
Remove handle positional input
|
2019-03-20 19:49:37 +09:00 |
|
David Zhao
|
bc6e8ce7b4
|
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
|
2019-03-20 19:48:57 +09:00 |
|
Dean Herbert
|
01f795b046
|
Make restart public rather than reimplementing
|
2019-03-20 19:45:04 +09:00 |
|
David Zhao
|
8543e8c36f
|
Put loadcomplete next to other protected overrides
|
2019-03-20 19:42:39 +09:00 |
|
Dean Herbert
|
cda5bc28c8
|
Add proper comment
|
2019-03-20 19:41:20 +09:00 |
|
David Zhao
|
9013afe412
|
Query for input manager once
|
2019-03-20 19:35:40 +09:00 |
|
Dean Herbert
|
acbcca4462
|
Merge branch 'master' into multi-background-stack
|
2019-03-20 19:11:27 +09:00 |
|
David Zhao
|
fbfef844de
|
Add test case for resuming PlayerLoader
|
2019-03-20 17:18:42 +09:00 |
|
David Zhao
|
a5916f995e
|
Use the previous conditional instead
|
2019-03-20 16:54:42 +09:00 |
|
David Zhao
|
e9034c8a30
|
Move blurring logic into Update instead
|
2019-03-20 16:50:47 +09:00 |
|
Dean Herbert
|
f43e7a880c
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-20 15:27:06 +09:00 |
|
David Zhao
|
1086688e0a
|
Fix variable hiding
|
2019-03-20 15:13:59 +09:00 |
|
Dean Herbert
|
6f1610be79
|
Merge branch 'master' into ruleset-container-refactor
|
2019-03-20 14:55:58 +09:00 |
|
David Zhao
|
86658e357b
|
Override add instead
|
2019-03-20 14:55:52 +09:00 |
|
Dean Herbert
|
5f288650bf
|
Fix misses/typos
|
2019-03-20 14:49:33 +09:00 |
|
David Zhao
|
9964644683
|
Fix merge
|
2019-03-20 14:37:32 +09:00 |
|
David Zhao
|
2646126d86
|
Merge remote-tracking branch 'upstream/master' into visual-settings-container
|
2019-03-20 14:29:20 +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 |
|
Dean Herbert
|
e59917ed03
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-20 10:58:15 +09:00 |
|
Dean Herbert
|
7b65d3437f
|
Merge branch 'master' into fix-background-loading
|
2019-03-20 10:33:53 +09:00 |
|
Dean Herbert
|
5b6ac7abdc
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-20 10:31:42 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
68f28326a2
|
Refactor RulesetContainer for readability
|
2019-03-19 20:21:31 +09:00 |
|
David Zhao
|
a1000524ee
|
Merge branch 'master' into visual-settings-container
|
2019-03-19 20:17:12 +09:00 |
|
David Zhao
|
a8e2072286
|
Make blurtarget private, improve documentation
|
2019-03-19 20:15:28 +09:00 |
|
Dean Herbert
|
e36ad3eb6b
|
Add initial alpha in case
|
2019-03-19 16:11:22 +09:00 |
|
Dean Herbert
|
d2007cfb38
|
Fix weird transition
|
2019-03-19 16:10:28 +09:00 |
|
Dean Herbert
|
83f3d3abde
|
Merge remote-tracking branch 'upstream/master' into disclaimer-support-text
|
2019-03-19 16:02:34 +09:00 |
|
David Zhao
|
dc26e90a8d
|
Remove unused usings
|
2019-03-19 13:16:06 +09:00 |
|
David Zhao
|
df37973e84
|
Move showstoryboard into player
|
2019-03-19 13:13:19 +09:00 |
|
David Zhao
|
27a92e017c
|
rename back to UserDimContainer
|
2019-03-19 13:06:14 +09:00 |
|
David Zhao
|
f1b2073bf6
|
Merge remote-tracking branch 'upstream/master' into visual-settings-container
|
2019-03-19 13:01:05 +09:00 |
|
Dean Herbert
|
4f075f4740
|
Add more comprehensive testing
|
2019-03-18 20:33:43 +09:00 |
|