-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Wip: Initial work on running game from the new editor #2796
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
ourabigdev
wants to merge
16
commits into
stride3d:xplat-editor
Choose a base branch
from
ourabigdev:xplat-editor
base: xplat-editor
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
2816cf4
initial work in running game project from editor
ourabigdev 2946b8b
Merge branch 'stride3d:xplat-editor' into xplat-editor
ourabigdev c334afa
Update Directory.Packages.props
ourabigdev 594cdd2
Merge branch 'xplat-editor' of https://github.com/ourabigdev/stride i…
ourabigdev ef5a203
some fixes includin going from async void to async Task
ourabigdev 3c10136
Update Stride.GameStudio.Avalonia.csproj
ourabigdev db37d54
Merge branch 'xplat-editor' of https://github.com/ourabigdev/stride i…
ourabigdev 6b5a2c1
Update Directory.Packages.props
ourabigdev 67283fc
Update ImageResources.axaml
ourabigdev 6c4fe7f
Merge branch 'stride3d:xplat-editor' into xplat-editor
ourabigdev 9972240
Wip: base changes to add start button
ourabigdev 0dcf077
Update MainViewModel.cs
ourabigdev ba2c592
Merge branch 'stride3d:xplat-editor' into xplat-editor
ourabigdev dc3255c
Merge branch 'xplat_editor' into ourabigdev_xplat-editor
Kryptos-FR 0a56ef0
Cleanup
Kryptos-FR c39f273
Merge branch 'stride3d:xplat-editor' into xplat-editor
ourabigdev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
using Avalonia; | ||
using Avalonia.Controls.ApplicationLifetimes; | ||
using Avalonia.Data.Core.Plugins; | ||
using Avalonia.Input; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Doesn't seem required. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yeah i forgot about that but should port the input checking function to this file |
||
using Avalonia.Markup.Xaml; | ||
using Avalonia.Media; | ||
using Avalonia.Styling; | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unnecessary change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah those things where made automatically by vs I didn't touch that
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It shouldn't be done by VS unless you have some non-standard config that overrides the
.editorconfig
that we have at the root of the repo. It has this line which forces each file to have a blank line at the end:stride/.editorconfig
Lines 6 to 8 in f99bde2