Diffusion symkit ab3cd8070167

Merge branch 'cincotti'
ab3cd8070167
Actions

Authored by Cincotti on Mar 23 2018, 11:07.

Description

Merge branch 'cincotti'

scrivi qualcosa qui

Details

Committed

Cincotti

Mar 23 2018, 11:07

Pushed

Cincotti

Mar 23 2018, 11:07

Parents

rSYMKIT69c81a2fb83e: distingué methodes Newmark et Euler Cromer
rSYMKITbff10331a6ec: Mise à jour du fichier JOURNAL.txt

Branches

Unknown

Tags

Unknown

Event Timeline

Cincotti committed rSYMKITab3cd8070167: Merge branch 'cincotti' (authored by Cincotti).Mar 23 2018, 11:07

Merged Changes

Commit	Author	Details	Committed
69c81a2fb83e	Cincotti	distingué methodes Newmark et Euler Cromer	Mar 23 2018
cbe9dd905465	Cincotti	on test update_Newmark	Mar 22 2018
2f29b4b51542	Cincotti	added to project Ressort simulation	Mar 21 2018
37a105d43bac	Cincotti	si si	Mar 21 2018
063fb413607f	ancarola	FInalisation	Mar 21 2018
af2ca576396c	ancarola	Shaders fix	Mar 21 2018

Changes (41)

				Path
	M			alpha/alpha.pro
	M			alpha/alphascene.cpp
	M			alpha/alphascene.h
	V			{alpha → symgraph}/fragment_shader.glsl
	M			alpha/marbled.cpp
	A			alpha/pendule.cpp
	A			alpha/pendule.h
	V			{alpha/resource.qrc → symgraph/shaders.qrc}
	A			alpha/ressor.cpp
	A			alpha/ressor.h
	M			alpha/sphere.cpp
	V			{alpha → symgraph}/vertex_shader.glsl
	M			oscillateur/main.cpp
	P			oscillateur/oscillateur.cpp Copied to symath/descriptors/oscillateur.cpp
	P			oscillateur/oscillateur.h Copied to symath/descriptors/oscillateur.h
	D			oscillateur/oscillateur.pro
	P			oscillateur/pendules.cpp Copied to symath/descriptors/pendules.cpp
	P			oscillateur/pendules.h Copied to symath/descriptors/pendules.h
	P			oscillateur/ressort.cpp Copied to symath/descriptors/ressort.cpp
	P			oscillateur/ressort.h Copied to symath/descriptors/ressort.h
	M			symath/descriptor.h
	M			symath/descriptors/newton.cpp
	M			symath/descriptors/newton.h
	P			symath/descriptors/oscillateur.cpp Copied from oscillateur/oscillateur.cpp
	P			symath/descriptors/oscillateur.h Copied from oscillateur/oscillateur.h
	P			symath/descriptors/pendules.cpp Copied from oscillateur/pendules.cpp
	P			symath/descriptors/pendules.h Copied from oscillateur/pendules.h
	P			symath/descriptors/ressort.cpp Copied from oscillateur/ressort.cpp
	P			symath/descriptors/ressort.h Copied from oscillateur/ressort.h
	M			symath/svector.h
	M			symath/symath.pro
	V			{symgraph ← alpha}/fragment_shader.glsl
	M			symgraph/particle.cpp
	M			symgraph/scene.cpp
	M			symgraph/scene.h
	V			{symgraph/shaders.qrc ← alpha/resource.qrc}
	M			symgraph/shape.cpp
	M			symgraph/shape.h
	M			symgraph/symgraph.pro
	V			{symgraph ← alpha}/vertex_shader.glsl
	M			symkit.pro