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

Commit Graph

  • 59c55cdd74 final release finalRelease Jakob Haag 2020-07-02 17:50:01 +0200
  • ae4dfb1b94 Merge remote-tracking branch 'refs/remotes/origin/devTestBranch' devTestBranch Niko Jochim 2020-07-02 17:08:16 +0200
  • 7ecebe83e4 change build-version for final delivery 127-Z3R0 2020-07-02 17:08:00 +0200
  • 6702f82782 Change max_rounds -> thanks Hr. Jochim 127-Z3R0 2020-07-02 17:05:34 +0200
  • 9a8e8ef663 Merge remote-tracking branch 'refs/remotes/origin/devTestBranch' Niko Jochim 2020-07-02 17:04:21 +0200
  • 2a17e81a3a Change version for final delivery 127-Z3R0 2020-07-02 16:11:27 +0200
  • 2f056725d6 FIX BUGS Niko Jochim 2020-07-02 13:55:26 +0200
  • 43ba0be225 Merge remote-tracking branch 'refs/remotes/origin/devTestBranch' Aldin Duraki 2020-07-02 13:01:37 +0200
  • cbb65769a3 Fix connection timeout Aldin Duraki 2020-07-02 13:01:21 +0200
  • 66aa21ccb4 Merge remote-tracking branch 'refs/remotes/origin/devTestBranch' Niko Jochim 2020-07-02 12:54:22 +0200
  • 985e4f48cb FIX trigger GameQuit Niko Jochim 2020-07-02 12:53:45 +0200
  • f4cd97cac7 Test crash bugfix Aldin Duraki 2020-07-02 12:48:51 +0200
  • 5d8df46361 change trigger GameEnd Niko Jochim 2020-07-02 12:34:29 +0200
  • 429a7aed41 Merge branch '115-app-store-connect-response' into 'development' Tim Herbst 2020-07-02 08:28:23 +0000
  • 60e9ac888e disable GameCenterButton if User is not authenticated 115-app-store-connect-response 127-Z3R0 2020-07-02 09:46:04 +0200
  • e109b9d93f revert heartbeart for crashes 127-Z3R0 2020-07-01 19:45:25 +0200
  • a1caa01908 Merge branch 'Sprint_5_delivery' into 'master' master Aldin Duraki 2020-06-26 01:36:58 +0000
  • 45e022fa5f Merge branch 'Sprint_5_delivery' into 'master' Aldin Duraki 2020-06-26 01:36:48 +0000
  • 2610dad09c Merge branch '76-refactoring' into 'development' Aldin Duraki 2020-06-26 01:35:18 +0000
  • 2bcbdf0876 Increase version 76-refactoring Aldin Duraki 2020-06-26 03:34:38 +0200
  • 608d1f7c2a Merge branch 'development' into 76-refactoring Aldin Duraki 2020-06-26 03:06:11 +0200
  • c7d9d63752 Merge branch '90-ueberarbeitung-einzelner-hud-elemente' into 'development' development 76-refactoring-3 76-refactoring-2 Aldin Duraki 2020-06-26 01:04:08 +0000
  • d1e89dc013 Merge branch '90-ueberarbeitung-einzelner-hud-elemente' into 'development' Niko Jochim 2020-06-26 01:03:37 +0000
  • 568bc14d03 FIX Niko Jochim 2020-06-26 03:03:19 +0200
  • c7aa992790 FIX pauseGame Modal in GameEnd View Niko Jochim 2020-06-26 02:55:02 +0200
  • 67c400a069 review changes Niko Jochim 2020-06-26 02:44:09 +0200
  • f689b54989 review changes Niko Jochim 2020-06-26 02:18:57 +0200
  • 88ddf07a05 HUD Layout Niko Jochim 2020-06-26 01:57:08 +0200
  • 6607d6739b create new finish Button Niko Jochim 2020-06-26 01:02:09 +0200
  • 767ba320be Minor Refactoring Aldin Duraki 2020-06-26 00:34:39 +0200
  • 0cf368fef0 add smaller Base Texture for better performance Niko Jochim 2020-06-25 23:57:22 +0200
  • 742123ea63 Merge branch '112-elo-system-report-score-to-all-leaderboards' into 'development' Aldin Duraki 2020-06-25 20:18:34 +0000
  • 69ba760d02 Merge branch '112-elo-system-report-score-to-all-leaderboards' into 'development' Marcel Schwarz 2020-06-25 20:00:00 +0000
  • 43e474467b Introduce error logging for elo system Marcel Schwarz 2020-06-25 18:22:17 +0200
  • 2d00bc363a New leaderboard for best elo Marcel Schwarz 2020-06-25 17:59:05 +0200
  • 890d43edca Report scores to multiple leaderboards Marcel Schwarz 2020-06-25 17:23:51 +0200
  • 528f32f788 Merge branch '37-disconnect-error-handle-events' into 'development' Aldin Duraki 2020-06-25 19:39:40 +0000
  • d0b57ce3d3 Merge branch '37-disconnect-error-handle-events' into 'development' Aldin Duraki 2020-06-25 19:16:27 +0000
  • da4b5cda63 Impl. Heartbeat and DC check Aldin Duraki 2020-06-25 20:52:48 +0200
  • 6cfd91b659 Merge branch '114-adjust-menu-scene-for-smaller-ipads' into 'development' Aldin Duraki 2020-06-25 19:03:31 +0000
  • 0c6d66e8ef Merge branch '114-adjust-menu-scene-for-smaller-ipads' into 'development' Marcel Schwarz 2020-06-25 18:57:13 +0000
  • 4a3d22596a Fix size of menu scene text and logo Marcel Schwarz 2020-06-25 20:52:22 +0200
  • 89dc64db27 Merge branch '89-regelwerk' into 'development' Aldin Duraki 2020-06-25 17:36:44 +0000
  • d634727a60 deleted print Chauntalle Schüle 2020-06-25 19:34:27 +0200
  • 207315af30 Merge branch '72-spielabbruch-button' into 'development' Aldin Duraki 2020-06-25 17:33:15 +0000
  • 86a16c1d78 ... Aldin Duraki 2020-06-25 19:32:11 +0200
  • d5d2270b25 Merge branch 'development' into 89-regelwerk Chauntalle Schüle 2020-06-25 19:28:15 +0200
  • 3e35db1d42 Add Verlassen button with modal and end screen Simon Kellner 2020-06-25 19:09:16 +0200
  • f9a14852f5 update Textures Chauntalle Schüle 2020-06-25 19:25:21 +0200
  • 17332f3f54 Merge branch '113-fix-unitlabel-wenn-bei-aktivem-spy-angegriffen-wird' into 'development' Aldin Duraki 2020-06-25 16:31:01 +0000
  • b922e43668 Merge branch '113-fix-unitlabel-wenn-bei-aktivem-spy-angegriffen-wird' into 'development' Jakob Haag 2020-06-25 16:30:49 +0000
  • d925369745 Merge branch '100-soundeffekte' into 'development' Aldin Duraki 2020-06-25 16:30:25 +0000
  • 880d2ef7c4 Check if the attacked base is an enemy base or not and update the label according to this Jakob Haag 2020-06-25 18:09:38 +0200
  • ba876f5a7c Merge branch '100-soundeffekte' into 'development' Aldin Duraki 2020-06-25 16:27:42 +0000
  • 51acc34fb2 Remove unnessary code Daniel Steckert 2020-06-25 18:25:22 +0200
  • 6930c83918 Remove unnecessary code Daniel Steckert 2020-06-25 18:15:17 +0200
  • 58f6032e06 Add possibility to disable sound effects Daniel Steckert 2020-06-25 17:47:25 +0200
  • 9b1ff1d4ae Add and trigger sound effects Daniel Steckert 2020-06-25 17:39:31 +0200
  • d189f799ca Merge branch 'revert-soundeffekte' into 'development' Aldin Duraki 2020-06-25 14:56:57 +0000
  • 6243a5f149 Merge branch 'revert-soundeffekte' into 'development' Marcel Schwarz 2020-06-25 14:41:41 +0000
  • dd9d91eab8 Fix missing os import and log init Marcel Schwarz 2020-06-25 16:41:27 +0200
  • d6627a4872 Merge branch '111-alles-in-deutsch-ubersetzen' into 'development' Aldin Duraki 2020-06-25 14:40:58 +0000
  • 02dd50b662 Merge branch '111-alles-in-deutsch-ubersetzen' into 'development' Jakob Haag 2020-06-25 14:40:21 +0000
  • 9ff8bcb6e5 Change all english label to german Jakob Haag 2020-06-25 16:35:57 +0200
  • 5e76c68997 Revert "Merge branch '100-soundeffekte' into 'development'" Marcel Schwarz 2020-06-25 16:29:50 +0200
  • 49c6017d8a Merge branch '88-cooldown-fur-skills' into 'development' Aldin Duraki 2020-06-25 13:20:05 +0000
  • 9b3ca1060e Alpha value fix for buttons Aldin Duraki 2020-06-25 15:17:24 +0200
  • ff2ffc1164 Add skill cooldowns and new skill button assets Simon Kellner 2020-06-25 14:59:31 +0200
  • 26b3b13459 Merge branch '82-status-eines-jeweiligen-settings-sollte-in-den-settings-erkennbar-sein' into 'development' Aldin Duraki 2020-06-25 12:44:52 +0000
  • a1656c5a4b Merge branch '82-status-eines-jeweiligen-settings-sollte-in-den-settings-erkennbar-sein' into 'development' Tim Herbst 2020-06-25 12:42:54 +0000
  • 77ffe9a815 delete unessecary files 127-Z3R0 2020-06-25 14:42:23 +0200
  • bf50703b1c Ignore the last two Commits -> stupidy impact 127-Z3R0 2020-06-25 14:39:31 +0200
  • 6970f27a61 Add new Buttons to SettingsScene 127-Z3R0 2020-06-25 14:20:16 +0200
  • 2f664712d0 Add designated SettingsButton for ButtonNode-Visibility 127-Z3R0 2020-06-25 14:19:24 +0200
  • 2d38373590 Merge branch 'development' into 89-regelwerk Chauntalle Schüle 2020-06-25 13:12:05 +0200
  • 1665e3e6f0 Merge branch '109-minuscount-fehler' into 'development' Aldin Duraki 2020-06-25 10:40:33 +0000
  • d236d040bf Merge branch '109-minuscount-fehler' into 'development' Aldin Duraki 2020-06-25 10:40:15 +0000
  • c344ff82f4 Fix for #109 & #110 Aldin Duraki 2020-06-25 11:43:59 +0200
  • 3b6647b817 added Credits Chauntalle Schüle 2020-06-25 12:38:29 +0200
  • 8758246798 Merge branch 'development' into 89-regelwerk Chauntalle Schüle 2020-06-25 00:39:54 +0200
  • 5d89636ebd Merge branch '100-soundeffekte' into 'development' Marcel Schwarz 2020-06-24 20:06:44 +0000
  • 5cbe20e6c8 Delete unused sound-file Marcel Schwarz 2020-06-24 22:00:16 +0200
  • 7e1a80e33a Add logging and remove local references to files Daniel Steckert 2020-06-13 15:24:56 +0200
  • bd1d29d6ac Change sound files and remove sound effect for timer Daniel Steckert 2020-06-12 17:20:27 +0200
  • e53e3953dc Trigger sound effects Daniel Steckert 2020-06-11 21:54:48 +0200
  • 6370d40e25 Add soundfiles Daniel Steckert 2020-06-11 16:21:21 +0200
  • 2b2c86a4de Merge branch '108-fix-label-wenn-basis-von-2-basen-angegriffen-werden' into 'development' Aldin Duraki 2020-06-24 13:15:53 +0000
  • 41258d04aa Merge branch '108-fix-label-wenn-basis-von-2-basen-angegriffen-werden' into 'development' Marcel Schwarz 2020-06-23 18:57:06 +0000
  • 13bc1b46d5 Update base label only when was not empty before Marcel Schwarz 2020-06-23 20:52:55 +0200
  • d05364708b Use player move type to update unit count label Marcel Schwarz 2020-06-23 20:52:27 +0200
  • 9a041c7310 Remove unnecessary complexity, Reformat code Marcel Schwarz 2020-06-23 19:59:28 +0200
  • a52e4cd8d1 changes after review Chauntalle Schüle 2020-06-23 18:55:47 +0200
  • 23cd0ade20 changed questionmark asset Chauntalle Schüle 2020-06-21 23:25:58 +0200
  • 29adaf14a7 same functionality just cleaned up code Chauntalle Schüle 2020-06-20 01:23:19 +0200
  • b945f1e236 adding all Rules as Textures Chauntalle Schüle 2020-06-20 01:11:19 +0200
  • 0985e02c3d Merge branch 'development' into 89-regelwerk Chauntalle Schüle 2020-06-19 13:46:36 +0200
  • 9ed7faf2aa fix pbxproj-file due to rebase 83-versions-uberprufung 127-Z3R0 2020-06-18 20:37:21 +0200
  • 722edad36d Add UpdatePopUp because Pfusch and its easier instead of rewriting ModalEntity 127-Z3R0 2020-06-18 20:28:01 +0200
  • 76a61b3daf Rewrite AppUpdater without UIKit-Elements 127-Z3R0 2020-06-18 18:00:21 +0200
  • 714c17ee30 Implement class AppUpdater for checking AppVerison in Appstore 127-Z3R0 2020-06-12 10:25:36 +0200