Commit Graph

83 Commits

Author SHA1 Message Date
127-Z3R0
1b8fb6b126 Merge branch 'development' of https://gitlab.com/marcel.schwarz/software-projekt-2 into 35-datenubertragung-zwischen-spielern
* 'development' of https://gitlab.com/marcel.schwarz/software-projekt-2:
  add Label to EntityManager and implement Labels to SettingsScene
  add LabelEntity, LabelNode and Labelcomponent - ability to customize and add a Label with animation
  add sharedInstance, small cleanup Code
  add button to SettingsScene for Background Movement
  forgot return type in func getVolume
  add button on-off to settingsScene
  fix multiple calls from startMenuMusic with static Bool, stop music when enter Game
  add SettingsScene with background and music also boolean query for multiple audioplayer start
  add backgroundMusic for MenuScene with SoundManager for futher Sound-Management - music with commercial use
2020-05-13 16:19:14 +02:00
127-Z3R0
1ca5399a2e add LabelEntity, LabelNode and Labelcomponent - ability to customize and add a Label with animation 2020-05-13 14:59:26 +02:00
82joni1bif
99b6843606 Create first version of Datatransfermodel 2020-05-10 21:58:42 +02:00
127-Z3R0
888d194676 add SettingsScene with background and music also boolean query for multiple audioplayer start 2020-05-10 18:10:36 +02:00
127-Z3R0
9c990cc897 add backgroundMusic for MenuScene with SoundManager for futher Sound-Management - music with commercial use 2020-05-10 17:44:54 +02:00
82joni1bif
91bc4fa59c change Build version 2020-05-07 21:02:23 +02:00
82joni1bif
b602841f8d Merge branch 'development'
Conflicts:
	GoldWars/GoldWars.xcodeproj/project.pbxproj
	GoldWars/GoldWars/Entities/EntityManager.swift
2020-05-07 20:19:40 +02:00
Aldin Duraki
6b8b11d14e Merge branch 'development' into '19-einheiten-bewegen'
# Conflicts:
#   GoldWars/GoldWars/GameViewController.swift
2020-05-07 18:17:24 +00:00
Niko Jochim
3580d5537e fix SliderComponent 2020-05-06 12:57:41 +02:00
Niko Jochim
185358a3d5 * Impl. basic attacking functionality
* added attacking Modal
2020-05-06 02:17:25 +02:00
Daniel Steckert
58d7a01fd1 Implement TimerComponent 2020-05-05 21:37:58 +02:00
Chauntalle Schüle
017e99183b add File to Project Tree 2020-05-04 15:22:48 +02:00
Niko
9b3bdbf34b implemented touch functionality 2020-05-03 15:46:48 +02:00
Niko
d72c10fa75 implement Background Entity and Component 2020-05-03 00:14:32 +02:00
Niko
fcf49e656d Merge remote-tracking branch 'origin/29-uberarbeitung-der-menuscene-button' into cleanup_scenes 2020-05-02 22:31:12 +02:00
Niko
fae2855bf9 stash 2020-05-02 22:29:16 +02:00
0dbcbe5eb0 Move adjacency list into base
Fix typo in MapProtocol
Improve MapFactory
Generalize MapProtocol
2020-05-02 21:45:21 +02:00
c1bb6a47de Create Map Factory, remove texture name from base constructor 2020-05-02 20:08:30 +02:00
4c37ac690c Move files to correct directory 2020-05-02 18:11:01 +02:00
5eb9daa02b Create files for Map model 2020-05-02 18:06:18 +02:00
Jakob Haag
bb98c9d0a6 add rest of necessary swift files 2020-05-02 14:04:08 +02:00
Niko Jochim
aae0a49da0 add fire to homebase 2020-05-02 01:22:53 +02:00
Niko Jochim
3b80b945c4 impl. hud 2020-05-01 23:33:46 +02:00
Niko Jochim
323ca45e51 fix teamComponents reference 2020-05-01 22:02:26 +02:00
Niko Jochim
2ff1a1d705 add pop-Up base-details 2020-05-01 21:47:43 +02:00
Niko Jochim
706c879351 change architecture to entity-component 2020-05-01 17:55:42 +02:00
Aldin Duraki
6127f89e78 impf. EntityManager 2020-05-01 15:28:47 +02:00
Aldin Duraki
21b7fc00f7 Init Entity-Component Folder Structure 2020-05-01 15:09:46 +02:00
Aldin Duraki
9f569c30fa Flatten Project 2020-05-01 14:49:55 +02:00
Aldin Duraki
6f8487e16e Refactor Unit class 2020-04-22 16:43:58 +02:00
79dcc78f75 Make base spawn at touch 2020-04-19 02:42:16 +02:00
Aldin Duraki
e82d0a57f8 Impl Menu Scene
* added temporary buttons assets
2020-04-18 18:13:20 +02:00
Aldin Duraki
91b928d59f Projectinit 2020-04-18 12:50:39 +02:00