Dan Balasescu
|
15321ee0e8
|
Merge branch 'master' into reduce-logovis-allocs
|
2019-07-02 22:44:39 +09:30 |
|
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
|
587be955c3
|
Increase number of backgrounds in line with resources
|
2019-07-02 17:57:23 +09:00 |
|
Dean Herbert
|
29bb227de2
|
Avoid Intro screen holding references to the intro beatmap
|
2019-07-02 16:28:06 +09:00 |
|
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 |
|
Dan Balasescu
|
3d4c5104b3
|
Merge branch 'master' into reduce-db-contexts
|
2019-07-01 23:40:58 +09:30 |
|
Dean Herbert
|
9de4bb3423
|
Remove all non-transform LogoVisualisation per-frame allocations
|
2019-07-01 16:12:20 +09:00 |
|
Dean Herbert
|
8703f0ad40
|
Change song select initialisation to promote db context sharing
|
2019-06-30 22:23:48 +09:00 |
|
Dean Herbert
|
60ea3d4e1a
|
Fix skinning support for combobreak
|
2019-06-30 21:58:30 +09:00 |
|
Dean Herbert
|
bd54b34538
|
Merge remote-tracking branch 'upstream/master' into combobreak
|
2019-06-30 21:27:53 +09:00 |
|
Dean Herbert
|
fa879b4b60
|
Add a note explaining why manual handling is required
|
2019-06-30 20:47:09 +09:00 |
|
Unknown
|
5b26ef75b1
|
allow exiting editor again
|
2019-06-30 12:31:31 +02: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 |
|
Dean Herbert
|
c34f6180e6
|
Merge branch 'master' into generic-download-model-manager
|
2019-06-26 20:37:56 +09:00 |
|
Dan Balasescu
|
f06aabad5f
|
Merge branch 'master' into toolbar-rulesets-refactor
|
2019-06-26 18:33:45 +09:00 |
|
Welsar55
|
7dd1479050
|
Add combobreak sound
|
2019-06-26 00:20:33 -05:00 |
|
Dean Herbert
|
1eda4e0dd4
|
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
|
2019-06-26 12:21:04 +09:00 |
|
Dean Herbert
|
9e1cb90dd8
|
Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
|
2019-06-26 11:40:41 +09:00 |
|
Dan Balasescu
|
6063e7a69f
|
Merge branch 'master' into one-hit-screen
|
2019-06-26 11:34:54 +09:00 |
|
Dean Herbert
|
446fbce81c
|
Add base class for startup screens
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
|
2019-06-26 01:36:17 +09:00 |
|
Dean Herbert
|
40cf573368
|
Fix pause not correctly showing pause screen
|
2019-06-25 23:15:58 +09:00 |
|
Dean Herbert
|
983cabdb98
|
Disallow back button on disclaimer screen
|
2019-06-25 22:27:50 +09:00 |
|
Dean Herbert
|
f9dad0f640
|
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
|
2019-06-25 20:23:49 +09:00 |
|
Andrei Zavatski
|
bae0258d8d
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
|
2019-06-25 14:16:05 +03:00 |
|
smoogipoo
|
aa81c95f30
|
Remove unnecessary extra property
|
2019-06-25 18:38:14 +09:00 |
|
smoogipoo
|
531b107a98
|
Exit match before exiting multiplayer
|
2019-06-25 18:33:26 +09:00 |
|
smoogipoo
|
1a26608ba9
|
Close mod select before exiting song selection
|
2019-06-25 18:33:21 +09:00 |
|
smoogipoo
|
d9927204f8
|
Relieve OsuScreen of back button input duties
|
2019-06-25 18:33:18 +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 |
|
Andrei Zavatski
|
9dedd62d9a
|
Revert a hotfix in multi screen
since it's been fixed in a framework
|
2019-06-24 22:57:18 +03:00 |
|
Andrei Zavatski
|
35516e7304
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
|
2019-06-24 22:52:24 +03: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 |
|
smoogipoo
|
8d6fc3edf0
|
Fix multiplayer create button appearing in match song selection
|
2019-06-24 11:54:41 +09:00 |
|
Andrei Zavatski
|
bbdb114f04
|
Add missing blank line
|
2019-06-24 02:09:00 +03:00 |
|
Andrei Zavatski
|
94e819578e
|
Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
|
2019-06-24 01:55:35 +03:00 |
|
Dean Herbert
|
f766068e17
|
Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
|
2019-06-21 21:08:09 +09:00 |
|
Dean Herbert
|
6627cdefd2
|
Merge branch 'master' into tournament-tools
|
2019-06-21 15:52:47 +09:00 |
|
Dan Balasescu
|
c79c4641f3
|
Merge branch 'master' into use-modelbackeddrawable
|
2019-06-21 14:26:07 +09:00 |
|
Dan Balasescu
|
8ab7a8641b
|
Add comment for why it's not a fill flow
|
2019-06-21 12:42:35 +09:00 |
|
Dan Balasescu
|
0571bbd555
|
Merge branch 'master' into carousel-gradient
|
2019-06-21 12:40:24 +09:00 |
|
David Zhao
|
65c84428cc
|
Fix position of gradient in beatmap carousel
|
2019-06-20 15:05:15 +09:00 |
|
Joehu
|
ca919f02e6
|
Remove bad words on code comments
|
2019-06-19 21:33:58 -07:00 |
|
Dean Herbert
|
133c1fc0f1
|
Merge branch 'master' into remove-osu-checkbox-bindable
|
2019-06-20 11:33:39 +09:00 |
|
Dean Herbert
|
dd926f55bd
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-06-19 14:55:34 +09:00 |
|
Dean Herbert
|
3043f42eb5
|
Merge branch 'master' into fix-multiplayer-audio
|
2019-06-19 14:36:05 +09:00 |
|
Dean Herbert
|
f26fe53feb
|
Fix startup crash if main menu does not load fast enough
|
2019-06-19 13:16:19 +09:00 |
|
Dean Herbert
|
6426983de0
|
Move logic out of update (and simplify, hopefully)
|
2019-06-19 13:15:58 +09:00 |
|
KingLuigi4932
|
fec0db8fe1
|
Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar
|
2019-06-17 21:55:07 +03:00 |
|
KingLuigi4932
|
d665f1fe4b
|
Seperate drawable and updateable flag from Country + Use UpdateableFlag
|
2019-06-17 20:57:57 +03:00 |
|
KingLuigi4932
|
794ba17a2f
|
Seperate UpdateableRank from DrawableRank and use it
|
2019-06-17 20:04:09 +03:00 |
|
Dean Herbert
|
26d5c2d85a
|
Remove local implementation of bindable in OsuCheckbox
|
2019-06-17 19:37:24 +09:00 |
|
Dean Herbert
|
b259710a62
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-06-17 19:30:17 +09:00 |
|
smoogipoo
|
c1d2fff651
|
Use RestartPoint
|
2019-06-17 12:44:19 +09:00 |
|
smoogipoo
|
bc35a30a25
|
Fix audio being dimmed during multiplayer
|
2019-06-17 12:27:53 +09:00 |
|
Joehu
|
1a9efb3d7a
|
Fix editor play button
|
2019-06-15 11:05:58 -07:00 |
|
Dean Herbert
|
2b48f5d3e0
|
Tidy up updateMetrics flow
|
2019-06-15 14:45:51 +09:00 |
|
Dean Herbert
|
587edcb716
|
Merge branch 'master' into fix-beatmapoverlay-graphs
|
2019-06-15 13:42:13 +09:00 |
|
Dean Herbert
|
1b75fbed9a
|
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
|
2019-06-14 23:25:17 +09:00 |
|
Dean Herbert
|
bc574520bf
|
Update ScrollContainer usages in line with framework changes
|
2019-06-14 15:55:32 +09:00 |
|
Dean Herbert
|
15b9b53d35
|
Fix IconButtons not being scaled correctly
|
2019-06-14 13:40:32 +09:00 |
|
smoogipoo
|
f54f6e552b
|
Fix beatmap details potentially using the incorrect metrics
|
2019-06-13 18:04:42 +09:00 |
|
smoogipoo
|
583bb53f53
|
Remove GetBeatmapDetailsRequest
|
2019-06-13 16:57:19 +09:00 |
|
smoogipoo
|
0a79b444d9
|
Move metrics to beatmap set
|
2019-06-13 16:52:49 +09:00 |
|
Dean Herbert
|
830ddbc2de
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-06-13 12:49:52 +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
|
f358fce9ab
|
Move activity (writable) bindable to APIAccess so it correctly transfers between users
|
2019-06-12 18:04:57 +09:00 |
|
smoogipoo
|
243cd517ad
|
Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
|
2019-06-12 17:24:16 +09:00 |
|
Dean Herbert
|
20b43c20c8
|
Rename variables to remove redundant "screen" terminology
|
2019-06-12 16:33:15 +09:00 |
|
smoogipoo
|
13234fb4a4
|
Adjust comments a bit
|
2019-06-12 16:07:35 +09:00 |
|
Dean Herbert
|
a9c229b1ec
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-12 16:00:35 +09:00 |
|
Dean Herbert
|
fc1f778b82
|
Remove implicit null
|
2019-06-12 15:53:53 +09:00 |
|
smoogipoo
|
5d3fa51360
|
Merge remote-tracking branch 'origin/master' into selection-update
|
2019-06-12 15:10:57 +09:00 |
|
Lucas A
|
15893bbb75
|
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
|
2019-06-11 19:41:48 +02:00 |
|
Lucas A
|
6c74998487
|
Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before.
|
2019-06-11 19:24:36 +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
|
591be33fc2
|
Merge branch 'master' into async-results-pages
|
2019-06-11 18:45:06 +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 |
|
Dean Herbert
|
e87123342c
|
Load results pages asynchronously
Reduces performance burden when first displaying pages. Closes #4977.
|
2019-06-10 23:51:09 +09:00 |
|
Dean Herbert
|
d7cb932606
|
Merge branch 'master' into selection-update
|
2019-06-10 17:51:40 +09:00 |
|
Dean Herbert
|
600503ec8e
|
Use Task.Run/Wait to avoid warnings
|
2019-06-10 13:42:29 +09:00 |
|
smoogipoo
|
f090e292c9
|
Move ArchiveModelManager import process to async flow
|
2019-06-10 13:42:22 +09:00 |
|