Diffusion symkit 5dd517887a98

Merge branch 'ancarola'
5dd517887a98
Actions

Authored by ancarola on Apr 12 2018, 22:03.

Description

Merge branch 'ancarola'

This merge updated and finalize (??) the graphics section

Details

Committed

ancarola

Apr 12 2018, 22:03

Pushed

ancarola

Apr 12 2018, 22:04

Parents

rSYMKITcfa173cb6020: Detach SKActor from the Evolvable dependency
rSYMKIT614e30b3e200: Merge branch 'ancarola'

Branches

Unknown

Tags

Unknown

Event Timeline

ancarola committed rSYMKIT5dd517887a98: Merge branch 'ancarola' (authored by ancarola).Apr 12 2018, 22:03

Merged Changes

	Commit			Author	Details	Committed
	cfa173cb6020			ancarola	Detach SKActor from the Evolvable dependency	Apr 12 2018

Changes (43)

		Path
M		alpha/alpha.pro
M		alpha/alphascene.cpp
M		alpha/alphascene.h
V		alpha/{newtonsphere.cpp ← sphere.cpp}
V		alpha/{newtonsphere.h ← sphere.h}
M		alpha/pendule.cpp
M		alpha/pendule.h
M		alpha/ressor.cpp
M		alpha/ressor.h
V		alpha/{sphere.cpp → newtonsphere.cpp}
V		alpha/{sphere.h → newtonsphere.h}
V		symgraph/actors/abstractsystem.h
D		symgraph/actors/abstractsystem.tpp
M		symgraph/actors/decoration.cpp
M		symgraph/actors/decoration.h
D		symgraph/actors/oscillatorshape.cpp
D		symgraph/actors/oscillatorshape.h
D		symgraph/actors/oscillatorsystem.cpp
D		symgraph/actors/oscillatorsystem.h
M		symgraph/actors/particle.cpp
P		symgraph/actors/particle.h Copied to symgraph/actors/particles/newtonparticle.h
A	(dir)	symgraph/actors/particles/
A		symgraph/actors/particles/newtonparticle.cpp
P		symgraph/actors/particles/newtonparticle.h Copied from symgraph/actors/particle.h
A		symgraph/actors/particles/oscillatorparticle.cpp
A		symgraph/actors/particles/oscillatorparticle.h
M		symgraph/actors/particlesystem.cpp
V		symgraph/actors/{particlesystem.h → systems/interactingsystem.h}
M		symgraph/actors/shape.h
A	(dir)	symgraph/actors/systems/
A		symgraph/actors/systems/interactingsystem.cpp
V		symgraph/actors/{systems/interactingsystem.h ← particlesystem.h}
D		symgraph/actors/tickcounter.cpp
D		symgraph/actors/tickcounter.h
M		symgraph/scene.cpp
M		symgraph/scene.h
M		symgraph/skactor.h
M		symgraph/symgraph.pro
M		templates/documentation/documentation.aux
M		templates/documentation/documentation.log
M		templates/documentation/documentation.pdf
M		templates/documentation/documentation.tex
M		templates/documentation/documentation.toc