Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Feature/node editor 2 #927

Merged
merged 28 commits into from
Oct 31, 2022
Merged

Feature/node editor 2 #927

merged 28 commits into from
Oct 31, 2022

Conversation

rfuzzo
Copy link
Member

@rfuzzo rfuzzo commented Oct 3, 2022

node editor

pull Jack's node editor branch to main

ruchirlives and others added 19 commits March 31, 2022 16:29
@ruchirlives
Introducing nodify
3f9d595
@jackhumbert
Merge branch 'exploring-nodify' of https://github.com/ruchirlives/Wol…
20ec27d 
…venKit into feature/node-editor
@jackhumbert
add some quick nodes
8b3ad3f
@jackhumbert
nodes & connections working
0b00f8d
@jackhumbert
autolayout & some styling
706c7c9
@jackhumbert
phase/grouping node working
a2e636c
@jackhumbert
display more, highlight connections when node is selected
314b646
@jackhumbert
more types
f75ecff
@jackhumbert
import/reference experiments, automatic layout almost automatic
f0dc82a
@jackhumbert
fix autolayout
7b7615c
@jackhumbert
defer reference loading
1367058
@jackhumbert
ignore buffers for now, fix ref load condition
83c2ac5
@jackhumbert
make autolayout more generic, intro interfaces, middle mouse button pans
1c3353e
@jackhumbert
start scene files
2239a13
@jackhumbert
Merge branch 'develop' into feature/node-editor
e374ddb
@jackhumbert
get compiling
db83386
@rfuzzo
Merge branch 'feature/node-editor' into feature/node-editor_2
2e978ee
@rfuzzo
it compiles
2ebab94
@rfuzzo
disable editor
92724cb
@Traderain
Copy link
Collaborator

Can we merge this?

miroiu
miroiu reviewed Oct 12, 2022
View reviewed changes
WolvenKit/WolvenKit.csproj Outdated Show resolved Hide resolved
E1337Kat
E1337Kat reviewed Oct 12, 2022
View reviewed changes
WolvenKit.App/Globals.cs Outdated Show resolved Hide resolved
@dragonzkiller dragonzkiller mentioned this pull request Oct 13, 2022
Merged
E1337Kat and others added 2 commits October 13, 2022 10:46
@E1337Kat
🚸 💡 Add suggestions from @mirou
7cfc652
@rfuzzo
Merge pull request #964 from E1337Kat/feature/node-editor_2-update
d9bd7d3 
Implemented:

A command line argument to enable the node editor if so desired.
Fixed:

Bumped nodify version to 3.0.0 and made changes necessary to minimally support it.
E1337Kat
E1337Kat reviewed Oct 14, 2022
View reviewed changes
Copy link
Contributor

@E1337Kat E1337Kat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fairly clean, just need to remove the one thing I added before the appsettings changes.

WolvenKit.App/ViewModels/Shell/AppViewModel.cs Outdated Show resolved Hide resolved
WolvenKit.App/WolvenKit.App.csproj Show resolved Hide resolved
@E1337Kat
⬆️ Update Nodify to 4.1.0
a35829c 
♻️ Remove special overrides in favor of EditorGesture settings.
(as per #927 (comment))
@E1337Kat E1337Kat mentioned this pull request Oct 29, 2022
Merged
@rfuzzo rfuzzo merged commit 52f34ce into main Oct 31, 2022
@rfuzzo rfuzzo deleted the feature/node-editor_2 branch October 31, 2022 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackhumbert jackhumbert jackhumbert left review comments

@E1337Kat E1337Kat E1337Kat left review comments

@miroiu miroiu miroiu left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@rfuzzo @Traderain @jackhumbert @E1337Kat @miroiu @ruchirlives