Merge branch 'master' of ssh://c4science.ch/source/symkit_prog
Description
Description
Details
Details
- Committed
Cincotti Mar 8 2018, 20:48 - Pushed
Cincotti Mar 8 2018, 20:52 - Parents
- rSYMKIT3e74ce4ae2a5: Mise à jour de JOURNAL.txt
rSYMKIT52da575c951b: HEAD merge fix - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 52da575c951b | ancarola | HEAD merge fix | Mar 8 2018 | |||
| d61816fcab11 | ancarola | Merge III week | Mar 8 2018 | |||
| 8869a44bc8c0 | Cincotti | maro' | Mar 8 2018 | |||
| 5801fc946e07 | Cincotti | Ho messo le cartelle che non mi compilano su windows (Tutorial Qt del corso) | Mar 8 2018 | |||
| 939e0425601a | ancarola | Sphere implementation | Mar 8 2018 | |||
| c4a73e03c703 | ancarola | OpenGL calls bound in render method | Mar 8 2018 | |||
| d7a3ccd528f0 | ancarola | GLBuffer structure definition | Mar 8 2018 | |||
| 2e2fc9327beb | ancarola | Merge fix for scene | Mar 7 2018 | |||
| 44716373a13f | ancarola | Scene and shape semplification | Mar 7 2018 | |||
| d23d4aa32249 | ancarola | adds on scene | Mar 7 2018 | |||
| 07a633e68437 | Cincotti | .. | Mar 7 2018 | |||
| ffbc0c278fe0 | ancarola | Convertion of the namespace scene into a class Scene such that is more simple… | Mar 6 2018 | |||
| 23b2bbe674e0 | Cincotti | Qt setup | Mar 6 2018 | |||
| 5d2e024aca68 | ancarola | Merge fix from ancarola 2 | Mar 5 2018 | |||
| c466a58873c1 | ancarola | Merge from ancarola branch | Mar 5 2018 | |||
| dcdcc701ce40 | Cincotti | Debugged Vector class | Mar 2 2018 | |||
| b6137f114fe2 | Cincotti | .. | Mar 1 2018 | |||
| 083f0fbb92d3 | Cincotti | Eliminata una funzione di troppo | Mar 1 2018 | |||
| 14ecfed6e238 | Cincotti | Ajouté deux throw et un operator d'affectation pour Vector | Mar 1 2018 | |||
| dded1cebe4d8 | ancarola | Vector class: Ajoute' plusiers operateur Implemente' les fonctions de base… | Mar 1 2018 | |||
| d81e30c75381 | Cincotti | Li ho messi in Engine | Mar 1 2018 | |||
| a52593c96fb8 | ancarola | Merging from master | Feb 27 2018 |