-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #56 from Catrobat/develop
Release v0.9
- Loading branch information
Showing
154 changed files
with
2,610 additions
and
380 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
Licenses of the Catrobat system | ||
|
||
The following licenses, terms, and conditions apply to your use of the Catrobat system: | ||
The following licenses, terms, and conditions apply to your use of the Catrobat system: | ||
Version 3.5, 28 January 2015 | ||
All source code of software constituting the Catrobat system, e.g., the integrated development environments (with all associated parts such as tutorial programs) and the interpreters and compilers for the Catrobat programming language, the image editing programs, the source code of software we wrote to run the Catrobat websites and other Internet resources, and all our own source code related to the Catrobat system, are free software: you can redistribute them and/or modify them under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version when it becomes available. | ||
|
||
|
@@ -18,12 +18,12 @@ Catrobat additionally contains third party code and resources as follows: | |
|
||
libGDX: <http://libgdx.badlogicgames.com> | ||
License information: Apache 2 License <https://raw.github.com/libgdx/libgdx/master/gdx/LICENSE> | ||
Copyright � 2011-2012 See <https://github.com/libgdx/libgdx/tree/master/gdx> | ||
Copyright © 2011-2012 See <https://github.com/libgdx/libgdx/tree/master/gdx> | ||
|
||
XStream: <http://xstream.codehaus.org> | ||
License information: <http://xstream.codehaus.org/license.html> | ||
Copyright � 2003-2006, Joe Walnes | ||
Copyright � 2006-2009, 2011 XStream Committers | ||
Copyright © 2003-2006, Joe Walnes | ||
Copyright © 2006-2009, 2011 XStream Committers | ||
All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: | ||
|
@@ -36,11 +36,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | |
|
||
Toolbar custom icons 1.0 facilities from Gentleface custom icon design: <http://gentleface.com/free_icon_set.html> | ||
License information: Creative Commons Attribution-NonCommercial 3.0: <https://creativecommons.org/licenses/by-nc-nd/3.0/> | ||
Copyright � 2006-2011 Gentleface. | ||
Copyright © 2006-2011 Gentleface. | ||
|
||
MINDdroid: <https://github.com/NXT/LEGO-MINDSTORMS-MINDdroid> | ||
Copyright � 2010/11 Guenther Hoelzl, Shawn Brown | ||
Copyright � 2010/11 LEGO System A/S, Aastvej 1, DK-7190 Billund, Denmark | ||
Copyright © 2010/11 Guenther Hoelzl, Shawn Brown | ||
Copyright © 2010/11 LEGO System A/S, Aastvej 1, DK-7190 Billund, Denmark | ||
MINDdroid is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. | ||
MINDdroid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
See the GNU General Public License for more details <http://www.gnu.org/licenses/> | ||
|
@@ -104,21 +104,21 @@ Check back here from time-to-time, because we are always trying to improve our l | |
Please mail any suggestions regarding these licenses to [email protected]. | ||
|
||
|
||
Licenses of all used 3rd party libraries | ||
Licenses of all used 3rd party libraries in ScratchToCatrobat | ||
|
||
Libraries of our converter tool: | ||
Batik 1.7 Apache License Version 2.0 | ||
jsoup under MIT license, Copyright � 2009 - 2013 Jonathan Hedle([email protected]) | ||
jsoup under MIT license, Copyright © 2009 - 2016 Jonathan Hedley ([email protected]) | ||
xmlpull Initial authors: Stefan Haustein and Aleksander Slominski | ||
xpp3_min Copyright 2002 Extreme! Lab, Indiana University. All rights reserved. | ||
xstream Copyright by the BSD license | ||
|
||
Web libraries: | ||
bootstrap Copyright by the MIT license | ||
jquery Copyright by the MIT license | ||
qrcode Copyright by the MIT license | ||
Web libraries: | ||
bootstrap released under the MIT license and copyright 2017 Twitter | ||
jquery released under the MIT license | ||
qrcode released under the MIT license | ||
|
||
Libraries used in Sourcecode filter: | ||
Libraries used in Sourcecode filter: | ||
Guava Apache License Version 2.0 | ||
SnakeYAML Licensed by APL 2.0. | ||
Commons-io Apache License Version 2.0 |
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
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
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,207 @@ | ||
Issues: | ||
-------------------------------------------------------------------------------- | ||
1) Folgende Zeile in org.catrobat.catroid.content.Look.java ersetzen: | ||
public class Look extends Image { | ||
|
||
mit: | ||
public class Look { | ||
|
||
-------------------------------------------------------------------------------- | ||
3) Folgende Zeile in org.catrobat.catroid.content.bricks.UserBrick.java (direkt in die Klasse) ersetzen: | ||
try { | ||
for (Formula formula : formulas) { | ||
variables.add(new UserVariable(element.getText(), formula.interpretDouble(sprite))); | ||
} | ||
} catch (InterpretationException e) { | ||
} | ||
|
||
mit: | ||
for (Formula formula : formulas) { | ||
variables.add(new UserVariable(element.getText())); | ||
} | ||
|
||
-------------------------------------------------------------------------------- | ||
4) Folgende Zeilen in org.catrobat.catroid.io.BackwardCompatibleCatrobatLanguageXStream.java loeschen: | ||
|
||
public void updateCollisionReceiverBrickMessage(File file) { | ||
final String collisionTag = "CollisionScript"; | ||
final String receivedTag = "receivedMessage"; | ||
Document originalDocument = getDocument(file); | ||
|
||
if (originalDocument != null) { | ||
NodeList scripts = originalDocument.getElementsByTagName("script"); | ||
for (int i = 0; i < scripts.getLength(); i++) { | ||
Node script = scripts.item(i); | ||
NamedNodeMap attr = script.getAttributes(); | ||
if (attr.getLength() > 0) { | ||
for (int j = 0; j < attr.getLength(); j++) { | ||
if (attr.item(j).getNodeValue().equals(collisionTag)) { | ||
NodeList messages = script.getChildNodes(); | ||
for (int k = 0; k < messages.getLength(); k++) { | ||
Node message = messages.item(k); | ||
if (message.getNodeName().equals(receivedTag)) { | ||
String broadcastMessage = message.getTextContent(); | ||
String[] broadcastMessages = broadcastMessage.split("<(\\W)*-(\\W)*>"); | ||
|
||
if (broadcastMessages[1].matches("(\\W)*ANYTHING(\\W)*")) { | ||
broadcastMessages[1] = PhysicsCollision.COLLISION_WITH_ANYTHING_IDENTIFIER; | ||
} | ||
broadcastMessage = broadcastMessages[0] + PhysicsCollision | ||
.COLLISION_MESSAGE_CONNECTOR + broadcastMessages[1]; | ||
|
||
message.setTextContent(broadcastMessage); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
saveDocument(originalDocument, file); | ||
} | ||
|
||
5) UNBEDINGT FOLGENDES KONTROLLIEREN: | ||
CatroidFieldKeySorter.java oeffnen und alle equals()-Aufrufe in Methode sortProjectFields() anschauen. | ||
JEDER (!) Equals-Vergleich MUSS in Project.java als Field/Membervariable vorkommen!! | ||
zum Beispiel: | ||
wenn fieldKey.getFieldName().equals("xmlHeader") in sortProjectFields() vorkommt, heiÃt das | ||
dass es ein "xmlHeader"-Field/Membervariable in der Project-Klasse in Project.java geben MUSS! | ||
Ist dies nicht der Fall mÃŒssen die Regeln in config.yml angepasst werden, sodass dieses Feld | ||
nicht vom SourceCodeFilter weggefiltert wird. | ||
|
||
6) UNBEDINGT FOLGENDES KONTROLLIEREN: | ||
CatroidFieldKeySorter.java oeffnen und alle equals()-Aufrufe in Methode sortSpriteFields() anschauen. | ||
JEDER (!) Equals-Vergleich MUSS in Sprite.java als Field/Membervariable vorkommen!! | ||
zum Beispiel: | ||
wenn fieldKey.getFieldName().equals("look") in sortProjectFields() vorkommt, heiÃt das | ||
dass es ein "xmlHeader"-Field/Membervariable in der Sprite-Klasse in Sprite.java geben MUSS! | ||
Ist dies nicht der Fall mÃŒssen die Regeln in config.yml angepasst werden, sodass dieses Feld | ||
nicht vom SourceCodeFilter weggefiltert wird. | ||
|
||
|
||
Zusatzregeln | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In Look.java folgendes löschen: | ||
|
||
boolean isBackgroundLook = getZIndex() == Constants.Z_INDEX_BACKGROUND; | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In Project.java | ||
|
||
Scene scene; | ||
try { | ||
scene = new Scene(context, context.getString(R.string.default_scene_name, 1), this); | ||
} catch (Resources.NotFoundException e) { | ||
//Because in test project we can't find the string | ||
scene = new Scene(context, "Scene 1", this); | ||
} | ||
|
||
ersetzen durch | ||
|
||
Scene scene = new Scene(null, "Scene 1", this); | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In Project.java folgendes loeschen: | ||
if (isCastProject) { | ||
setChromecastFields(); | ||
} | ||
// [...] | ||
removeInvalidVariablesAndLists(oldProject.dataContainer); | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In Project.java folgendes ändern: | ||
public Project(Context context, String name, boolean landscapeMode, boolean isCastProject) { | ||
zu: | ||
public Project(Scene.Context context, String name, boolean landscapeMode, boolean isCastProject) { | ||
|
||
und: | ||
public Project(Context context, String name, boolean landscapeMode) { | ||
zu: | ||
public Project(Scene.Context context, String name, boolean landscapeMode) { | ||
|
||
und: | ||
public Project(Context context, String name) { | ||
zu: | ||
public Project(Scene.Context context, String name) { | ||
|
||
und: | ||
public Project(SupportProject oldProject, Context context) { | ||
zu: | ||
public Project(SupportProject oldProject, Scene.Context context) { | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In Scene.java folgendes löschen: | ||
import org.catrobat.catroid.content.bricks.BrickWithSpriteReference; | ||
|
||
In Scene.java folgendes hinzufügen: | ||
|
||
public class Context{}; | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In Scene.java folgendes einfügen: | ||
|
||
background = new SingleSprite("Background"); | ||
|
||
und folgendes löschen: | ||
|
||
background.look.setZIndex(0) | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
|
||
In UserScriptDefinitionBrick.java folgendes ersetzen: | ||
@Override | ||
public Script getScriptSafe() { | ||
mit: | ||
public Script getScriptSafe() { | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
In SpriteDataBehaviour folgende Methode löschen: | ||
protected abstract boolean isClone(K key); | ||
|
||
und: | ||
|
||
Map<Sprite, List<V>> cloneForScene(Scene scene, Map<K, List<V>> dataMap) { | ||
// [...] | ||
} | ||
|
||
und: | ||
|
||
void removeCloneData() { | ||
// [...] | ||
} | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
In SpriteListBehaviour.java folgende Methode löschen: | ||
protected boolean isClone(Sprite key) { | ||
// [...] | ||
} | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
In SpriteVariableBehaviour.java folgende Methode löschen: | ||
@Override | ||
Map<Sprite, List<UserVariable>> cloneForScene(Scene scene, Map<Sprite, List<UserVariable>> originalData) { | ||
removeIllegalSpriteVariableEntries(null); | ||
return super.cloneForScene(scene, originalData); | ||
} | ||
|
||
und: | ||
|
||
@Override | ||
protected boolean isClone(Sprite key) { | ||
return key.isClone(); | ||
} | ||
|
||
----------------------------------------------------------------------------------------------------------- | ||
In UserBrickVariableBehaviour.java folgende Methode löschen: | ||
@Override | ||
protected boolean isClone(UserBrick key) { | ||
return false; | ||
} | ||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file renamed
BIN
+739 KB
lib/catroid_class_hierarchy_v0991_2.jar → ...catroid_class_hierarchy_v0993_release.jar
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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
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
Oops, something went wrong.