GitWorkflow: Unterschied zwischen den Versionen
Aus Das Sopra Wiki
| Zeile 17: | Zeile 17: | ||
<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 | |||
| | | |||
| * .... - Better wildcard texture for game objects - student03 | |||
| | | |||
... | |||
| * .... - A nice drawable game object (see #13) - student01 | |||
| | | |||
| * .... - Prototype spatial data structure for game objects see #14 - student02 | |||
| | | |||
| * .... - Interface for game objects see #14- student01 | |||
|/ | |||
(master) | (master) * | ||
</source> [[Kategorie:Code-Beispiele]] | </source> | ||
Ein Merge überführt die Änderungen aus dem ''dev'' branch in den Masterbranch. | |||
<source> | |||
(HEAD, dev, master) * | |||
|\ | |||
| * .... - Fixed bug. Everything working. (closes #22) - student03 | |||
| | | |||
| * .... - Game object able to move (hardcoded) see #12 - student01 | |||
| | | |||
| * .... - Better wildcard texture for game objects - student03 | |||
| | | |||
... | |||
| * .... - A nice drawable game object (see #13) - student01 | |||
| | | |||
| * .... - Prototype spatial data structure for game objects see #14 - student02 | |||
| | | |||
| * .... - Interface for game objects see #14- student01 | |||
|/ | |||
* | |||
</source> | |||
Im folgenden Sprint wird weiter am ''dev'' branch gearbeitet. [[Kategorie:Code-Beispiele]] | |||
== Links == | == Links == | ||
