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

Commit Graph

  • e878016e4f - added new asset questionmark - added new Scene: RulesScene - added button to menuScene to load RulesScene - finished layout of RulesScene - finished rules of Spielbeschreibung Chauntalle Schüle 2020-06-19 02:15:51 +0200
  • 0b2b552d16 Merge branch '102-ueberarbeitung-slider' into 'development' Marcel Schwarz 2020-06-18 21:10:50 +0000
  • 4f58c0ebdf Merge branch '102-ueberarbeitung-slider' into 'development' Niko Jochim 2020-06-18 21:08:26 +0000
  • c8bdc40c12 Set gray overlay for done to invisible for better understanding Marcel Schwarz 2020-06-18 23:07:24 +0200
  • bddad86674 review changes Niko Jochim 2020-06-18 22:53:41 +0200
  • adf01db4bf FIX Slider performance * create hidden silderKnob Niko Jochim 2020-06-18 22:28:49 +0200
  • ba00702e67 Merge branch '91-gold-wars-schriftzug-2' into 'development' Marcel Schwarz 2020-06-18 19:08:16 +0000
  • 060aa6545f Merge branch '91-gold-wars-schriftzug-2' into 'development' Niko Jochim 2020-06-18 19:02:38 +0000
  • fca44f3072 Refine logo and buttons in MainScene Niko Jochim 2020-06-18 21:00:15 +0200
  • 5d14a8bd56 create GoldWars lettering + add new Gold Button Texture Niko Jochim 2020-06-18 19:09:39 +0200
  • 1039f48859 Merge branch '75-elo-system' into 'development' Marcel Schwarz 2020-06-18 18:31:00 +0000
  • 2a9d37877f Merge branch '75-elo-system' into 'development' Jakob Haag 2020-06-18 18:12:10 +0000
  • f852aae859 Implement EloSystem in EloHelper Calculate new EloData for both sides on serverside Report scores on both sides New Data type for sharing EloData Marcel Schwarz 2020-06-18 20:10:08 +0200
  • 875524d170 Merge branch '66-game-over-scene-2' into 'development' Marcel Schwarz 2020-06-18 17:50:35 +0000
  • 3c4ae97b61 fix getBackground to return a optional Niko Jochim 2020-06-18 19:39:59 +0200
  • b22e645163 review changes Niko Jochim 2020-06-18 19:30:27 +0200
  • e76f86b126 clean Code Niko Jochim 2020-06-18 17:24:34 +0200
  • e2c08b51a2 add winner/loser Icons * remove SpinningLogoComponent * create SoinningLogoNode Niko Jochim 2020-06-18 17:13:44 +0200
  • 8df133f896 setLabel Names Niko Jochim 2020-06-18 12:55:37 +0200
  • f363d30f15 rest RoundCalculatorService Niko Jochim 2020-06-14 20:19:04 +0200
  • 48e6247b69 Pfusch von Aldin.D Niko Jochim 2020-06-14 19:47:22 +0200
  • 3082297415 create GameEnd Animation Niko Jochim 2020-06-11 21:21:11 +0200
  • b29111cb9e create gameEnd Trigger Niko Jochim 2020-06-07 12:00:12 +0200
  • dc3ef818df Merge branch '105-basen-disablen-sobald-zug-durch-done-beendet-wurde' into 'development' Marcel Schwarz 2020-06-17 22:54:26 +0000
  • de9f7ab611 Merge branch '105-basen-disablen-sobald-zug-durch-done-beendet-wurde' into 'development' Jakob Haag 2020-06-17 22:53:20 +0000
  • 9de3e2cfa5 Add blockWholeScreenPane to disable clicks after Done was clicked Jakob Haag 2020-06-18 00:22:21 +0200
  • c46849e95d Merge branch '103-info-modal-entfernen' into 'development' Marcel Schwarz 2020-06-17 22:20:26 +0000
  • ccc844b6a0 Merge branch '103-info-modal-entfernen' into 'development' Marcel Schwarz 2020-06-17 22:20:15 +0000
  • 42446a7d49 Remove Modal when round ends, to prevent sending already dead units Marcel Schwarz 2020-06-18 00:19:30 +0200
  • afad3e808e Remove base details modal Marcel Schwarz 2020-06-18 00:03:36 +0200
  • 0d8a134445 Merge branch '104-teamkomponente-loschen' into 'development' Marcel Schwarz 2020-06-17 21:35:18 +0000
  • 383db4fed7 Merge branch '104-teamkomponente-loschen' into 'development' Jakob Haag 2020-06-17 21:34:56 +0000
  • 5aa10e3fc5 review changes Jakob Haag 2020-06-17 23:34:48 +0200
  • 71c01d589c Fix Spy-Skill to show labels again Marcel Schwarz 2020-06-17 23:29:05 +0200
  • 07e630881e Remove fireNode if base has no ownership. Move unitcount Label from BaseComponent to Teamcomponent and remove it if base has no ownership. Remove unused Team-Enum cases. Remove unused team-colors. Jakob Haag 2020-06-16 19:07:45 +0200
  • f50d00a416 Merge branch '92-bei-angriff-unitcountlabel-anpassen' into 'development' Marcel Schwarz 2020-06-12 13:26:15 +0000
  • 81bdc9cf63 Merge branch '92-bei-angriff-unitcountlabel-anpassen' into 'development' Marcel Schwarz 2020-06-11 20:44:35 +0000
  • 15fb959315 Hide label with unit counts when attacking a base Marcel Schwarz 2020-06-11 22:32:47 +0200
  • e10d57968c Merge branch '84-nachkomma-stellen-entfernen' into 'development' Marcel Schwarz 2020-06-11 20:42:08 +0000
  • 22d33d9ada Merge branch '84-nachkomma-stellen-entfernen' into 'development' Chauntalle Schüle 2020-06-11 20:41:29 +0000
  • f871bfda1d Units now only shown in slider of modal as Integer Chauntalle Schüle 2020-06-08 18:40:20 +0200
  • 00f8fbc61a Merge branch '49-leaderboard-einbauen' into 'development' Marcel Schwarz 2020-06-11 20:35:54 +0000
  • 9ac07fad86 Merge branch '49-leaderboard-einbauen' into 'development' Simon Kellner 2020-06-10 16:48:53 +0000
  • c517a36adc Add Leaderboard managing methods Simon Kellner 2020-06-10 18:32:31 +0200
  • 1a9c075dce Merge branch '87-vektorisierte-wege' into 'development' Marcel Schwarz 2020-06-10 13:00:30 +0000
  • 119d754672 Merge branch '87-vektorisierte-wege' into 'development' Jakob Haag 2020-06-10 12:58:40 +0000
  • 4e8b42d81c Fix warning while casting entity to base Marcel Schwarz 2020-06-10 14:58:32 +0200
  • 04e55be394 Remove orphan files Marcel Schwarz 2020-06-10 14:55:04 +0200
  • 502c609d81 remove old unused unnecessary DefaultWayComponent and rename for better understanding Jakob Haag 2020-06-10 13:11:37 +0200
  • ad9e970ef6 fix gap between two crossed curves Jakob Haag 2020-06-07 18:30:20 +0200
  • ed764afc45 remove Ways as Component and add function to generate different types of ways Jakob Haag 2020-06-06 11:47:57 +0200
  • 79781ccdc9 Merge branch '97-music-flag' into 'development' Marcel Schwarz 2020-06-09 21:48:08 +0000
  • bb273d3af5 Merge branch '97-music-flag' into 'development' Simon Kellner 2020-06-09 16:09:42 +0000
  • 376ed849ae Merge branch '98-appdelegate' into 'development' Aldin Duraki 2020-06-09 16:07:52 +0000
  • 2f32943511 Add --no-music flag, Implement NSUserDefaults for music settings Simon Kellner 2020-06-08 10:40:53 +0200
  • 927bcdf82d Merge branch '98-appdelegate' into 'development' Aldin Duraki 2020-06-06 17:22:50 +0000
  • e6d866bc70 For better understanding Aldin Duraki 2020-06-06 19:20:13 +0200
  • a37187bbad Impl. AppDelegates handlings Aldin Duraki 2020-06-06 18:59:26 +0200
  • 70cfe9719b Merge branch 'development' Marcel Schwarz 2020-06-04 18:40:43 +0200
  • 46fa90bfe3 Merge branch 'sprint_4_delivery' into 'development' Aldin Duraki 2020-06-04 16:16:31 +0000
  • 839f0231e8 Merge branch 'sprint_4_delivery' into 'development' Aldin Duraki 2020-06-04 16:16:27 +0000
  • a26efeb3d1 Update Build Version Aldin Duraki 2020-06-04 18:15:48 +0200
  • 7050fd1b8f last changes 61-gkstatemachine Chauntalle Schüle 2020-06-03 13:19:56 +0200
  • 74a7df551c Resolve rebase problems Chauntalle Schüle 2020-06-03 01:18:17 +0200
  • 9ec6a252ee changes after review Chauntalle Schüle 2020-06-02 23:04:21 +0200
  • aee6ec1ac1 adding bigger changes after review, deleted enum und methods enter&changeState Chauntalle Schüle 2020-06-02 21:38:23 +0200
  • 9eb06b54fd made smaller changes after review Chauntalle Schüle 2020-06-02 17:25:00 +0200
  • c5867f12e3 removed unnecessary file Chauntalle Schüle 2020-06-02 15:31:03 +0200
  • c4a4a8f755 deleted comments Chauntalle Schüle 2020-06-02 02:48:13 +0200
  • 35ff2208fb found right trigger for syncingSt and gameSt after finishing a Round Chauntalle Schüle 2020-06-02 02:18:50 +0200
  • 079ae4a6f6 still halting game when syncing Chauntalle Schüle 2020-06-02 01:03:50 +0200
  • b23071bb08 menuSt, syncSt and gameSt now correctly triggered even in MM, menuSc and gameSc loaded in states, still need to find trigger for syncSt after finishing one timer cycle / round Chauntalle Schüle 2020-06-01 02:32:38 +0200
  • f4847e79d7 update the first three states before trying sth different Chauntalle Schüle 2020-05-31 22:03:35 +0200
  • 3ea48c399e added info that you're once again entering the same state you're already in Chauntalle Schüle 2020-05-31 22:01:51 +0200
  • 0492ab7724 updated update method of menuState Chauntalle Schüle 2020-05-29 22:42:38 +0200
  • 78c5016576 new group states Chauntalle Schüle 2020-05-29 21:51:09 +0200
  • 8537dee231 game scene and menu scene are now initialized in states, still need to test for 2 player Chauntalle Schüle 2020-05-29 13:04:40 +0200
  • 0296edb080 adding var current- and previousState - set in enterState, adding func changeState Chauntalle Schüle 2020-05-29 12:42:21 +0200
  • 6be5325d86 added EndGameState, deleted imports from enum StateTypes Chauntalle Schüle 2020-05-29 01:27:49 +0200
  • ce2d847393 added GameState Chauntalle Schüle 2020-05-29 01:22:55 +0200
  • 50fa1b6cc6 just changed name of variable allowedState to wantedState for better understanding and correctness Chauntalle Schüle 2020-05-29 01:18:31 +0200
  • f008ecafa7 added SyncingState Chauntalle Schüle 2020-05-29 01:15:06 +0200
  • d7d17dba2b added MenuState, is initial State Chauntalle Schüle 2020-05-29 01:11:42 +0200
  • 3bbae779af added Statemanager with Singleton, used to create and enter states, already with logging if entering state is un/successful Chauntalle Schüle 2020-05-29 01:08:25 +0200
  • 767548cb82 bulk update, gonna break it up with new files in following commits Chauntalle Schüle 2020-05-29 01:02:38 +0200
  • 6b602e6af2 Made first states and initialized them Chauntalle Schüle 2020-05-28 21:27:32 +0200
  • fbc6a63232 Merge branch '58-spy-boost-faehigkeit-implementieren' into 'development' Aldin Duraki 2020-06-02 21:47:18 +0000
  • 1ec55f12f8 Merge branch '58-spy-boost-faehigkeit-implementieren' into 'development' Daniel Steckert 2020-06-02 21:46:25 +0000
  • 97d51411dc Enable ability for both player and change trigger to current round Daniel Steckert 2020-06-02 22:56:43 +0200
  • c0153d43d4 Add function to button Daniel Steckert 2020-05-31 21:36:55 +0200
  • c68ed6ea97 Merge branch '42-explosion-animation-beim-angriff' into 'development' Aldin Duraki 2020-06-02 21:12:23 +0000
  • 6985a293e1 Merge branch '42-explosion-animation-beim-angriff' into 'development' Aldin Duraki 2020-06-02 21:12:02 +0000
  • 631b184564 Implemented Explosion Animation Aldin Duraki 2020-06-02 23:10:55 +0200
  • 69927d35fa Merge branch '39-spielendkriterium' into 'development' Aldin Duraki 2020-06-02 20:34:02 +0000
  • 2189ada0f7 Merge branch '39-spielendkriterium' into 'development' Tim Herbst 2020-06-02 20:33:49 +0000
  • cbf288e86d minor refactoring 127-Z3R0 2020-06-02 22:18:59 +0200
  • 09062d5f5d add isGameOver and determineHost func 127-Z3R0 2020-06-02 21:51:37 +0200
  • 028282f784 implement RoundIncrement feature 127-Z3R0 2020-06-02 20:52:11 +0200
  • 48361738ba add RoundCount directly to HUD 127-Z3R0 2020-06-02 20:14:19 +0200
  • 0c2b621b05 Merge branch '65-achivements-einbauen' into 'development' Aldin Duraki 2020-06-02 18:36:18 +0000