Commit Graph

70 Commits

Author SHA1 Message Date
GordonDaFreeman 1d41d3f122 abc
# Conflicts:
#	src/fussballmanager/Spiel.java
2017-09-25 00:12:52 +02:00
delta1805 b0ea370f1b console ticker aufgeräumt 2017-09-25 00:10:06 +02:00
GordonDaFreeman 1628395430 gui boss 2017-09-25 00:03:59 +02:00
delta1805 085503b564 Merge branch 'master' of https://github.com/GordonDaFreeman/fussballmanager 2017-09-24 23:58:19 +02:00
delta1805 f563fdc1af tor "REALISM" 2017-09-24 23:58:17 +02:00
GordonDaFreeman 71bc3ad6f1 gui tor 2017-09-24 23:40:05 +02:00
GordonDaFreeman fb2b89d7c9 tor counter 2017-09-24 23:22:51 +02:00
GordonDaFreeman 8fb4e83115 fix 2017-09-24 23:17:50 +02:00
GordonDaFreeman 0c79ef9b7e Revert "abc"
This reverts commit 2f7c1dc2aa.
2017-09-24 23:13:50 +02:00
GordonDaFreeman 2f7c1dc2aa abc 2017-09-24 23:08:36 +02:00
delta1805 7a5736242d läuft jetzt länger 2017-09-24 23:09:19 +02:00
GordonDaFreeman 4d09847a61 never mind 2017-09-24 23:01:38 +02:00
delta1805 239ad51f0f shortened tor() 2017-09-24 23:01:05 +02:00
GordonDaFreeman 57510917ec fix constructor ball spiel 2017-09-24 22:50:31 +02:00
delta1805 a2405abab4 never seen that 2017-09-24 22:45:36 +02:00
delta1805 c68897c5d1 really fixed setpositions 2017-09-24 22:43:17 +02:00
delta1805 f975057649 fixed set positions 2017-09-24 22:40:57 +02:00
delta1805 de0af0538f fixed tore 2017-09-24 22:38:53 +02:00
delta1805 ffd3e0bb57 mir gehn namen aus 2017-09-24 22:35:40 +02:00
delta1805 303641e239 torphase added 2017-09-24 22:33:35 +02:00
delta1805 9dc5fdc6e2 added tore 2017-09-24 22:28:08 +02:00
delta1805 47d57b8a88 try fix algo 2017-09-24 22:10:40 +02:00
GordonDaFreeman 391e9ac5be full 2017-09-24 20:34:33 +02:00
GordonDaFreeman 795873c502 updato 2017-09-24 19:44:38 +02:00
GordonDaFreeman 4d2e61d687 gui 2017-09-24 18:34:07 +02:00
GordonDaFreeman 7c65f0216f fixed "ä" 2017-09-24 14:15:00 +02:00
GordonDaFreeman 02573e866a rm fußballmanager 2017-09-24 14:06:08 +02:00
Delta1805 812b2f71c1 fUSSBALL 2.0 beta 2017-09-23 14:12:31 +02:00
delta1805 a0a3604f21 Update Spiel.java 2017-09-21 12:58:32 +02:00
delta1805 3cc0906d8f Update Schiedsrichter.java 2017-09-21 12:56:22 +02:00
delta1805 a87e8ba3cb Update Team.java 2017-09-21 12:55:44 +02:00
delta1805 e81073918b Update Main.java 2017-09-21 12:54:57 +02:00
GordonDaFreeman 40d309bf3f Update Torwart.java 2017-09-21 12:54:32 +02:00
GordonDaFreeman 40ed7b6f3a Update Spieler.java 2017-09-21 12:52:46 +02:00
GordonDaFreeman 22283f019b Update Spieler.java 2017-09-21 12:50:24 +02:00
GordonDaFreeman c4b3007943 Update Spiel.java 2017-09-21 12:49:27 +02:00
GordonDaFreeman 91f15c4809 update 2017-09-20 22:07:43 +02:00
GordonDaFreeman 189afc5a66 move 2017-09-20 21:12:08 +02:00
Delta1805 75ea591a9c team 1.01 2017-09-20 20:40:25 +02:00
Delta1805 c72216d8b5 Added Teamfill 2017-09-20 20:33:20 +02:00
Delta1805 da393605aa Fin NameGen (pending nameIdeas) 2017-09-20 20:18:54 +02:00
Delta1805 226dadbe6c Sized down name gen to Günter Günter 2017-09-20 20:09:17 +02:00
GordonDaFreeman 0a7d070ca9 bsp 2017-09-20 20:00:54 +02:00
Delta1805 7353aa43e3 mach mal listen draus 2017-09-20 19:57:28 +02:00
Delta1805 ca4642f785 converted datenbank to static 2017-09-20 19:51:25 +02:00
Delta1805 581704a113 Fixed shit 2017-09-20 19:46:01 +02:00
Delta1805 0ff1d30dba implemented namegen into person 2017-09-20 19:43:30 +02:00
Delta1805 7c96cc9403 delete datenklasse 2017-09-20 19:32:23 +02:00
Delta1805 296d573348 delete dublicate person x2 (i hate github) 2017-09-20 19:31:09 +02:00
Delta1805 0b48aa4c98 c 2017-09-20 19:30:33 +02:00