Andrei Zavatski
|
bd33687f53
|
Add AllowUpdates flag to SongTicker
|
2020-01-11 18:27:22 +03:00 |
|
Andrei Zavatski
|
81948744d0
|
remove unnecessary null checks
|
2020-01-11 17:50:13 +03:00 |
|
Andrei Zavatski
|
d25ef1966d
|
Remove unnecessary local bindable
|
2020-01-11 17:48:09 +03:00 |
|
Andrei Zavatski
|
e6210f10b7
|
Add unicode metadata support
|
2020-01-11 07:32:40 +03:00 |
|
Andrei Zavatski
|
d59cae33d3
|
Some animation adjustments
|
2020-01-11 07:17:13 +03:00 |
|
Andrei Zavatski
|
7716a555ec
|
Move only ButtonSystem on screen changes rather than everything
|
2020-01-11 07:08:00 +03:00 |
|
Andrei Zavatski
|
6500cc967f
|
Implement SongTicker component
|
2020-01-11 06:58:35 +03:00 |
|
Dean Herbert
|
3be2fc27f3
|
Merge branch 'master' into Remove_osuTK.MathHelper
|
2020-01-10 00:28:46 +08:00 |
|
smoogipoo
|
91735ff367
|
Update MathUtils namespace usages
|
2020-01-09 13:43:44 +09:00 |
|
Berkan Diler
|
34d8740ec4
|
Remove remaining usage of osuTK.MathHelper
|
2020-01-08 20:21:13 +01:00 |
|
mcendu
|
796223d3e0
|
Invert if
|
2019-12-22 21:39:25 +08:00 |
|
mcendu
|
1f41acc5b9
|
Integrate auto click into exit confirmed check
|
2019-12-22 21:20:55 +08:00 |
|
mcendu
|
5d29ff29cb
|
Animate "Good bye" instead on exit
|
2019-12-22 20:52:00 +08:00 |
|
Huo Yaoyuan
|
c0fe91a84c
|
Merge branch 'master' into sharpen
|
2019-11-26 18:21:50 +08:00 |
|
Berkan Diler
|
fccdbffa93
|
Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
|
2019-11-25 00:45:42 +01:00 |
|
Dean Herbert
|
f390e558c7
|
Combine and simplify beatmap change logic
|
2019-11-22 02:32:02 +09:00 |
|
Huo Yaoyuan
|
818553027b
|
Merge branch 'master' into sharpen
|
2019-11-21 23:42:46 +08:00 |
|
Berkan Diler
|
6cab517b2d
|
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
|
2019-11-20 13:37:47 +01:00 |
|
Huo Yaoyuan
|
374ef6ff83
|
Merge branch 'master' into sharpen
|
2019-11-20 17:30:58 +08:00 |
|
Dean Herbert
|
6d06b444ba
|
Allow screen to specify whether to apply audio rate adjustments from mods
|
2019-11-15 13:47:14 +09:00 |
|
Huo Yaoyuan
|
87d40cf8d0
|
Resolve equals usages.
|
2019-11-13 22:35:50 +08:00 |
|
Huo Yaoyuan
|
f3f5094c26
|
Convert delegate to local function.
|
2019-11-12 20:14:22 +08:00 |
|
Dean Herbert
|
a4a57eec54
|
Fix game-wide performance drop when triangles intro is used
|
2019-10-29 01:09:49 +09:00 |
|
Dean Herbert
|
52770f803d
|
Fix incorrect beatmap usage
|
2019-10-08 12:15:32 +09:00 |
|
Dean Herbert
|
cbb120cd38
|
Switch beatmap to private
|
2019-10-08 12:09:42 +09:00 |
|
Dean Herbert
|
c280bee894
|
Protect configuration bindables
|
2019-10-08 12:08:47 +09:00 |
|
Dean Herbert
|
b8b2ff2674
|
Move welcome to local usages
|
2019-10-08 12:07:59 +09:00 |
|
Dean Herbert
|
4ba2dccde3
|
Reorder file contents
|
2019-10-08 12:05:52 +09:00 |
|
Dean Herbert
|
a0bb193342
|
Remove unnecessary beatmap storage
|
2019-10-08 12:04:13 +09:00 |
|
Dean Herbert
|
449e53ee6d
|
Centralise track handling
|
2019-10-08 12:03:42 +09:00 |
|
Dean Herbert
|
c3d56088d8
|
Make constant private
|
2019-10-08 11:54:39 +09:00 |
|
Dean Herbert
|
3c0b1be7f4
|
Add xmldoc where applicable
|
2019-10-08 11:52:16 +09:00 |
|
Dean Herbert
|
393683f8f1
|
Merge branch 'master' into cleanup-intros
|
2019-10-08 11:29:13 +09:00 |
|
HDragonHR
|
faf8fe132e
|
Change bindable int to float
|
2019-10-02 12:26:46 +08:00 |
|
Dean Herbert
|
a45f8c968b
|
Rename and add simple xmldoc
|
2019-09-28 20:21:51 +08:00 |
|
Salman Ahmed
|
3aa9a172d8
|
Merge branch 'master' into introduce-session-statics
|
2019-09-25 16:14:39 +03:00 |
|
iiSaLMaN
|
8844d567cb
|
Use bindable setting instead
|
2019-09-25 15:56:47 +03:00 |
|
iiSaLMaN
|
cde7f49db1
|
Use direct get and set instead
|
2019-09-25 01:26:02 +03:00 |
|
LeNitrous
|
afa043aa7d
|
always use default samples
|
2019-09-24 18:17:27 +08:00 |
|
smoogipoo
|
4555ecc5e0
|
Check for exact key
|
2019-09-24 15:09:08 +09:00 |
|
iiSaLMaN
|
267e12ce3c
|
Add sample usage to the session statics
|
2019-09-24 05:45:47 +03:00 |
|
LeNitrous
|
ec78889e94
|
remove unused dependencies
|
2019-09-24 08:14:20 +08:00 |
|
LeNitrous
|
5024770544
|
move common logic to IntroScreen
|
2019-09-23 20:52:44 +08:00 |
|
Dean Herbert
|
e5b14ce74d
|
Add null check for safety
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
|
2019-09-22 21:42:32 +09:00 |
|
Dean Herbert
|
fc1d49631a
|
Allow top-level menu key pressed to progress the osu! logo
|
2019-09-22 20:31:53 +09:00 |
|
Dean Herbert
|
636582e089
|
Always show exit confirmation when closing via alt-f4 or window control
|
2019-09-20 02:22:49 +09:00 |
|
Dean Herbert
|
67796e0982
|
Apply code styling suggestions
|
2019-09-19 22:46:21 +09:00 |
|
Dean Herbert
|
50d4206c45
|
Fix exit scenarios
|
2019-09-19 20:17:58 +09:00 |
|
Dean Herbert
|
fa54a0bfd3
|
Fix test failures
|
2019-09-19 17:40:46 +09:00 |
|
Dean Herbert
|
929f05884b
|
Always confirm exit when button is clicked
|
2019-09-19 16:28:06 +09:00 |
|
Dean Herbert
|
a214e7e72f
|
Add confirmation dialog when exiting game
|
2019-09-19 16:26:22 +09:00 |
|
smoogipoo
|
efedfefe63
|
Fix disclaimer potentially pushing a null screen
|
2019-09-17 15:54:11 +09:00 |
|
Dean Herbert
|
98e384129c
|
Remove redundant initialisation
|
2019-09-10 01:34:48 +09:00 |
|
Dean Herbert
|
7eb20da820
|
Add back local bool (required due to action limitations)
|
2019-09-10 01:18:02 +09:00 |
|
Dean Herbert
|
f398f134e1
|
Remove unnecessary bool storage
Also delay show slightly for better user experience.
|
2019-09-10 01:12:30 +09:00 |
|
Dean Herbert
|
0ec642d826
|
Show instead of toggle
|
2019-09-10 01:06:37 +09:00 |
|
LeNitrous
|
ff49c4ae98
|
remove redundancies
|
2019-09-09 13:50:14 +08:00 |
|
LeNitrous
|
c2353cbdfa
|
move logic to logo action
|
2019-09-09 13:30:48 +08:00 |
|
LeNitrous
|
04a4f9c9a3
|
use IsLoggedIn and remove useless clause
|
2019-09-09 11:26:51 +08:00 |
|
LeNitrous
|
be4f0cc2dd
|
remove null conditional
|
2019-09-09 06:14:49 +08:00 |
|
LeNitrous
|
a67a2899a9
|
move api state check to it's own clause
|
2019-09-08 16:18:15 +08:00 |
|
LeNitrous
|
3435e2a8d3
|
open login on enter main menu
|
2019-09-08 13:36:58 +08:00 |
|
Dean Herbert
|
bebc3309ce
|
Refactor skin configuration to be infinitely extensible
|
2019-09-03 17:57:34 +09:00 |
|
pi1024e
|
5695bb670e
|
change back to queuing
|
2019-08-31 10:55:05 -04:00 |
|
pi1024e
|
1b4ae5a4a4
|
Spelling fixes
|
2019-08-31 10:55:05 -04:00 |
|
Dean Herbert
|
900df5d72f
|
Fix crash on closing game
|
2019-08-23 13:02:50 +09:00 |
|
Dean Herbert
|
db1ff6d211
|
Fix video decoding loop running permanently in the background
|
2019-08-22 13:48:27 +09:00 |
|
Dean Herbert
|
6a48819055
|
Merge branch 'master' into update-framework-blending
|
2019-08-21 14:27:57 +09:00 |
|
Dean Herbert
|
724365c6d1
|
Minor tidying
|
2019-08-21 14:01:07 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Lucas A
|
33946f0458
|
Fix CI issues and update comments.
|
2019-08-20 11:18:41 +02:00 |
|
Lucas A
|
3fcd786198
|
Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control.
|
2019-08-18 19:32:56 +02:00 |
|
Dean Herbert
|
359261d4a4
|
Fix game not starting if intro music is disabled
|
2019-08-12 02:04:06 +09:00 |
|
Dean Herbert
|
cb0cd7ed58
|
Add triangles intro
|
2019-08-09 20:05:28 +09:00 |
|
Joehu
|
77df6a0cb7
|
Remove unused direct placeholder screen
|
2019-08-07 21:16:36 -07:00 |
|
Dean Herbert
|
a1e64106d4
|
Merge branch 'master' into intro-testing-improvements
|
2019-07-11 23:46:02 +09:00 |
|
Dean Herbert
|
6819c528db
|
Use canBeNull instead of needlessly caching MusicController for tests
|
2019-07-11 00:20:01 +09:00 |
|
Dean Herbert
|
b225b2eb39
|
Rename to IsUserPaused
|
2019-07-11 00:18:19 +09:00 |
|
Desconocidosmh
|
100d15e651
|
Move reseting tempo to Editor
|
2019-07-10 10:43:02 +02:00 |
|
Desconocidosmh
|
8b8e67fd72
|
Add accidentally deleted code
|
2019-07-10 10:41:52 +02:00 |
|
Desconocidosmh
|
2546f647be
|
Completely change the way we fix the bug
|
2019-07-09 11:32:49 +02:00 |
|
Dean Herbert
|
e835cd0f6f
|
Improve information flow to Disclaimer
|
2019-07-09 18:08:44 +09:00 |
|
Dean Herbert
|
0580c32263
|
Abstract intro screen logic to base class
|
2019-07-09 18:05:57 +09:00 |
|
Dean Herbert
|
32fb811bc9
|
Merge branch 'master' into intro-testing-improvements
|
2019-07-09 18:05:52 +09:00 |
|
Desconocidosmh
|
338371c3fc
|
Fix music playing while exiting from editor
|
2019-07-09 00:08:18 +02:00 |
|
Dean Herbert
|
be2d0048db
|
Merge branch 'master' into buttonsystem-entermode
|
2019-07-07 00:01:41 +09:00 |
|
Dean Herbert
|
ea911b2fd2
|
Ensure intro restarts track
|
2019-07-06 19:05:42 +09:00 |
|
David Zhao
|
a259247a98
|
use const
|
2019-07-05 16:07:17 +09:00 |
|
David Zhao
|
9eeafa0861
|
Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode
|
2019-07-05 13:08:48 +09:00 |
|
David Zhao
|
79d6670dc5
|
Expose durations from MainMenu and reorder
|
2019-07-05 13:08:45 +09:00 |
|
Dean Herbert
|
f4dcbbbfef
|
Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode
|
2019-07-05 11:29:29 +09:00 |
|
David Zhao
|
be4e7d0f50
|
remove comment
|
2019-07-04 17:08:21 +09:00 |
|
iiSaLMaN
|
b53aeec90d
|
Move audio adjustment inside OnResuming
|
2019-07-04 05:18:29 +03:00 |
|
iiSaLMaN
|
99603ca0b6
|
Fade out game volume on exiting
Invokes 'this.Exit()' on completion (simplify lines)
|
2019-07-04 04:50:49 +03:00 |
|
David Zhao
|
b2185cd3a2
|
Merge branch 'master' into buttonsystem-entermode
|
2019-07-03 15:54:34 +09:00 |
|
Dean Herbert
|
6e308945b1
|
Fix logo visualisation trying to catch up after being off-screen
|
2019-07-03 15:22:17 +09:00 |
|
Dean Herbert
|
7caa6eaed5
|
Remove all non-transform LogoVisualisation per-frame allocations (#5200)
Remove all non-transform LogoVisualisation per-frame allocations
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-07-02 22:42:18 +09:00 |
|
Dean Herbert
|
29bb227de2
|
Avoid Intro screen holding references to the intro beatmap
|
2019-07-02 16:28:06 +09:00 |
|
Dean Herbert
|
9de4bb3423
|
Remove all non-transform LogoVisualisation per-frame allocations
|
2019-07-01 16:12:20 +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
|
983cabdb98
|
Disallow back button on disclaimer screen
|
2019-06-25 22:27:50 +09:00 |
|
smoogipoo
|
aa81c95f30
|
Remove unnecessary extra property
|
2019-06-25 18:38:14 +09:00 |
|
smoogipoo
|
8c96e4c1fa
|
Move back button to OsuGame
|
2019-06-25 18:33:08 +09:00 |
|
Dean Herbert
|
6627cdefd2
|
Merge branch 'master' into tournament-tools
|
2019-06-21 15:52:47 +09:00 |
|
Joehu
|
ca919f02e6
|
Remove bad words on code comments
|
2019-06-19 21:33:58 -07:00 |
|
Dean Herbert
|
dd926f55bd
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-06-19 14:55:34 +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
|
830ddbc2de
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-06-13 12:49:52 +09:00 |
|
Dean Herbert
|
606be3d7ce
|
Merge branch 'master' into backgrounded-beatmap-status-lookups
|
2019-06-12 00:22:47 +09:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
smoogipoo
|
f090e292c9
|
Move ArchiveModelManager import process to async flow
|
2019-06-10 13:42:22 +09:00 |
|
smoogipoo
|
c7d0fcd42a
|
Update drawnodes
|
2019-06-06 16:49:35 +09:00 |
|
smoogipoo
|
53a39e9142
|
Merge remote-tracking branch 'origin/master' into audio-refactor-update
|
2019-06-04 10:50:33 +09:00 |
|
David Zhao
|
465aa4e0f6
|
Prevent idle state from being updated incorrectly
|
2019-05-31 14:06:18 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +09:00 |
|
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 |
|
Dean Herbert
|
626048038c
|
Handle the null case
|
2018-11-26 16:50:41 +09:00 |
|
Dean Herbert
|
8d65d49126
|
Use bindable flow for checking idle time
|
2018-11-26 16:32:59 +09:00 |
|
Dean Herbert
|
fe5b043a59
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 15:24:44 +09:00 |
|
Dean Herbert
|
f91d2e2e07
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-22 10:25:30 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
Roman Kapustin
|
3c0ce2b615
|
Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
This reverts commit bcdaee7d39.
|
2018-11-19 20:48:59 +03:00 |
|
smoogipoo
|
bcdaee7d39
|
Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
This reverts commit 3e2e2a7000, reversing
changes made to d94801b6c6.
|
2018-11-19 17:52:31 +09:00 |
|
Dean Herbert
|
d09b674fb3
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-16 20:36:08 +09:00 |
|
Dean Herbert
|
77055f6d5c
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-10-12 18:49:47 +09:00 |
|
Dean Herbert
|
3be50c2941
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-10-09 18:02:36 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +09:00 |
|
ekrctb
|
b7a2ad1aa5
|
Use UIEvent level getters for modifier keys.
|
2018-10-02 13:26:36 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
Roman Kapustin
|
baf9e028c3
|
Fix possible idleTracker nullref
|
2018-09-26 19:44:01 +03:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Roman Kapustin
|
bdba22a576
|
Override Handle(UIEvent e) in IdleTracker
|
2018-09-25 20:11:10 +03:00 |
|
Roman Kapustin
|
c7b3fa51d5
|
Inject IdleTracker into ButtonSystem
|
2018-09-25 19:58:50 +03:00 |
|
UselessToucan
|
3c0b77658c
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-09-25 19:48:38 +03:00 |
|
Roman Kapustin
|
5c741eaa89
|
Fix possible game nullref
|
2018-09-21 17:07:46 +03:00 |
|
Dean Herbert
|
51dcfeee92
|
Move existing tournament resources to new project
|
2018-09-21 18:18:28 +09:00 |
|
Dean Herbert
|
78d78b5510
|
Fade menu background a bit when menu is active
|
2018-09-21 03:13:15 +09:00 |
|
ekrctb
|
b790e16217
|
Use Click instead of now removed TriggerOnClick
|
2018-09-19 11:42:32 +09:00 |
|
Roman Kapustin
|
749e89bd25
|
Introduce IdleTracker
|
2018-09-12 20:34:52 +03:00 |
|
Roman Kapustin
|
761d7629cd
|
Return to large logo after idle period
|
2018-09-12 18:09:19 +03:00 |
|
Dean Herbert
|
0f9aa834e5
|
Fix osu! logo being present throughout the whole game
|
2018-09-08 16:31:59 +09:00 |
|
Dean Herbert
|
a1780fddc9
|
DrawInfo -> DrawColourInfo
|
2018-09-06 18:02:04 +09:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
smoogipoo
|
e7a5816d27
|
Use GetAsync for all samples
|
2018-08-27 17:30:16 +09:00 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +09:00 |
|
Dean Herbert
|
9f3f07df2e
|
Fix notifications appearing too early in load process
|
2018-08-23 11:21:56 +09:00 |
|
Dean Herbert
|
39aa98d12d
|
Fix logo flying off-screen when exiting game
|
2018-08-20 14:58:02 +09:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
Dean Herbert
|
a1a077398c
|
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
|
2018-07-13 21:04:17 +09:00 |
|
Dan Balasescu
|
e20cdccf05
|
Merge branch 'master' into update-disclaimer
|
2018-07-12 23:41:55 +09:00 |
|