tf you mean dev and main are 43 commits different? - #22
Merged
Conversation
Fix flash plant
this function isn't even used but i don't even care
fix: Buffer.cpp ToUTF8String should accept string without BOM
fix: MessageWidget utf8
refactor: remove AutoCrit and CritSec
fix: potential UAF in SysFont
upgrade to c++23 and windows macro fixes
fix: various SysFont fix and RenderCommandList refactor
fix: free planting cheat string
fix music and soundfx label in options dialog
allow stone button to be draw correctly with any size
feat: add -compile flag to compile definitions
…g optional arguments in place, changed trail back for the memset, fixed loading logic to be accurate
… + changed build num to the real 1.1.0 number
…reak the save file anymore
…luded), added missing variable init for textures in OpenGL + Added sampler support to OpenGLImage
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.