Merge svglevels branch #65
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
…t to generate a level from a jpg
…nt--make levelviewer && build/AvaraLevelViewer
…t to generate a level from a jpg
…nt--make levelviewer && build/AvaraLevelViewer
… for all included levels now
tra
pushed a commit
to tra/Avara
that referenced
this pull request
Jun 7, 2020
* add back pugixml and csscolorparser * add back SVGParser class * Point svglevels build to load 'test.svg' always, add little toy script to generate a level from a jpg * update csscolorparser to not use experimental namespace * fix AvaraLevelViewer app, which is meant to help with level development--make levelviewer && build/AvaraLevelViewer * attempt to fix svglevels on travis * attempt to fix svglevels on travis * attempt to fix svglevels on travis * attempt to fix svglevels on windows travis * attempt to fix svglevels on windows travis * rearrange inclusion of winsock2.h and 'using namespace std;' because c++ is awful * GetGame() instead of itsGame in AvaraLevelViewer.cpp * Handle svg parsing a little more gracefully * add pugixml back to makefile on svglevels branch * add back pugixml and csscolorparser * add back SVGParser class * Point svglevels build to load 'test.svg' always, add little toy script to generate a level from a jpg * update csscolorparser to not use experimental namespace * fix AvaraLevelViewer app, which is meant to help with level development--make levelviewer && build/AvaraLevelViewer * attempt to fix svglevels on travis * attempt to fix svglevels on travis * attempt to fix svglevels on travis * attempt to fix svglevels on windows travis * attempt to fix svglevels on windows travis * rearrange inclusion of winsock2.h and 'using namespace std;' because c++ is awful * GetGame() instead of itsGame in AvaraLevelViewer.cpp * Handle svg parsing a little more gracefully * add pugixml back to makefile on svglevels branch * fix some stuff on pict2svg * Merge fixes from @tra to do DirectBitsRgn correctly * remove test.svg * Fix some include issues on windows, add custom bsps for levels already included * split levelset export concerns off into separate script * Remove broken AvaraLevelViewer for now * make SVG level parsing its own function * Remove bit about custom shapes from README.md since they are exported for all included levels now * Add TEXT, HULL support to rsrc2files.py * remove extra files from old converter that are not being used
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.
This pull request does a number of things:
manifest.jsonfile as discussed in Modern level set format #52using namespace std;everywhere (sorry, it had to be done for Windows)string,stdexcept) in both our code and vendor libs (also for Windows)I've tested this on mac, windows, and linux--everything looks OK. If this fails to build on your machine, C++ is stupid. I'm mostly doing this PR to squash my terrible history down