Commit Graph

218 Commits

Author SHA1 Message Date
Marcel Schwarz
63e0336413 Merge branch '6-controller-basis' into 'development'
Resolve "[Controller] Basis"

Closes #6

See merge request marcel.schwarz/software-projekt-2!7
2020-04-19 13:08:51 +00:00
ee69f2c345 Add Bases, Autospawn 15 Bases
Add visual effect when base is touched
2020-04-19 02:42:47 +02:00
79dcc78f75 Make base spawn at touch 2020-04-19 02:42:16 +02:00
e82a7a90d2 Change Base texture to generic one 2020-04-19 02:38:26 +02:00
819ad764e3 Remove .gitattributes
It destroys the xcode project file
2020-04-19 02:28:25 +02:00
Aldin Duraki
8f41a42621 Update .gitattributes 2020-04-18 17:52:37 +00:00
Marcel Schwarz
b3109e3621 Merge branch '3-hauptmenu' into 'development'
"Hauptmenü" first-steps

See merge request marcel.schwarz/software-projekt-2!5
2020-04-18 17:14:28 +00:00
Aldin Duraki
e82d0a57f8 Impl Menu Scene
* added temporary buttons assets
2020-04-18 18:13:20 +02:00
Aldin Duraki
393c8e2e0a Merge branch 'cleanup-boilerplate-code' into 'development'
Cleanup sample code

See merge request marcel.schwarz/software-projekt-2!8
2020-04-18 13:45:47 +00:00
4f3826df0c Formatting, remove unnecessary timestamp 2020-04-18 15:44:17 +02:00
8dfb274416 Remove sample code 2020-04-18 15:23:38 +02:00
Aldin Duraki
c1638f78fa Merge branch '5-view-basis' into 'development'
Resolve "[View] Basis"

Closes #5

See merge request marcel.schwarz/software-projekt-2!4
2020-04-18 12:17:04 +00:00
Marcel Schwarz
90736a6785 Resolve "[View] Basis" 2020-04-18 12:17:04 +00:00
Marcel Schwarz
05a9862732 Merge branch '10-projektinitialisierung' into 'development'
Resolve "Projektinitialisierung"

Closes #10

See merge request marcel.schwarz/software-projekt-2!3
2020-04-18 10:51:24 +00:00
Aldin Duraki
91b928d59f Projectinit 2020-04-18 12:50:39 +02:00
Marcel Schwarz
c227b1bec9 Add Issue Template 2020-04-17 13:23:28 +02:00
Aldin Duraki
de3ba12494 Update README.md 2020-03-27 15:58:58 +01:00
Aldin Duraki
b49041e79d Add README.md 2020-03-27 15:46:39 +01:00