Homec4science

Merge branch 'cincotti'

Authored by ancarola on Mar 15 2018, 11:14.

Description

Merge branch 'cincotti'

Oscillateur merge

Details

Merged Changes

CommitAuthorDetailsCommitted
52a3f28c1631ancarola
Merge branch 'ancarola' into cincotti 
Mar 15 2018
42fa8152a3bfancarola
First add texture 
Mar 15 2018
ad8aea6dd429Cincotti
.. 
Mar 15 2018
36f84990b10bCincotti
Created class Oscillateur and subclass PenduleS 
Mar 15 2018
79c6c1993380ancarola
Color semplification 
Mar 14 2018
da224a4b07a1ancarola
Scene class simplified and more accessible 
Mar 14 2018
46737d46175dancarola
Tested working alpha project 
Mar 14 2018
63887c4e0301ancarola
Last bug fixed 
Mar 14 2018
234997eeb81fancarola
Compile time bugs and dependencies fixed 
Mar 13 2018
35f654bdb2d2Cincotti
corretto iosymkit 
Mar 13 2018
d22fa90cfcaeancarola
Merge branch 'ancarola' into cincotti 
Mar 13 2018
a7b52a47990fCincotti
Symgraph.pro modified 
Mar 13 2018
5be34ceb1146ancarola
Shape update 
Mar 13 2018
0adc58eebec9ancarola
Shape content modified: 
Mar 12 2018
9fc5339b05b1ancarola
Merge branch 'ancarola' into cincotti 
Mar 12 2018
a31dd48295fbancarola
Merge branch 'master' of ssh://c4science.ch/source/symkit_prog into cincotti 
Mar 12 2018