Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #20

Merged
merged 93 commits into from
Oct 19, 2018
Merged

Develop #20

merged 93 commits into from
Oct 19, 2018

Conversation

LeonMatthes
Copy link
Collaborator

Merge all updates done in the develop branch into master again, now that Travis is running again.

LeonMatthes and others added 30 commits August 14, 2018 16:13
@LeonMatthes
Possible fix for #6
de7a356
@LeonMatthes
Recategorized all uncategorized in ColorfulMorph
63e578c
@LeonMatthes
Enter commit log message here
3ec5abd
@LeonMatthes
Fix small typo
a3519ae
@LeonMatthes
Added compatibility for newest version of trunk
6a00b3e
@LeonMatthes
Work on #7
cd3bbb6 
First try to implement the option of moving the first line of code into an extra text field.
As this would destroy the styling of the parameters, try to fix this by providing an extra Environment which includes the parameters (not working yet!)
@LeonMatthes
Improvements to PolygonMorph lectures
d9a0d35 
The PolygonMorph now gets displayed in the Playgroud for better visual feedback
@LeonMatthes
Closes #10
3daccc6
@LeonMatthes
Fixes #6
ce3542e 
Not really pretty, but seems to work with alll Squeak 5.2 themes
@LeonMatthes
Closes #9
ff05fb3 
Changed the StarPolygon-Lecture description to contain the correct number of tips (3, not 5).
Refactored the MotuStarTester
@LeonMatthes
Closes #9
1d0bb68 
The Star lecture now only accepts yellow morphs.
Changed the provided solution accordingly.
@LeonMatthes
Closes #7
8aa998a 
Uses a custom parser for syntax highlighting.
Reuses the context bar for the method name/parameter list
@Jeilef
minor improvements, classified some methods, refactored method icon
ac6813a
@Jeilef
started refactoring of lecture structure. structure is now held in a …
46b750c 
…dictionary instead of a single class for each chapter
@LeonMatthes
Closes #11
45ac9bf 
Deactivate Ctrl+D and similar acions
@LeonMatthes
Enter commit log message here
b047063
@LeonMatthes
"Access an image" lecture now checks for correct file endings.
260e9e4 
Merge branch 'develop' of https://github.com/hpi-swa-teaching/SWT18-Project-06.git
@LeonMatthes
Reset all lectures (remove accidental solution uploads)
abd74e4
@Jeilef
moved from dictionary to subclass structure
c510e57
@LeonMatthes
Closes #12
70117ca 
Temporarily rebinds ActiveWorld to allow the use of openInWorld in the "Create Morph" lecture
@LeonMatthes
No longer allow the creation of new methods during user code compilation
0046066
@LeonMatthes
Rebound ActiveWorld in CreatePolygon lecture to enable openInWorld
181de74
@Jeilef
moved from singleton to classes
7cc2444
@Jeilef
categories are classes and lectures objects
8cda29e
@LeonMatthes
Potential fix for an issue, which may be caused by incorrect switchin…
4626572 
…g of the active world
@LeonMatthes
Remove "Widgets" dependency
20746ad
@LeonMatthes
Fix test failures due to incomplete MockLecture implementation
374e47f
@LeonMatthes
Potential fix for Squeak 5.0/1 test failures
144470d
@LeonMatthes
Replace missing method in Squeak 5.0
93b7abf
@Jeilef
fixed bug regarding the red and green icons indicating whether the le…
191f4d1 
…cture was solved successfully
@LeonMatthes
Remove infite loop in scene graph
ad8a496
@LeonMatthes
Remove invalid references to TARTestAutoRunner
2c89a09
@LeonMatthes
Fix small logic error
e7720b2
@LeonMatthes
Remove invalid references to "lecture" in MotuBrowser
d4ce5a9
@LeonMatthes
Remove another invalid reference to "lecture"
3cc7884
@LeonMatthes
Fix baseline dependency graph
4c80b5d
@LeonMatthes
Investigating segfaults
2ce8d16
@LeonMatthes
Investigating segfault
adf39dd
@LeonMatthes
Add output to DNU
8581f8f
@LeonMatthes
Remove indirection from DNU
ca6c443
@LeonMatthes
Move printout up in DNU
5b77e40
@LeonMatthes
Remove potentially critical code from MotuCreateMorph
0655f5f
@LeonMatthes
This should be broken again
8963831
@LeonMatthes
Added more debugging information
c9cdb09
@LeonMatthes
this should break again
9695f45
@LeonMatthes
Fix possible wrong return of ProtoObject in findImplementingClass:in:
fdcd68e
@LeonMatthes
only test MotuCreateMorph
9517889
@LeonMatthes
don't test MotuCreateMorph
2bf30cc
@LeonMatthes
Remove most of findCallsIn:
de00cb0
@LeonMatthes
Readd internalMethods call
1a8fa4a
@LeonMatthes
Emptied findCallsIn:
ab45cdf
@LeonMatthes
Remove findCallsIn:
ef3f048
@LeonMatthes
Change Morph to PolygonMorph in MotuCreateMorph solution
f481ea3
@LeonMatthes
Make Squeak-5.0 allowed failure on develop
f7e1232
@LeonMatthes
Remove MotuSpy from MotuCreateMorph
123f04c
@LeonMatthes
Merge branch 'develop' of https://github.com/hpi-swa-teaching/SWT18-P…
7c5e2e9 
…roject-06.git
@LeonMatthes
Add VB-Regex to Squeak5.0 dependencies
b4097a0
@LeonMatthes
Remove debugging information
0126809
@coveralls
Copy link

coveralls commented Oct 19, 2018 •
edited
Loading

Pull Request Test Coverage Report for Build 226

  • 852 of 1011 (84.27%) changed or added relevant lines in 228 files are covered.
  • 6 unchanged lines in 4 files lost coverage.
  • Overall coverage decreased (-1.3%) to 89.485%
Changes Missing Coverage Covered Lines Changed/Added Lines %
packages/MorphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/hasContents.st 0 1 0.0%
packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/instance/asString.st 0 1 0.0%
packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/instance/setItem.model.parent..st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/ColorfulMorph.class/instance/handleMouseDown..st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/ColorfulMorph.class/instance/handlesMouseDown..st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/ColorfulMorph.class/instance/step.st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/ColorfulMorph.class/instance/stepTime.st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/ColorfulMorph.class/instance/switchColors.st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/MotuAbandonMorph.class/instance/solutionAbandon..st 0 1 0.0%
packages/MorphicTutorial-Lectures.package/MotuImageMorphFileAtPath.class/instance/solutionPathToAnImage.st 0 1 0.0%
Files with Coverage Reduction New Missed Lines %
packages/MorphicTutorial-Lectures.package/MotuRelativePositioningMethod.class/instance/solutionPosition.relativeTo..st 1 0.0%
packages/MorphicTutorial-Lectures.package/MotuAbandonMorph.class/instance/solutionAbandon..st 1 0.0%
packages/MorphicTutorial-Lectures.package/MotuSteppingStepColors.class/instance/solutionStep.st 1 0.0%
packages/MorphicTutorial-Lectures.package/MotuNilLecture.class/instance/lectureName.st 3 0.0%
Totals Coverage Status
Change from base Build 221: -1.3%
Covered Lines: 2502
Relevant Lines: 2796
💛 - Coveralls

@LeonMatthes LeonMatthes merged commit affc084 into master Oct 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LeonMatthes @coveralls @Jeilef @stlutz