Cleanup into master#39
Merged
mrsillydog merged 108 commits intomasterfrom Sep 29, 2020
Merged
Conversation
this is just a commit so I can change the readme on master
Struggling to update instance variables and have it be reflected on the Canvas, but at least it renders once.
Just updating timing to fit the presentation, more or less
Implemented Rani Hod's fix for testPhilosophers. More or less fixed both shaker (dumb) and merge (smart) sort. Swapped ColorGLfloat for ColorFloat to fix when I unnecessarily added ColorGLfloat months ago.
Update Makefiles for Mac + SPIA TSGL library files
RyanVreeke
pushed a commit
to RyanVreeke/TSGL
that referenced
this pull request
Jul 16, 2021
Fixed FONT's in TSGL folder.
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
2 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.
End of the road for SeniorProjectIA + Summer 2020 research. Can finally be considered stable with large upgrades in functionality. Just going to overwrite master entirely; nothing that will be overwritten hasn't already been incorporated.