GitWorkflow: Unterschied zwischen den Versionen
Aus Das Sopra Wiki
Keine Bearbeitungszusammenfassung |
|||
| Zeile 23: | Zeile 23: | ||
<source> | <source> | ||
* d030e28 (origin/dev) A Whitty comment (closes #41) - Tina Teststudent | * d030e28 (origin/dev) A Whitty comment (closes #41) - Tina Teststudent | ||
| * c91275a (HEAD -> dev) A Whitty comment (closes #22) - Benjamin Beispielstudent | | * c91275a (HEAD -> dev) A Whitty comment (closes #22) - Benjamin Beispielstudent | ||
|/ | |/ | ||
| Zeile 32: | Zeile 31: | ||
<source> | <source> | ||
* c91275a (HEAD -> dev) A Whitty comment (closes #22) - Benjamin Beispielstudent | * c91275a (HEAD -> dev) A Whitty comment (closes #22) - Benjamin Beispielstudent | ||
* d030e28 (origin/dev) A Whitty comment (closes #41) - Tina Teststudent | * d030e28 (origin/dev) A Whitty comment (closes #41) - Tina Teststudent | ||
* f48f012 Created initial Project - ... | * f48f012 Created initial Project - ... | ||
</source> | </source> | ||
| Zeile 43: | Zeile 40: | ||
<source> | <source> | ||
* c91275a (HEAD -> dev, origin/dev) A Whitty comment (closes #22) - Benjamin Beispielstudent | * c91275a (HEAD -> dev, origin/dev) A Whitty comment (closes #22) - Benjamin Beispielstudent | ||
* d030e28 A Whitty comment (closes #41) - Tina Teststudent | * d030e28 A Whitty comment (closes #41) - Tina Teststudent | ||
* f48f012 Created initial Project - ... | * f48f012 Created initial Project - ... | ||
</source> [[Kategorie:Code-Beispiele]] | </source> [[Kategorie:Code-Beispiele]] | ||
| Zeile 55: | Zeile 50: | ||
<source> | <source> | ||
| * .... (HEAD -> dev) Fixed bug. Everything working. (closes #22) - student03 | | * .... (HEAD -> dev) Fixed bug. Everything working. (closes #22) - student03 | ||
| * .... Game object able to move (hardcoded) see #12 - student01 | | * .... Game object able to move (hardcoded) see #12 - student01 | ||
| * .... Better wildcard texture for game objects - student03 | | * .... Better wildcard texture for game objects - student03 | ||
... | ... | ||
| * .... A nice drawable game object (see #13) - student01 | | * .... A nice drawable game object (see #13) - student01 | ||
| * .... Prototype spatial data structure for game objects see #14 - student02 | | * .... Prototype spatial data structure for game objects see #14 - student02 | ||
| * .... Interface for game objects see #14- student01 | | * .... Interface for game objects see #14- student01 | ||
|/ | |/ | ||
| Zeile 76: | Zeile 66: | ||
|\ | |\ | ||
| * .... Fixed bug. Everything working. (closes #22) - student03 | | * .... Fixed bug. Everything working. (closes #22) - student03 | ||
| * .... Game object able to move (hardcoded) see #12 - student01 | | * .... Game object able to move (hardcoded) see #12 - student01 | ||
| * .... Better wildcard texture for game objects - student03 | | * .... Better wildcard texture for game objects - student03 | ||
... | ... | ||
| * .... A nice drawable game object (see #13) - student01 | | * .... A nice drawable game object (see #13) - student01 | ||
| * .... Prototype spatial data structure for game objects see #14 - student02 | | * .... Prototype spatial data structure for game objects see #14 - student02 | ||
| * .... Interface for game objects see #14- student01 | | * .... Interface for game objects see #14- student01 | ||
|/ | |/ | ||
| Zeile 95: | Zeile 80: | ||
<source> | <source> | ||
| * .... First 'Tank'-unit (closes #26) - student03 | | * .... First 'Tank'-unit (closes #26) - student03 | ||
* | .... (HEAD -> dev, master) Merged Sprint2 into Master. | * | .... (HEAD -> dev, master) Merged Sprint2 into Master. | ||
|\| | |\| | ||
| * .... Fixed bug. Everything working. (closes #22) - student03 | | * .... Fixed bug. Everything working. (closes #22) - student03 | ||
... | ... | ||
</source> | </source> | ||
