Merging master into XML converter #185
Merged
Conversation
This file contains 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
* cleaning up the mumble link code * adding a timeout for burrito link to allow it to exit if it is orphaned * adding a method to allow for burrito link to be launched automatically * removing trailing whitespace from some gdscript files
Minimum Size Setting
Also removing all the ifdefs for _WIN32 specific code assuming that this program should only be compiled with _WIN32
The burrito_link infinite loop can now run within the built d3d11.dll file. Meaning that burrito link can now be auto launched by gw2 and does not need any configuration to do so.
Zero Config Burrito Link
In theory the 7 day limit seemed economical, but in practice not having easy access to whatever the "newest" build artifact on master is has proven annoying.
Removing artifact retention 7 day limit
[SOTO Update] Shifted the burrito button to the right
Pin Docker CI Version
klingbolt
suggested changes
Oct 27, 2023
Spatial.gd
Outdated
| print("New Map") | ||
|
|
||
| print("Saving Old Map") | ||
| self.markerdata[str(old_map_id)] = data_from_renderview() |
There was a problem hiding this comment.
This line will crash. Markerdata is now defined on line 365 as var markerdata = Waypoint.Waypoint.new()
Spatial.tscn
Outdated
| @@ -600,125 +601,158 @@ disabled = true | |||
| text = "Reverse Path Direction" | |||
|
|
|||
| [node name="SettingsDialog" type="WindowDialog" parent="Control/Dialogs"] | |||
| visible = true | |||
There was a problem hiding this comment.
This should be false. Godot gives a node configuration warning that pop ups will be hidden on run time
There was a problem hiding this comment.
accepting suggestion to remove the line, it will be re-added when saving is recreated.
Co-authored-by: klingbolt <[email protected]>
Co-authored-by: klingbolt <[email protected]>
klingbolt
approved these changes
Oct 27, 2023
|
Woops, it looks like I made a merge commit. Oh well, not going to fix it now we will just live. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolved the merge conflicts between xml converter and master so that xml converter can more easily be merged back into master when it is completed.
When merged, this PR should be fastforwarded, no need to create a merge commit for a merge commit.