Merge 1.34 from dev to master #188
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
… : Allow a min value of 0.02 instead of 0.03 for the "Max Physics Delta-Time Per Frame" main menu setting. This was already possible by manually editing the `settings.cfg` file, but changes would revert when going into the settings screen.
* zh-cn localization for ManufacturerFixes.cfg (#178) * Remove ENABLE_PROFILER define that got added recently --------- Co-authored-by: zhangyuesai <zhangyuesai@live.com>
…ss or volume -for example, changing a part's variant (rcs thruster blocks, structural tube) or its resource level could change its mass, but when you store it in inventory the mass would always use the value from the prefab
…t commit by accident
…ff the ground in EVA construction
…ning is enabled
(note personally I'd prefer tabs for indents, but all the existing code in here that didn't come from me uses spaces and consistency is more important)
Whitespace-only change. (note most of these were originally authored by me, but the project as a whole uses spaces pretty consistently)
* BetterEditorUndoRedo : Exploratory fix for undo/redo state, doesn't work because of VesselCrewManifest side effects See #172 * BetterEditorUndoRedo : functional, obvious issues fixed, still likely to cause side effects. * disable BetterEditorUndoRedo by default --------- Co-authored-by: JonnyOThan <jonnyothan@gmail.com>
* Fix #50: PAWGroupMemory is no longer per-PAW, but stores the expansion state for all windows and is not cleared on scene changes -possible future work: persist the collapse state to disk * collapse or expand PAW groups when the PAW is shown
* zh-cn localization for ManufacturerFixes.cfg (#178) * Remove ENABLE_PROFILER define that got added recently --------- Co-authored-by: zhangyuesai <zhangyuesai@live.com>
|
Please don't do master <> dev syncs with PRs, just do a regular merge |
So I'm really not that familiar with git and github. How do you do that? |
|
Well you can do it in any git client. But assuming you are using visual studio, for example for merging master to dev : |
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.
No description provided.