Dean Herbert
|
e93fea7dc3
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-05-18 19:20:44 +09:00 |
|
David Zhao
|
b7aed0a014
|
Interpolate to tracking position on from Initial button state
|
2019-05-17 12:21:34 +09:00 |
|
David Zhao
|
fcffad6553
|
Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode
|
2019-05-17 11:35:35 +09:00 |
|
David Zhao
|
5bf513eba8
|
Don't track immediately when entering mode
|
2019-05-17 11:24:34 +09:00 |
|
Dean Herbert
|
958598d13b
|
Fix crash on switching from main menu to gameplay too fast
|
2019-05-15 19:39:36 +09:00 |
|
Dean Herbert
|
7b56180b8b
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-05-15 12:08:23 +09:00 |
|
Dean Herbert
|
4b508915f6
|
Centralise caching of components at OsuGame level
|
2019-05-13 17:10:25 +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 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09: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
|
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
|
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 |
|
Dean Herbert
|
46ecaf3d6c
|
Merge branch 'master' into facade-container
|
2019-04-05 21:14:21 +09:00 |
|
David Zhao
|
0208526837
|
Fix button system visual issue
|
2019-04-05 18:21:54 +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
|
15b2b6af7d
|
Clean up remaining assignments of logo relativePositionAxes
|
2019-04-04 11:28:36 +09: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
|
1ef2a4c46f
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-04-03 16:23:33 +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
|
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
|
f066bd1138
|
Adjust facade scale now that the size is different
|
2019-03-28 16:35:15 +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
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +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
|
3fe52be77f
|
Better tests, add documentation
|
2019-03-26 17:22:36 +09:00 |
|
Dean Herbert
|
7b65d3437f
|
Merge branch 'master' into fix-background-loading
|
2019-03-20 10:33:53 +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
|
14df9f94e2
|
Merge branch 'master' into fix-background-loading
|
2019-03-18 14:59:35 +09:00 |
|
Dean Herbert
|
b1f18481e0
|
Show text to supporters telling them they're cool
Also adds better tests for disclaimer screen.
|
2019-03-13 12:58:42 +09:00 |
|
Dean Herbert
|
f0114d776d
|
Use interface to access API
Allows for better testability.
|
2019-03-13 12:58:18 +09:00 |
|
Dean Herbert
|
81d9e391f4
|
Preload main menu background
|
2019-03-12 00:04:19 +09:00 |
|
smoogipoo
|
04d756524d
|
Adjust with shader changes
|
2019-03-07 18:30:18 +09:00 |
|
smoogipoo
|
e430b8a640
|
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
|
2019-03-07 18:15:12 +09:00 |
|
Dean Herbert
|
ec7842dd5a
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-03-04 12:06:56 +09:00 |
|
Dean Herbert
|
08e153208d
|
Unbinds are automatic
|
2019-03-03 20:03:22 +09:00 |
|
Dean Herbert
|
6ffa139ea8
|
Adjust transition length slightly
|
2019-03-03 20:02:56 +09:00 |
|
jorolf
|
e8d568470d
|
use a bindable instead
|
2019-03-02 19:13:38 +01:00 |
|
jorolf
|
176cbc7f2e
|
Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
|
2019-03-02 19:04:48 +01:00 |
|
smoogipoo
|
83a02d32f7
|
Fix a few incorrect fonts
|
2019-03-02 13:25:59 +09:00 |
|
Dean Herbert
|
796f6c3092
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-03-02 13:13:51 +09:00 |
|
smoogipoo
|
bf8360636a
|
Adjust drawnodes to use the new shared data structure
|
2019-03-01 17:25:15 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
jorolf
|
4c10185f5b
|
Fade out text instead of removing it immediately
|
2019-02-26 15:26:00 +01:00 |
|
jorolf
|
cacef7421d
|
Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
|
2019-02-26 14:09:12 +01:00 |
|
Shane Woolcock
|
e91c07209f
|
Move MainMenu initialisation from ctor to load
|
2019-02-26 09:54:42 +09:00 |
|
jorolf
|
796044ee7d
|
*I should've rechecked the code after the master merge*
|
2019-02-25 23:53:44 +01:00 |
|
jorolf
|
501dab7b32
|
Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
|
2019-02-25 23:49:01 +01:00 |
|
jorolf
|
c680d63694
|
Don't show the supporter text if the user already has supporter status
|
2019-02-25 23:44:43 +01:00 |
|
Shane Woolcock
|
bebb635ca1
|
Merge branch 'master' into hide-exit-button
# Conflicts:
# osu.Game/Screens/Menu/MainMenu.cs
|
2019-02-25 21:48:42 +09:00 |
|
Shane Woolcock
|
2bd5bb3f69
|
Move all MainMenu button creation into load
|
2019-02-25 21:41:41 +09:00 |
|
Dean Herbert
|
a4e119786f
|
Fix some weird formatting
|
2019-02-25 19:19:28 +09:00 |
|
Shane Woolcock
|
61be4f2695
|
Conditionally add ExitConfirmOverlay and disable back action
|
2019-02-25 10:43:47 +09:00 |
|
Shane Woolcock
|
add8b8e9c4
|
Only add Exit button if the GameHost supports it
|
2019-02-25 09:56:00 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09:00 |
|
smoogipoo
|
8853f7ad76
|
Explicitly set exo typeface in a few places
|
2019-02-21 19:26:02 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
Jamie Taylor
|
9b3f2fdd24
|
Change RelativePositionAxes default on osu! logo to be both
|
2019-02-20 19:34:55 +09:00 |
|
smoogipoo
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +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
|
f0743ebecf
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
# Conflicts:
# osu.Game.Tournament.Tests/TestCaseDrawings.cs
# osu.Game/osu.Game.csproj
|
2019-02-17 17:25:09 +09:00 |
|
Dean Herbert
|
482a01e7ba
|
Merge branch 'master' into tournament-tools
# Conflicts:
# osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
# osu.Game/OsuGameBase.cs
# osu.Game/Overlays/ChatOverlay.cs
# osu.Game/Screens/Menu/MainMenu.cs
# osu.Game/Screens/Tournament/Drawings.cs
# osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-02-02 19:09:48 +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
|
7b1c1f3728
|
Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
|
2019-01-28 15:42:06 +09:00 |
|
smoogipoo
|
50a384e19c
|
Fix game not exiting
|
2019-01-24 20:13:19 +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
|
5ea6e8e247
|
Allow full osu!direct usage regardless of supporter status for now
|
2019-01-22 14:22:38 +09:00 |
|
Shane Woolcock
|
fa6dd8c99e
|
Code sanity
|
2019-01-20 19:03:06 +10:30 |
|
Shane Woolcock
|
521b11dfcb
|
Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
|
2019-01-20 18:51:17 +10:30 |
|
Dean Herbert
|
3953f829c8
|
Add letterbox/screen scaling support
|
2019-01-04 13:36:02 +09:00 |
|
Dean Herbert
|
e4a72c0c64
|
Fix failing testcase
|
2018-12-26 13:18:36 +09:00 |
|
smoogipoo
|
02365ee5ba
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 23:23:21 +09:00 |
|
Dean Herbert
|
0df9fa1e59
|
Remove pointless default size specification in OsuLogo
|
2018-12-06 11:56:16 +09:00 |
|
smoogipoo
|
b251129c59
|
Block going into multiplayer while logged out
|
2018-12-04 17:43:27 +09:00 |
|
Dean Herbert
|
03e416cda9
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-12-01 10:03:31 +09:00 |
|
smoogipoo
|
d07a724970
|
Only allow replay screen changes in menu + songselect
|
2018-11-30 18:25:54 +09:00 |
|
Dean Herbert
|
32b36f2883
|
Use IBindable<>
|
2018-11-26 17:07:30 +09:00 |
|