h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 03:27:24 +08:00
Code Issues Releases Wiki Activity
34,059 Commits 3 Branches 648 Tags 271 MiB
8aaa500431
Commit Graph

740 Commits

Author SHA1 Message Date
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
Dean Herbert
5df2df9b3a Fix osu! logo handling non-left mouse buttons 2018-07-12 12:36:58 +09:00
Dean Herbert
8bc7c4c9a2 Add TestCase and update disclaimer screen 2018-07-11 16:30:51 +09:00
Dean Herbert
1418d1369f Add the ability to click completed download notifications to select beatmap 
Closes #2731.
 2018-07-11 01:32:10 +09:00
Dean Herbert
0b30e6eb6a Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system 2018-07-06 17:55:02 +09:00
Dean Herbert
c025158735 Give VisibleState a default rather than nullable 2018-07-06 17:53:06 +09:00
Dean Herbert
5fc17bacf3 Add "Select" action 
Allows progressing forwards in the interface
 2018-07-03 18:39:15 +09:00
Dean Herbert
2aae528e1c Improve code quality of main menu button system 2018-07-03 18:23:41 +09:00
Dean Herbert
6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
Dean Herbert
e6158bc348 Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change 2018-06-07 16:35:07 +09:00
Dean Herbert
f491a18d40 Fix notifications not showing at main osu! logo on menu 2018-06-07 01:49:34 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change 
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
 2018-06-06 18:26:51 +09:00
Dean Herbert
9306fec498 Fix missing null checks 2018-06-06 18:21:03 +09:00
Dean Herbert
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
Dean Herbert
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo 2018-06-04 20:06:22 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
Dean Herbert
3795a55808 Fix menu flashes not extending to the edge of screen during parallax 2018-06-03 22:26:47 +09:00
Aergwyn
f0095193b3 Merge branch 'master' into overlay-activation 2018-06-03 11:52:33 +02:00
Aergwyn
707af02097 apply feedback 
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
 2018-06-03 11:31:04 +02:00
Dean Herbert
7487c82ec1 Stop the logo from beating 2018-05-31 17:14:47 +09:00
Dean Herbert
9df173b339
Merge branch 'master' into better-loading-logo 2018-05-31 15:59:04 +09:00
smoogipoo
e48b17fb0d Unindent 2018-05-31 15:17:59 +09:00
Dean Herbert
9ea6ab28ea Fix intro potentially starting out-of-sync due to logo's outward animation 2018-05-30 20:22:31 +09:00
Dean Herbert
0caf15166e Remove unnecessary FinishTransforms 2018-05-30 20:05:31 +09:00
Dean Herbert
0dafcf00b7 Fix some discrepancies with the main menu logo transitions 2018-05-30 19:50:00 +09:00
Aergwyn
2b3a630270 add OverlayActivation enum 
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
 2018-05-28 13:43:47 +02:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
Aergwyn
76fbc656a1 fix disclaimer allowing notifications 2018-05-22 17:53:36 +02:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable 2018-05-22 19:00:42 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape 2018-05-22 18:17:51 +09:00
Aergwyn
cee8d21542 hide overlays when going back to initial menu state 2018-05-21 17:24:57 +02:00
Dean Herbert
d109522bf7 Fix escape not working to go backwards in menus before finally exiting the game 
Resolves #2596.
 2018-05-21 23:09:00 +09:00
Aergwyn
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147 Rename for better understanding 
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
 2018-05-21 09:42:29 +02:00
Roman Kapustin
17d1759c37 Get rid of multiple blank lines in a row 2018-05-18 01:01:54 +03:00
Roman Kapustin
81d7e8a393 Resolve merge conflict 2018-05-18 00:25:47 +03:00
DrabWeb
1a78ac3d10 Add Multiplayer screen. 2018-05-15 21:14:10 -03:00
Roman Kapustin
f2f2fb8c73 Use both OnKeyDown and GlobalAction.Back 2018-05-14 22:09:09 +03:00
Roman Kapustin
e802b722f0 Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" 
This reverts commit 44bbb8700e.
 2018-05-14 20:27:05 +03:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation 2018-05-14 18:13:40 +09:00
DrabWeb
a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
DrabWeb
bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
DrabWeb
c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
Dean Herbert
5df9f126d1 Implement a hold-to-confirm screen when exiting game using escape key 2018-05-10 17:07:19 +09:00
Roman Kapustin
44bbb8700e Handle mouse back button using OnMouseDown override instead of using GlobalAction 2018-05-08 00:22:11 +03:00
TocoToucan
804b59ee80 Handle GlobalAction.Back 2018-04-29 20:15:09 +03:00
Dean Herbert
2d82c0b5cd Fix logical regression 2018-04-23 16:41:15 +09:00
Dean Herbert
2c9b2aa0e7 Fix intro setting beatmap in background thread causing race conditions 2018-04-22 02:46:20 +09:00
FreezyLemon
3ece54e1c3 make buttons only accept input when expanded 
both other states are "inactive"/invisible so should never accept keyboard input
 2018-04-14 00:08:54 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
3f3f57e51e Use cached vertexbatch add delegate 2018-03-22 15:13:38 +09:00
Dean Herbert
e0b74a357a Fix osu! logo making hover beat sounds when not visible 2018-03-22 03:31:14 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
Dean Herbert
6dc9411a90 Don't use BufferedContainer for OsuLogo 
Minor performance improvement. Not sure why this was done but it's not required any more.
 2018-03-01 16:01:42 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace 
Also moves delete and action logic to a shared implementation
 2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
Dean Herbert
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
Dean Herbert
e7a0a02466 Don't limit keyboard input based on menu button scale 2018-01-16 20:34:40 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
TocoToucan
c3ca40dcff Local functions related CI fixes 2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines 
codefactor.io \(o.o)/
also one unnecessary semicolon
 2018-01-12 19:30:34 +01:00
smoogipoo
620e125fad Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager 
Also better handles delays before notifications are displayed.
 2017-12-25 20:53:23 +09:00
Dean Herbert
ae48b85827 Don't play logo select sample when actions are playing their own 2017-11-26 17:17:47 +09:00
Dean Herbert
07d6a70028 New sound effects with better names 2017-11-26 17:17:46 +09:00
Dean Herbert
aff217cd03 Fix early access to beatmap in LogoVisualisation 
Missed this one..
 2017-11-21 19:47:12 +09:00
Dean Herbert
66f72baa39 Avoid LogoVisualisation accessing the track before it's loaded 2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public 
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
 2017-11-21 12:06:16 +09:00
Dean Herbert
60778593c3 Make pressing space twice at main menu a bit smoother 2017-11-18 22:24:51 +09:00
Dean Herbert
c2d1de34fc Fix logo not always returning to the correct state when rapidly changing menus 
Fixes #1005 for real
 2017-11-18 11:19:15 +09:00
Dean Herbert
322dd1bd05 Rename variables to make more sense 2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590 Remove duplicated code 2017-11-18 10:34:17 +09:00
Dean Herbert
8bd59ff0b3 Fix osu! logo occasionally being in the wrong state on entering the main menu 2017-11-17 17:40:10 +09:00
smoogipoo
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo
bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
Dean Herbert
49a5af60e2 Fix multiple order-of-execution issues with osu! logo 
Also sets better defaults.
 2017-11-13 18:43:16 +09:00
Dean Herbert
9e82fc21ac Improve transition when exiting song select 
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
 2017-11-10 01:10:44 +09:00
Dean Herbert
724540ceaa Fix toolbar not appearing at main menu 2017-11-09 20:38:34 +09:00
Dean Herbert
598e1652dc Adjust timings 2017-11-09 18:12:33 +09:00
Dean Herbert
6d56b3c2df Hide triangles during outro 2017-11-09 17:52:38 +09:00
Dean Herbert
e3a868744e
Merge branch 'master' into intro-v2 2017-11-09 17:48:42 +09:00
Dean Herbert
4874371dbf Rename methods back 2017-11-09 17:38:20 +09:00
Dean Herbert
e2005c4431 Add comment explaining necessity of AlwaysPresent for now 2017-11-08 20:36:18 +09:00
Dean Herbert
df6c808d28 Adjust animation to designer-san's liking 2017-11-08 17:04:36 +09:00
Dean Herbert
cabb22b6d1 Merge branch 'single-osu-logo' into intro-v2 2017-11-08 16:43:07 +09:00
Dean Herbert
c2d4a213b1 Rename logo-related methods 2017-11-08 16:34:03 +09:00
Dean Herbert
7ad498cb29 Remove unused puzzle pieces 2017-11-08 14:45:01 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
Dean Herbert
41fcecf759 Add intro in to actual game 2017-11-08 14:31:11 +09:00
Dean Herbert
d8d7165164 Add a test case which starts the game 2017-11-08 13:52:44 +09:00
Dean Herbert
713d730d10 Simplify restart process and defaults initialisation 2017-11-08 13:32:03 +09:00
Dean Herbert
1771e003f7 Simplify more 2017-11-08 12:13:30 +09:00
Dean Herbert
419f041291 Fix text alignment 2017-11-08 12:12:27 +09:00
Dean Herbert
f83c095269 Simplify more 2017-11-08 12:10:32 +09:00
Dean Herbert
89426e1c11 Simplify lines 2017-11-08 12:07:52 +09:00
Dean Herbert
7dcdf78608 Make bars and circles better 2017-11-08 12:06:22 +09:00
Dean Herbert
a72e798b85 bar -> line 2017-11-08 11:21:50 +09:00
Dean Herbert
97b238d084 Simplify intro sequence a bit more 2017-11-08 11:20:21 +09:00
Dean Herbert
552a361a24 Merge remote-tracking branch 'upstream/master' into intro-v2 2017-11-08 11:08:42 +09:00
EVAST9919
1afe2c18be Fix osu! deleting beatmaps on startup if MenuMusic is disabled 2017-11-04 19:42:28 +03:00
Dean Herbert
3adcfa8c38 Many fixes 2017-11-03 17:54:35 +09:00
Dean Herbert
2f205d1f63 Merge branch 'single-osu-logo' into intro-v2 2017-11-03 15:37:24 +09:00
Dean Herbert
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3 Fix potential nullref 2017-11-02 21:52:12 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide 
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
 2017-11-02 20:38:02 +09:00
Dean Herbert
6fa02ce9bb Use internal less 
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
 2017-11-01 17:10:54 +09:00
Dean Herbert
27156aeb93 Fix the shit 2017-11-01 17:07:03 +09:00
Dean Herbert
15197b9a76 Use internal less 
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
 2017-11-01 16:57:59 +09:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
TocoToucan
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
EVAST9919
28a594179f CI fixes 2017-10-10 21:03:35 +03:00
EVAST9919
15160f5116 Simplify the code by using more delayed sequences 2017-10-10 20:43:07 +03:00
EVAST9919
d3a62082b4 Final adjustments 2017-10-10 20:20:49 +03:00
EVAST9919
a58e828f54 Timing adjustments 2017-10-10 20:06:18 +03:00
EVAST9919
10a3f7c1d0 Use constants instead of magic numbers 2017-10-10 18:30:46 +03:00
EVAST9919
c34b9aef98 No need to put a lot of stuff inside the big circular container 2017-10-10 15:29:29 +03:00
EVAST9919
67a6da44f9 Rings timing adjustment 2017-10-10 15:02:43 +03:00
EVAST9919
9cad0ce2e9 Group transforms using delayed sequence 
And some timing adjustments
 2017-10-10 07:07:09 +03:00
EVAST9919
6fb8755a95 Use less masking for the ring 2017-10-10 06:06:09 +03:00
EVAST9919
19723b82f7 Remove ring's background field and adjust some timings 2017-10-10 04:12:01 +03:00
EVAST9919
e2d6659d48 Change Ring type, use RelativeSizeAxes for Background/Foreground 2017-10-10 03:57:15 +03:00
EVAST9919
59a0343c01 CI fixes 2017-10-10 01:36:40 +03:00
TocoToucan
81b9e08fb6 Fix foreign key constraint failure 2017-10-09 00:30:52 +03:00
EVAST9919
f8830e1b7c Animation adjustments 2017-10-05 21:37:37 +03:00
EVAST9919
cafacf20ff Add all the needed objects 2017-10-05 02:50:13 +03:00
EVAST9919
6fa45aafc6 Basic logic 2017-10-04 23:06:31 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
EVAST9919
e7c9ad245e Fix icons in main button system jumps on one side for a long time 2017-09-15 09:24:31 +03:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Shane Woolcock
262aea8b6b Fix osu! logo triangles going super fast when the track is paused 2017-09-11 19:16:44 +09:30
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
 2017-08-03 14:36:21 +09:00
Dean Herbert
5f53426a9a *Database -> *Store 
Welcome back BeatmapManager
 2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore 
Hide database functionality at a lower level in preparation from eventually making it private.
 2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-21 11:15:26 +02:00
MrTheMake
22f3e97241 Small optimization to the main menu intro seeking. 2017-07-20 17:15:39 +02:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive 
Also immediately disposes WorkingBeatmaps on ValueChanged.
 2017-07-20 16:45:44 +09:00
MrTheMake
fd518e2294 Don't start a beatmap's track until the intro is done playing 2017-07-20 01:57:46 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-19 19:15:51 +02:00
Dean Herbert
8ce71ef235 Fix broken test case 2017-07-19 18:48:27 +09:00
Dean Herbert
da92fccdb0 Merge branch 'master' into non-null-beatmap 2017-07-19 18:32:42 +09:00
Dean Herbert
c34856922c Gratify CI 2017-07-19 16:34:18 +09:00
Dean Herbert
2a2f4e2a8b Ensure side flashes are not visible during moving transitions 2017-07-19 16:13:01 +09:00
Dean Herbert
2b1e19814c Side flashes should not be affected by parallax 2017-07-19 16:07:11 +09:00
Dean Herbert
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
Thomas Müller
3ba119c115 Ensure toolbar disappears when osu logo transition is cancelled 2017-07-18 17:09:53 +03:00
Thomas Müller
b40c897dbd Fix osu logo shockwave playing when transition is aborted 
This is a very nice use-case scenario for TransformSequence.OnComplete
 2017-07-18 15:28:56 +03:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation 
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
 2017-07-14 19:18:12 +03:00
Dean Herbert
0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Dean Herbert
a9c50786b2 Fix osu! logo on main menu ending up in the wrong place 
Also switch to using BeginDelayedSequence where possible.
 2017-07-11 13:27:45 +09:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
Thomas Müller
6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Dean Herbert
724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Dean Herbert
3a82d77e5b Add missing tab 2017-07-01 07:10:04 -07:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Dean Herbert
7469d0e3ba Merge remote-tracking branch 'upstream/master' into new-samples 2017-06-29 11:51:51 -07:00
Dean Herbert
ee96d39b93 Shuffle sound samples around and make more conformant 2017-06-28 10:19:04 -07:00
Dean Herbert
cbf188c293 Add new main menu backgrounds 2017-06-26 19:10:13 +09:00
Dean Herbert
ec99d83f6d Merge branch 'master' into fix_logo_sound 2017-06-25 15:13:57 +09:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +02:00
EVAST9919
817d2c3da1 Fixed logo heartbeat playing even without beating 2017-06-23 23:57:57 +03:00
ColdVolcano
c619de7f9b Rename const in all of the code 2017-06-21 18:55:44 -05:00
ColdVolcano
1978a4e8a6 Boost visualiser performance 
Also fixes amplitudes being set wrongly if kiai was false.
 2017-06-21 18:32:31 -05:00
Dean Herbert
d0d0f11857 Merge branch 'master' into heartbeat 2017-06-21 15:35:54 +09:00
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
EVAST9919
a991cff908 OsuLogo beat sound 2017-06-19 17:37:00 +03:00
Dean Herbert
17cb043cb2 Visualiser 2017-06-19 18:41:35 +09:00
Dean Herbert
a1b9499480 More documentation and constants 2017-06-19 18:41:11 +09:00
Dean Herbert
8c063fe2b8 Simplify AccentColour property for now 2017-06-19 18:38:39 +09:00
Dean Herbert
e269bdbad7 Use additive colour; adjust constants a bit 2017-06-19 18:30:13 +09:00
Dean Herbert
359cb4c083 Add kiai support 2017-06-19 18:29:44 +09:00
ColdVolcano
77ca48c1bd CI Fixes 2017-06-18 23:52:42 -05:00
ColdVolcano
84aa17dea3 Attempt to fix possible loss of fraction 2017-06-18 23:08:27 -05:00
ColdVolcano
63aabc162b Fix TestCaseMenuButtonSystem not starting up 2017-06-18 22:34:45 -05:00
ColdVolcano
3764c1d799 Make bar length and visualizer count floats 2017-06-18 22:28:18 -05:00
ColdVolcano
cea8dc5602 Fix possible loss of fraction 2017-06-18 22:13:21 -05:00
ColdVolcano
d3662636d6 CI fixes 2017-06-18 22:01:07 -05:00
ColdVolcano
ccac2e9a75 Add a visualizer around the logo 2017-06-18 19:33:50 -05:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
John Neijzen
aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
Dean Herbert
bdeaf2dbb4 Update method names in line with framework changes 2017-05-28 18:34:12 +09:00
Dean Herbert
0dbb2220e0 Add missing early activation to menu flashes 2017-05-24 21:07:12 +09:00
Dean Herbert
45a964cebe Merge branch 'master' into osu-direct 2017-05-24 15:33:53 +09:00
Dean Herbert
03f9a86366 Add missing readonly 2017-05-24 13:29:12 +09:00
Dean Herbert
16d9a677d0 Add a low-end cutoff for scale adjust 2017-05-24 13:08:59 +09:00
Dean Herbert
a9d1e54c27 Adjust triangle movement based on amplitude 2017-05-24 13:08:54 +09:00
Dean Herbert
4ee11764b8 Merge branch 'master' into osu-direct 2017-05-24 12:16:34 +09:00
Dean Herbert
b1bd88ae71 Merge branch 'master' into logo-beat 2017-05-24 11:41:02 +09:00
ColdVolcano
207d6e4ac3 Update to new syntax of OnNewBeat 2017-05-23 20:01:20 -05:00
ColdVolcano
c6d744eb7c Merge branch 'master' of ppy/osu into menu-flashes 2017-05-23 20:00:02 -05:00
Dean Herbert
b477e5cd9e Fix potential nullref 2017-05-24 02:53:21 +09:00
Dean Herbert
813b09189c Remove unused parameter 2017-05-24 02:09:31 +09:00
Dean Herbert
7e827c4f11 Add amplitude adjust 2017-05-24 01:45:01 +09:00
Dean Herbert
b12300391b Merge branch 'master' 2017-05-24 01:17:09 +09:00
Dean Herbert
0dd52e4e29 Various refactoring 2017-05-23 17:26:28 +09:00
Dean Herbert
2decb2b2ff Add more flashiness during kiai time 2017-05-23 16:42:47 +09:00
Dean Herbert
73320f9a7e Don't bounce the ripple 
Also ripple better.
 2017-05-23 16:42:41 +09:00
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
Dean Herbert
3e0aaa1aa0 Add basic beat response to osu! logo 2017-05-23 12:29:43 +09:00
ColdVolcano
9235cbff8d Apply suggestions 2017-05-22 05:59:16 -05:00
ColdVolcano
63196df541 Typo fix 
Forgot the pharenteses
 2017-05-22 05:05:54 -05:00
ColdVolcano
601b840713 Apply suggestions 2017-05-22 04:55:33 -05:00
ColdVolcano
f2b5be27c8 CI Fixes 2017-05-22 04:53:32 -05:00
ColdVolcano
a1547f12d4 Applied suggestions + Update Framework 2017-05-22 04:38:21 -05:00
ColdVolcano
059af0850b Changes in-line with framework 2017-05-21 23:47:08 -05:00
ColdVolcano
38a566890f Add licence header 2017-05-20 11:44:19 -05:00
ColdVolcano
4e83f12f34 Initial implementation 
Note this won't work with the osu!bgm because it is not a beatmap
 2017-05-20 11:02:42 -05:00
DrabWeb
9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
Dean Herbert
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
23760d6805 Adjust osu! logo metrics and add shockwave impact animation 2017-05-15 19:36:03 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
Dean Herbert
a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Huo Yaoyuan
767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
Dean Herbert
f93adebc52 Minor style fixes. 2017-04-25 13:33:34 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
ColdVolcano
30b7a029dc Remove for real this time 2017-04-23 00:57:41 -05:00
ColdVolcano
fe35d20def Remove not needed stuff (+typo fix) 2017-04-23 00:50:02 -05:00
ColdVolcano
094a0f9639 Move MenuMusic logic to MainMenu 2017-04-23 00:36:23 -05:00
ColdVolcano
ca1f89f2cf Fix crash when there's no beatmaps 2017-04-14 17:48:27 -05:00
ColdVolcano
2c6327fca9 Build for real this time 2017-04-14 17:17:51 -05:00
Javier Flores
984c7092a6 Pls AppVeyor don't die 2017-04-14 16:33:58 -05:00
ColdVolcano
b7d61add45 Cleanup + AppVeyor fixes 2017-04-14 13:10:59 -05:00
ColdVolcano
b5fc84087f Show song in MusicController and SongSelect 2017-04-14 12:59:15 -05:00
ColdVolcano
2eb73a7c70 More smoothness when MenuMusic is false 2017-04-14 12:58:47 -05:00
ColdVolcano
2a9f4e6950 Get MenuMusic and MenuVoice woking 2017-04-14 12:42:42 -05:00
Dean Herbert
b5431c496b Fix osu! logo handling drags for no reason. 2017-04-08 19:34:04 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00