hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
380 Commits 11 Branches 0 Tags 8.8 MiB
29adaf14a7
Commit Graph

380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakob Haag
f1e54a6da4 Set different header and text in the submit button for attack an enemy base or move units between own bases 2020-05-29 14:28:31 +02:00
Marcel Schwarz
4773424bf6 Merge branch '45-validierung-kommerzieller-assets' into 'development' 
Resolve "Validierung kommerzieller Assets"

Closes #45

See merge request marcel.schwarz/software-projekt-2!98
 2020-05-29 10:52:51 +00:00
Niko Jochim
84ef233f9f add new Assets 
* change Base Texture
* change Background Texture
* change ModalBackgrund Texture
* add RedCross Texture
* set Button Texture in SettingsScene
* adjust Texture Positions
 2020-05-29 11:45:28 +02:00
Marcel Schwarz
0db26a7558 Merge branch '53-matchmaking-ueberarbeiten-2' into 'development' 
Resolve "Matchmaking ueberarbeiten"

Closes #53

See merge request marcel.schwarz/software-projekt-2!84
 2020-05-27 20:41:05 +00:00
Niko Jochim
9329978981 * create new GameCenterManager 
* send RandomNumber to all Peers Method
 2020-05-27 20:41:05 +00:00
Marcel Schwarz
23707cb1d9 Merge branch '70-anzahl-zuege-pro-runde' into 'development' 
Resolve "Anzahl Zuege pro Runde"

Closes #70

See merge request marcel.schwarz/software-projekt-2!80
 2020-05-26 18:11:56 +00:00
Jakob Haag
f7e4188143 Add limit of moves 
* set limit of moves. 1 attack and 5 own unit moves
* update move-limiter after submit button of modal
* increase number of attack to two able attacks
 2020-05-26 20:11:16 +02:00
Marcel Schwarz
23e53effd4 Merge branch 'refactoring' into 'development' 
Refactoring entitiy component model

See merge request marcel.schwarz/software-projekt-2!89
 2020-05-26 16:58:15 +00:00
Marcel Schwarz
288438884e Refactor complete entity component model 2020-05-26 18:57:32 +02:00
Marcel Schwarz
067495a57b Merge branch '79-verschiebung-der-basen-zuruecksetzen' into 'development' 
Resolve "Verschiebung der Basen zuruecksetzen"

Closes #79

See merge request marcel.schwarz/software-projekt-2!85
 2020-05-26 16:54:47 +00:00
Marcel Schwarz
2c31d923c6 Reset all bases when moveTouch is finished 2020-05-24 14:48:17 +02:00
Aldin Duraki
bb9582bee9 Merge branch '77-entity-manager-ueberarbeiten' into 'development' 
Resolve "Entity-Manager ueberarbeiten"

Closes #77

See merge request marcel.schwarz/software-projekt-2!82
 2020-05-23 18:15:43 +00:00
127-Z3R0
7e2b1b7a54 * Refactor for Master of the Universe 2020-05-23 19:02:39 +02:00
127-Z3R0
e447a37757 * Add 3 Instances for each Scene 
* Refactor in Code that the right instances is called
* Probs to Aldin und nicht an Niko, der nur im Bett liegt
 2020-05-23 18:36:59 +02:00
Aldin Duraki
8b140b95b4 Merge branch '64-view-visibility-unitcount-and-playername' into 'development' 
Resolve "[View] Visibility UnitCount and Playername"

Closes #64

See merge request marcel.schwarz/software-projekt-2!77
 2020-05-21 17:41:51 +00:00
Niko Jochim
b2f84bc3f4 set zPosistion on all Nodes 
update host and peer Label Nodes
 2020-05-21 19:40:46 +02:00
Niko Jochim
bf8ce0c477 Merge branch 'development' 2020-05-21 18:00:15 +02:00
Niko Jochim
d16867f367 add label with 100000000 changes 2020-05-21 17:59:19 +02:00
Aldin Duraki
3ab40f94cb Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development' 
Resolve "Runde beenden mit berechnetem Angriff"

Closes #36

See merge request marcel.schwarz/software-projekt-2!78
 2020-05-21 13:52:11 +00:00
Aldin Duraki
841bda9d9b Readded sleep 2020-05-21 15:48:32 +02:00
Aldin Duraki
8e22f02c7a * Impl. debugging move on MapGeneration 
* Changed fire particle with master designer niko von jochim
 2020-05-21 03:18:07 +02:00
Aldin Duraki
9fd34d9a6c Minor fixes 2020-05-21 02:44:38 +02:00
Aldin Duraki
ad44ba8302 Synching players timer since playermoves would not register before calculating 2020-05-21 00:29:19 +02:00
Aldin Duraki
5df7fd3dac TEST: playermoves not synched in same second 2020-05-20 23:46:40 +02:00
Aldin Duraki
a8c42fa0b0 Fix slider min max unit values 2020-05-20 23:36:48 +02:00
Aldin Duraki
5f7b12c28c * Changed slider behavior to not take MAX and 0 value as unit counts to send 2020-05-20 23:20:05 +02:00
Aldin Duraki
458d50e4b3 FIXME solved by extending the TeamComponent behavior 2020-05-20 22:59:32 +02:00
Aldin Duraki
604001a365 * Impl. a usecase of a fight scenario 
* Reset playermoves when necessary
 2020-05-20 22:14:29 +02:00
Aldin Duraki
fbe8dbde9d Merge branch '56-attack-boost-faehigkeit-implementieren' into 'development' 
Resolve "Attack/Defence Boost Faehigkeit implementieren"

Closes #57 and #56

See merge request marcel.schwarz/software-projekt-2!61
 2020-05-20 19:04:41 +00:00
Aldin Duraki
fdb3877194 Merge branch 'development' 
Conflicts:
	GoldWars/GoldWars.xcodeproj/project.pbxproj
 2020-05-20 21:00:15 +02:00
Aldin Duraki
582b59a216 Merge branch '59-map-generation-fur-zwei-spieler-c-elemente' into 'development' 
Resolve "Map Generation für zwei Spieler - C-Elemente"

Closes #59

See merge request marcel.schwarz/software-projekt-2!73
 2020-05-20 18:33:57 +00:00
Marcel Schwarz
fe1405d3fa Send map model to other player over data service 2020-05-20 20:33:40 +02:00
Marcel Schwarz
71f556868f Allow map to be loaded from predefined model 2020-05-20 20:33:40 +02:00
Marcel Schwarz
0fd409c00b Add Ids to C-Elements and corresponding protocol 2020-05-20 20:33:39 +02:00
Jakob Haag
4fdd95bd76 Add CElements and Ways 2020-05-20 20:33:39 +02:00
Aldin Duraki
53705849f2 Merge branch '24-map-generation-fur-zwei-spieler-twoplayermap' into 'development' 
Resolve "Map Generation für zwei Spieler - TwoPlayerMap"

Closes #24

See merge request marcel.schwarz/software-projekt-2!64
 2020-05-20 18:33:12 +00:00
Simon Kellner
739a7120f9 Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren' 
# Conflicts:
#   GoldWars/GoldWars.xcodeproj/project.pbxproj
 2020-05-20 16:33:37 +00:00
Marcel Schwarz
ee031f71c1 Add TwoPlayerMapGenerator 2020-05-20 17:03:04 +02:00
Marcel Schwarz
e2bd0dc7cf Pull protocols in MapFactory 
Add TwoPlayerMapGenerator
Add CenterElementProvider
Introduce Logging for MapGenerator
 2020-05-20 17:03:04 +02:00
Aldin Duraki
701a56248a Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development' 
Resolve "Runde beenden mit berechnetem Angriff"

Closes #34, #35, and #36

See merge request marcel.schwarz/software-projekt-2!59
 2020-05-20 14:59:52 +00:00
Aldin Duraki
2ac82e5159 * Minor fixes 
* Open up calculator service
 2020-05-20 01:41:48 +02:00
Aldin Duraki
f60e97a866 Solve missing lines on previous merge 2020-05-20 00:35:46 +02:00
Aldin Duraki
98b8250fc8 Merge branch 'development' 
Conflicts:
	GoldWars/GoldWars/Entities/Modal.swift
	GoldWars/GoldWars/Scenes/GameScene.swift
 2020-05-20 00:33:15 +02:00
Aldin Duraki
4bb5b9ee48 * Undo removing Teamcomponent upfront since it causes errors when trying to find a team on initial owned base 2020-05-20 00:31:31 +02:00
Aldin Duraki
1571a1e786 * Impl. combined forces attack 
* Minor refactoring
* Fixed component updates on updating entities from snapshot
* Fixed mapping for incoming player moves
 2020-05-20 00:11:49 +02:00
Simon Kellner
28fa86c25c add SkillButtonNode, Attack and Defence Skill -change Unit enum to UnitType 2020-05-19 19:13:56 +02:00
Aldin Duraki
5b722b95fc Merge branch '43-ueberarbeitung-angriffsmodal' into 'development' 
Resolve "Ueberarbeitung Angriffsmodal" closes #43

Closes #43

See merge request marcel.schwarz/software-projekt-2!72
 2020-05-19 15:10:17 +00:00
Aldin Duraki
de5929d070 * Fix trying to add fire sprite node to existing component 2020-05-19 15:53:07 +02:00
Aldin Duraki
b04bbe5036 * Fixed TeamComponent when updating Entities 
* Minor refactor
 2020-05-19 02:21:41 +02:00
Chauntalle Schüle
f291c021b3 Merge remote-tracking branch 'refs/remotes/origin/development' 2020-05-18 21:37:35 +02:00