hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 996800bc01 Impl. HUD for GameScene Aldin Duraki 2020-04-23 23:01:19 +0200
  • 017bb3bd6a Merge branch '3-hauptmenu' into 'development' Aldin Duraki 2020-04-23 19:35:29 +0000
  • db7411bf6c Merge branch '3-hauptmenu' into 'development' Aldin Duraki 2020-04-23 19:32:23 +0000
  • 5ffe6fe81c Finalize MenuScene Aldin Duraki 2020-04-23 21:31:43 +0200
  • 647ca473c3 Merge branch '15-logo-erstellen' into 'development' Aldin Duraki 2020-04-23 18:11:28 +0000
  • 16e7491804 Merge branch '15-logo-erstellen' into 'development' Aldin Duraki 2020-04-23 18:09:30 +0000
  • c207e2a354 add missing iPad icons the_kellner 2020-04-23 18:35:41 +0200
  • f21ca69061 Merge branch '15-logo-erstellen' into 'development' Aldin Duraki 2020-04-23 16:30:47 +0000
  • af57b62f1f Merge branch '15-logo-erstellen' into 'development' Simon Kellner 2020-04-23 16:18:34 +0000
  • 3ce979303e add logo 20 pt and 26 pt the_kellner 2020-04-23 18:18:02 +0200
  • f5f45af111 Merge branch '16-einheiten-der-basis-hinzufugen' into 'development' Aldin Duraki 2020-04-22 17:42:27 +0000
  • 00851c98da Merge branch '16-einheiten-der-basis-hinzufugen' into 'development' Jakob Haag 2020-04-22 16:25:52 +0000
  • 31143265f6 add unitCount and unitType for basePlayer1 and basePlayer2 72haja 2020-04-22 18:17:07 +0200
  • d8adce88d2 add attributes to Base for unitCount and unitType. Init attributes in constructor with default parameters 72haja 2020-04-22 18:16:25 +0200
  • 6c68a569b9 Change struct Unit to enum Unit 72haja 2020-04-22 18:14:27 +0200
  • 807ecdd75e Merge branch '15-logo-erstellen' of https://gitlab.com/marcel.schwarz/software-projekt-2 into 15-logo-erstellen 127-Z3R0 2020-04-22 16:59:21 +0200
  • fdbce8e56d Merge branch '11-view-background' into 'development' Aldin Duraki 2020-04-22 14:49:41 +0000
  • cd279664fc Merge branch '11-view-background' into 'development' Ömer Özel 2020-04-22 14:48:59 +0000
  • 79dce7738f Merge branch 'fix-unit-class' into 'development' Aldin Duraki 2020-04-22 14:45:13 +0000
  • cffa5f32ca Merge branch 'fix-unit-class' into 'development' Aldin Duraki 2020-04-22 14:44:32 +0000
  • 6f8487e16e Refactor Unit class Aldin Duraki 2020-04-22 16:43:58 +0200
  • d5058afebb Merge branch '12-model-einheiten' into 'development' Aldin Duraki 2020-04-22 14:34:39 +0000
  • 86f22850e6 Merge branch '12-model-einheiten' into 'development' Chauntalle Schüle 2020-04-22 14:34:10 +0000
  • dd07cf9ad8 Merge branch '8-controller-laufwege' into 'development' Aldin Duraki 2020-04-22 14:29:55 +0000
  • fd23282d3e Merge branch '8-controller-laufwege' into 'development' Tim Herbst 2020-04-22 14:29:47 +0000
  • b87eb3dd53 delete portrait-mode and more refactoring with master Aldin 127-Z3R0 2020-04-22 16:29:28 +0200
  • 6712398f6a forgive me master 127-Z3R0 2020-04-22 16:25:06 +0200
  • dffcb320b2 Background add Ömer Özel 2020-04-22 16:22:06 +0200
  • b7128f8c03 add xcshareddata to gitignore 127-Z3R0 2020-04-22 16:07:33 +0200
  • e91b2c3220 refactoring with master Aldin 127-Z3R0 2020-04-22 15:59:31 +0200
  • d596442015 add physicsbody to base 6-7 and removal to func addPhysicsBodyToBase() 127-Z3R0 2020-04-22 14:04:40 +0200
  • 7b128a7ee8 delete commented Code and prints 127-Z3R0 2020-04-21 20:07:36 +0200
  • 9be1401506 Change Variables Chauntalle Schüle 2020-04-21 19:16:35 +0200
  • f2be3a955b add logo files in different sizes, update filenames in Contents.json Simon Kellner 2020-04-21 16:24:01 +0200
  • 06a4bea38d add struct für die Einheiten im File Unit.swift Chauntalle Schüle 2020-04-21 13:59:06 +0200
  • f3036a5b33 fix interaction-menu with base - zPosition 127-Z3R0 2020-04-20 14:32:34 +0200
  • 4acd12ddc5 add PhysicsBody for Drag&Drop Functionality 127-Z3R0 2020-04-20 14:21:55 +0200
  • 7d57decb93 fix bound.size problem 127-Z3R0 2020-04-20 14:17:09 +0200
  • dace2364da add addLines, connectBases 127-Z3R0 2020-04-20 12:58:47 +0200
  • 105a55644f modify GameScene Init, add createVirginBases Niko Jochim 2020-04-20 12:49:49 +0200
  • 9a560d2fa0 changed base to SKSpriteNode and add effects touch/move Niko Jochim 2020-04-20 12:33:57 +0200
  • 63e0336413 Merge branch '6-controller-basis' into 'development' Marcel Schwarz 2020-04-19 13:08:51 +0000
  • c7cbba1230 Merge branch '6-controller-basis' into 'development' Marcel Schwarz 2020-04-19 00:52:33 +0000
  • ee69f2c345 Add Bases, Autospawn 15 Bases Add visual effect when base is touched Marcel Schwarz 2020-04-18 16:50:57 +0200
  • 79dcc78f75 Make base spawn at touch Marcel Schwarz 2020-04-19 02:42:16 +0200
  • e82a7a90d2 Change Base texture to generic one Marcel Schwarz 2020-04-18 15:10:17 +0200
  • 819ad764e3 Remove .gitattributes It destroys the xcode project file Marcel Schwarz 2020-04-19 02:28:25 +0200
  • 8f41a42621 Update .gitattributes Aldin Duraki 2020-04-18 17:52:37 +0000
  • b3109e3621 Merge branch '3-hauptmenu' into 'development' Marcel Schwarz 2020-04-18 17:14:28 +0000
  • cc5a8b05fa Merge branch '3-hauptmenu' into 'development' Aldin Duraki 2020-04-18 16:16:38 +0000
  • e82d0a57f8 Impl Menu Scene * added temporary buttons assets Aldin Duraki 2020-04-18 18:13:20 +0200
  • 393c8e2e0a Merge branch 'cleanup-boilerplate-code' into 'development' Aldin Duraki 2020-04-18 13:45:47 +0000
  • 886caa8cf4 Merge branch 'cleanup-boilerplate-code' into 'development' Marcel Schwarz 2020-04-18 13:44:30 +0000
  • 4f3826df0c Formatting, remove unnecessary timestamp Marcel Schwarz 2020-04-18 15:44:17 +0200
  • 8dfb274416 Remove sample code Marcel Schwarz 2020-04-18 15:23:38 +0200
  • c1638f78fa Merge branch '5-view-basis' into 'development' Aldin Duraki 2020-04-18 12:17:04 +0000
  • 90736a6785 Resolve "[View] Basis" Marcel Schwarz 2020-04-18 12:17:04 +0000
  • 188f802f81 Merge branch '5-view-basis' into 'development' Marcel Schwarz 2020-04-18 11:22:39 +0000
  • ee1f3cc917 Add PlayerTwo image set Marcel Schwarz 2020-04-18 13:21:49 +0200
  • 006ce6addf Add PlayerOne image set Marcel Schwarz 2020-04-18 13:21:39 +0200
  • 26aceb1e20 Add Base texture Marcel Schwarz 2020-04-18 13:21:24 +0200
  • 05a9862732 Merge branch '10-projektinitialisierung' into 'development' Marcel Schwarz 2020-04-18 10:51:24 +0000
  • 917279f917 Merge branch '10-projektinitialisierung' into 'development' Aldin Duraki 2020-04-18 10:51:05 +0000
  • 91b928d59f Projectinit Aldin Duraki 2020-04-18 12:39:42 +0200
  • 6ae20d0c41 Merge branch '9-sem-testissue' into 'development' Marcel Schwarz 2020-04-17 12:58:34 +0000
  • 29437418cf Change Color Marcel Schwarz 2020-04-17 14:53:07 +0200
  • 863f1c13f9 Init Marcel Schwarz 2020-04-17 14:51:10 +0200
  • c227b1bec9 Add Issue Template Marcel Schwarz 2020-04-14 19:05:46 +0200
  • 3f8cd2c002 Merge branch '10-projektinitialisierung' into 'development' Aldin Duraki 2020-04-14 23:31:45 +0000
  • 12e90af3f1 [#10] Projektinitialisierung Aldin Duraki 2020-04-15 01:25:00 +0200
  • e6a878b9c8 Update Issue_Template.md Marcel Schwarz 2020-04-14 19:07:01 +0200
  • 3d7806dd46 Add Issue Template Marcel Schwarz 2020-04-14 19:05:46 +0200
  • de3ba12494 Update README.md Aldin Duraki 2020-03-27 15:58:58 +0100
  • b49041e79d Add README.md Aldin Duraki 2020-03-27 15:46:39 +0100