Commit Graph

42 Commits

Author SHA1 Message Date
Thefeli73
93507eb58d Merge branch 'Ny-Energy-formula' into felix-lek 2020-10-04 14:27:09 +02:00
Thefeli73
cb2f1999d9 energy WORKING ema temp sak 2020-10-04 14:23:50 +02:00
Thefeli73
0c49a3fb37 lek med energy formel rounds between energy 2020-10-04 13:53:53 +02:00
linhara
0c2acdd0b1 Merge remote-tracking branch 'origin/linus' into linus 2020-10-04 13:03:12 +02:00
linhara
f4dd5073c6 linus nästan bra adjustEnergy 2020-10-04 13:02:32 +02:00
linhara
849542dd03 linus skit 2020-10-04 13:01:13 +02:00
linhara
8b6eb1abb2 linus take turn big 2020-10-04 12:26:34 +02:00
Thefeli73
04e5fac165 Construction residences work 2020-10-04 05:00:23 +02:00
Thefeli73
b9ea513f50 clear all active games 2020-10-04 04:58:59 +02:00
Thefeli73
0918549cfb build structure function (working ish?) and develop society to test it 2020-10-04 03:17:11 +02:00
Thefeli73
942dc02331 optimize fun 2020-10-04 03:16:13 +02:00
Thefeli73
6aa69eb842 global vars 2020-10-04 03:15:32 +02:00
Thefeli73
b484d9ef73 adjust energy function, attention and develop function 2020-10-03 23:01:43 +02:00
Thefeli73
5672c340ae 70s timeout 2020-10-03 22:59:47 +02:00
Thefeli73
38451297a5 map functions and exception fix 2020-10-03 20:06:28 +02:00
Thefeli73
c5f8526740 flytta variabel och take turn 2020-10-03 19:48:31 +02:00
Thefeli73
a3cae6351d Merge branch 'linus' into felix-lek 2020-10-03 19:47:05 +02:00
Thefeli73
a2b945544b Merge branch 'felix-lek' into linus 2020-10-03 19:45:38 +02:00
Thefeli73
69d9b5c88c ta bort .idea 2020-10-03 19:44:55 +02:00
Thefeli73
0a12d369b4 Revert "pyCharm project"
This reverts commit f97ac06478.
2020-10-03 19:44:05 +02:00
linhara
deca6713fb Merge remote-tracking branch 'origin/felix-lek' into linus 2020-10-03 19:35:36 +02:00
linhara
2ef69e9c8d la till timeUntilTimeEnds 2020-10-03 19:34:41 +02:00
linhara
ab936cdcf3 fortsatt prova skit 2020-10-03 19:34:20 +02:00
Thefeli73
416a2d3aed take turn och global chartMap def 2020-10-03 19:31:09 +02:00
Thefeli73
16988ababb flutta game state var 2020-10-03 19:30:14 +02:00
Thefeli73
59bcb0ccc5 fix except traceback, var name, 2020-10-03 18:49:33 +02:00
linhara
c9c3cff598 Auto stash before merge of "linus" and "origin/felix-lek" 2020-10-03 17:54:32 +02:00
linhara
1fe1b01e78 Merge remote-tracking branch 'origin/felix-lek' into linus 2020-10-03 17:52:02 +02:00
Thefeli73
b473ec9172 end game and exit on exception with print 2020-10-03 17:50:00 +02:00
linhara
97ebd73cf5 Merge remote-tracking branch 'origin/felix-lek' into linus 2020-10-03 16:09:22 +02:00
Thefeli73
c89e1df0fc api print, force endgame function, exit timer, 2020-10-03 16:08:12 +02:00
linhara
be9f53a6bb Merge remote-tracking branch 'origin/felix-lek' into linus 2020-10-03 14:32:16 +02:00
linhara
9f318dac47 sak 2020-10-03 14:31:57 +02:00
linhara
bd762a970f ignore 2020-10-03 14:29:47 +02:00
Thefeli73
661d542e79 seperate teststrat from main code 2020-09-27 16:54:14 +02:00
Thefeli73
71bf5567aa small fix, teststrat var 2020-09-27 16:53:45 +02:00
Thefeli73
9c8b418e64 change to map 2 2020-09-27 15:08:08 +02:00
Thefeli73
73e20b16a6 fix broken code, now playable 2020-09-27 14:45:23 +02:00
Thefeli73
23e21feedf API key 2020-09-27 13:59:59 +02:00
Thefeli73
f97ac06478 pyCharm project 2020-09-27 13:49:43 +02:00
Thefeli73
936469c1a5 python template 2020-09-27 13:46:19 +02:00
Thefeli73
802338fcad Initial commit 2020-09-27 13:45:29 +02:00