Dean Herbert
|
5fe45c9bed
|
Merge branch 'master' into update-framework
|
2019-04-22 19:17:14 +09:00 |
|
Dan Balasescu
|
8fc0bf24c7
|
Merge branch 'master' into fix-hold-for-menu-icon
|
2019-04-22 18:57:43 +09:00 |
|
Dean Herbert
|
48e82d4b1c
|
Fix hold for menu button's icon being incorrect
|
2019-04-22 18:47:28 +09:00 |
|
Dean Herbert
|
6856571f17
|
Fix incorrect seek target
|
2019-04-22 18:45:58 +09:00 |
|
Dean Herbert
|
55c5ef898d
|
Remove delay on entering player
|
2019-04-22 18:29:58 +09:00 |
|
Dean Herbert
|
908eee9942
|
Fix pause tests
|
2019-04-22 18:29:51 +09:00 |
|
Dean Herbert
|
b3c496d72c
|
Remove delay on entering player
|
2019-04-22 17:06:40 +09:00 |
|
Dean Herbert
|
034643b835
|
Fix pause tests
|
2019-04-22 17:06:22 +09:00 |
|
Dean Herbert
|
6f2bc943eb
|
Fix rank display on break info display
|
2019-04-21 12:04:15 +08:00 |
|
David Zhao
|
6502e26d09
|
Add draw size invalidation to ZoomableScrollContainer
|
2019-04-19 16:21:15 +09:00 |
|
Dean Herbert
|
2d7b3094ba
|
Merge branch 'master' into player-mod-reinstantiation
|
2019-04-17 16:42:57 +08:00 |
|
smoogipoo
|
12b6bc48bd
|
Use .With() wherever possible
|
2019-04-17 17:24:09 +09:00 |
|
smoogipoo
|
09568be270
|
Merge remote-tracking branch 'origin/master' into facade-container
# Conflicts:
# osu.Game/Screens/Play/PlayerLoader.cs
|
2019-04-17 17:17:33 +09:00 |
|
smoogipoo
|
897bfa60db
|
Fix tracking position during 150ms state change delay
|
2019-04-17 17:05:35 +09:00 |
|
smoogipoo
|
5a3d6a0258
|
Fix post-merge errors
|
2019-04-17 16:11:59 +09:00 |
|
Dean Herbert
|
bb539af1a0
|
Merge branch 'master' into player-mod-reinstantiation
|
2019-04-16 22:35:21 +08:00 |
|
LeNitrous
|
2d227d25cc
|
fix appveyor warnings
|
2019-04-14 07:55:15 +08:00 |
|
LeNitrous
|
91c327a90f
|
use ModDisplay
|
2019-04-14 07:22:31 +08:00 |
|
LeNitrous
|
01cc78108c
|
add random button
|
2019-04-11 05:47:32 +08:00 |
|
LeNitrous
|
b4d0755818
|
please appveyor
|
2019-04-10 22:10:09 +08:00 |
|
LeNitrous
|
22f9339b01
|
let mods button have selected mod icons
|
2019-04-10 21:53:13 +08:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
85d3ff4846
|
Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods
# Conflicts:
# osu.Game/Screens/Play/GameplayClockContainer.cs
|
2019-04-10 12:06:51 +09:00 |
|
smoogipoo
|
4310f07a5c
|
Rename SelectedMods -> Mods
|
2019-04-10 12:03:57 +09:00 |
|
jorolf
|
c1db635933
|
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
|
2019-04-09 20:42:39 +02:00 |
|
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 |
|
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 |
|