Release Pull Request - merge 'develop' into 'master' #184
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
Introduces new tool to handle svg conversions
… converter (#129) The biggest changes for us are: * The DataContainer class that used to hold UserVariables and UserLists was removed. Instead UserVariables and UserLists are now stored in the sprite class for local variables and Project for global. * Nested bricks are now structured differently. Previously there was a start and an end brick, with all the nested bricks in between. Now a nested brick (e.g. IfThenBrick) has a List with it's nested bricks. End bricks are no longer needed. * In preperation for the new version of UserBricks, they were entirely removed from the current version. To reduce the amount of changes (that would have to be reverted again when the bricks are added back) I manually added the UserBrick classes to the class hierarchy.
Removed the branchname from the versionstring in the pre-commit hook This hook gets builded in helpers.py
scratchwebapi.downloadProjectMetaData retries to build the connection if the retry parameter is true. It only retries if no connection to the server can be made, or an unecpected statuscode is returned, but not when the server answers with a 404 (then it logs it and returns None). Removed old jsoup try/except in call of downloadProjectMetaData
…erarchy lib and source code filter config so that this will not happen again. (#143)
…ote bricks instead. (#151)
Co-authored-by: Dorian <dorian.lux@gmail.com>
Implemented workaround for dragMode. Uses the "draggable" variable as flag and adds a tapped script to draggable sprites. The script calculates the new position and moves the sprite to the new position. Sprites are also draggable while being moved, but then they vibrate a bit.
Added a PR Request Template similar to the one paintdroid already has.
Co-authored-by: Maximilian Bialek <bialek@student.tugraz.at> Co-authored-by: Dorian <dorian.lux@gmail.com>
…enever there are no keyboard keys to convert. Restructured the clone/collision with keyboard keys script for this case. (#147)
…ndByIndexAndWaitBrick (#159)
#164) - Implemented workaround for the 'goto [random position] brick' - Updated related unit test
…and sound (#155) Co-authored-by: Maximilian Bialek <bialek@student.tugraz.at> Co-authored-by: Dorian <dorian.lux@gmail.com>
Co-authored-by: Dorian <lux@student.tugraz.at>
Removes the injection of the pre-commit hook which increments the build number. After merging/rebasing this commit the file .git/hook/pre-commit should be deleted before committing.
Reverts to ws and http so that the TLS functionality can be provided with the reverse proxy. Checks first if server is open before closing it at shutdown => can close normally if can't open server This reverts commit 2573d95. Co-authored-by: Dorian <lux@student.tugraz.at>
…rick_and_implement_glide_to_object_workaround STCC-156-227 distanceTo- and glideTo-bricks
- Adds helper variables for HSV to RGB conversion and implements the algorithm - Adds a helper variable for changing pen size - Implements Scratch' default pen behavior realistically - Extends catrobat.formula_element_for() - Implements function to ease creation of formula trees (catrobat.create_formula_tree_for())
Traverses scratch3 scripts in scratch3.py and calculates the offset of the comments to convert them to scratch2 comments. Workaround in scratch.py that first makes a list of the offsets and the corresponding position for comments and then adds comments at those positions.
STCC-96/STCC-167 Implement pen bricks/tests for pen bricks
Convert the 10^ block using the power block instead of the workaround.
STCC-244 convert 10^
…ts_refactor_testdata_storage STCC-192 Outsource testprojects and refactor how testdata is stored Updates project IDs in test data - now referring to the S2CC Scratch projects Eliminates raw byte test data in project descriptions
…ns_brick STCC-184 workaround for 'contains'-brick
STCC-231 Convert Comments
incrementing version number
AntiDog
approved these changes
Jul 3, 2020
wslany
approved these changes
Jul 3, 2020
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Release Pull Request 02.07.2020
Changelog:
STCC-184 workaround for 'contains'-brick
STCC-192 Outsource testprojects and refactor how testdata is stored
STCC-244 convert 10^ brick
STCC-231 Convert Comments
STCC-167 Add tests for pen blocks
STCC-96 refactor/implement all pen bricks
STCC-156-227 fixed distanceTo brick and implement glide to object
STCC-221 configured web server to use TLS (reverting STCC-195) (#157)
STCC-241 removed automatic build number incrementation (#168)
STCC-140 FormulaElement in sound bricks can now be handled properly (#167)
STCC-207 fixed project ID missing on Scratch3 projects (#166)
STCC-225 added simple error parsing to run_statistics (#165)
STCC-224 creating a copy of media files for each costume (#155)
STCC-155 renamed media files (#155)
STCC-234 fixed goto[random position] so that sprite stays inside viewbox (#164)
STCC-222 fixed error on SetBackgoundByIndex bricks (#159)
STCC-206 fixed error at creation of mouse emulator script (#147)
STCC-211 added test for Scratch3 projects (#152)
STCC-216 fixed error on adding default behavior for user lists (#148)
STCC-229 fixed referencing user variables in converter.py (#156)
STCC-218 fixed an error during image conversion of incomplete SVG files (#150)
STCC-226 fixed a bug in Scratch3 parsing (#161)
STCC-161 added test for event.py (#140)
STCC-116 added a Server monitor script (#71)
STCC-177 added drag-mode workaround (#146)
STCC-142 properly encoding Scratch project title (#153)
STCC-219 fixed a race condition during image conversion (#154)
STCC-118 added a script that creates statistics of a number of conversions (#142)
STCC-214 added a workaround for user bricks (#151)
STCC-212 fixed exception when accessing user lists (#145)
STCC-200 added python to default.ini PATHS (#133)
STCC-209 fixed broken condition blocks (#141)
STCC-210 fixed faulty serialization of user variables after Class Hierarchy update (#134)
STCC-204 fixed wrong rounding of Catrobat Version Number (#138)
STCC-202 implemented metadata http retries (#136)
STCC-179 fixed tests for missing resources (#132)
STCC-203 fixed incorrect format string causing crash (#137)
STCC-201 fixed a problem where the branchname was added to the Converter version (#135)
STCC-194 fixed a bug where sprite were set at the wrong position
STCC-196 update of Sourcecode Filter for Catroid Release 0.964 (#128)
STCC-186 update to new Catroid Class Hierarchy (#129)
STCC-195 configured web server to use SSL (#127) (later reverted by STCC-221)
STCC-187 now replacing SetEffect and ChangeEffect blocks with NoteBricks (#124)
STCC-190 fixed a crash when block has incorrect format (#119)
STCC-181 reimplemented some faulty test in test converter (#125)
STCC-188 fixed exceptions from media converter (#121)
STCC-193 a condition that evaluates to true is now automatically inserted to an empty condition (#122)
STCC-189 now skipping conversion of blocks that have neither parent nor next block (#120)
STCC-180 reimplemented test requesting project info for ID (#123)
STCC-134 replaced some non-critical conversion errors with warnings (#118)