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

Bug fixing #41

Merged
merged 8 commits into from
Sep 21, 2020
Merged

Bug fixing #41

merged 8 commits into from
Sep 21, 2020

Conversation

sammyfreg
Copy link

Editor can now close without crash

@sammyfreg
Added support for netImgui.
79ba3a7 
TODO: fix issue with editor not drawing until PIE activated once
TODO: Implement UE4 sockets (instead of using Winsock directly)
TODO: Figure out how to expose options to user, and netImgui server exe
@sammyfreg
netImgui: Fix compile and running error in game mode
beb0ecc
@sammyfreg
NetImgui: Added mirroring option
6dcc1b0
@sammyfreg
Fix for Texture format detection and disconnect request
a686699
@sammyfreg
Added : Dual Draw support
ed0d3b0 
Added: IsRemoteDrawing() and IsRemoteConnected() to FImGuiModuleProperties
Removed : Intrusive code in FProxyContext
Fixed: NoUnityBuild
@sammyfreg
Added support of Unreal Sockets instead of using Windows code. Every …
65ef856 
…platform supported by Unreal should now work with remote connection.
@sammyfreg
Merge pull request #1 from segross/net_imgui
f3adb81 
Added support for netImgui. (segross#39)
@sammyfreg
Bugfix: making sure sockets are all closed before exiting netImgui sh…
0481be6 
…utdown
@sammyfreg
Copy link
Author

Somehow, it pulled the various checkin history. Only the last commit (Bugfix : 0481be6 ) matter, everything else should be the same

@segross
Copy link
Owner

segross commented Sep 19, 2020

Hey. I've seen your response in the other thread but I will continue here. Thank you for looking into this and for the quick fix.

Yes, that is strange. Not sure why that happened. I'll see how it looks on my side. Possibly it will figure out that those are the same CLs.

@sammyfreg
Copy link
Author

Probably because of the squash checkin. It seems to be having no merge conflicts.

@segross segross merged commit e522028 into segross:net_imgui Sep 21, 2020
@segross
Copy link
Owner

segross commented Sep 21, 2020

Great thanks for the fix @sammyfreg!

It all merged nicely and despite the confusion with changes it looks good in the actual CL. Thanks for the heads up.
And about why so many changes. I think that the likely reason might be the fact that the BugFixing was branched from the master and the first change was not yet merged there.

sammyfreg added a commit to sammyfreg/UnrealImGui that referenced this pull request Jan 23, 2021
@sammyfreg
Merge pull request #3 from segross/net_imgui
855ebec 
Bug fixing (segross#41)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
2 participants
@sammyfreg @segross