Commit Graph

81 Commits

Author SHA1 Message Date
Joel
710cd8581e asd 2020-05-23 14:13:31 +02:00
Joel
a656d768f6 Merge branch 'dev' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into dev 2020-05-23 13:57:59 +02:00
Joel
037f15f2e4 joined textures 2020-05-23 13:54:47 +02:00
BOTLester
7a520ab7b4 updated connected textures 2020-05-17 01:37:16 +02:00
BOTLester
122f957673 updated contect file 2020-05-12 16:40:45 +02:00
BOTLester
40996b3cdf Merging Oskar into dev 2020-05-12 16:37:53 +02:00
BOTLester
81cac7f8cf cleaning 2020-05-12 16:32:32 +02:00
BOTLester
046dbed742 Added joint textures, deleted old ones 2020-05-12 16:30:01 +02:00
BOTLester
184ca0f8d7 Messing with textures 2020-05-12 15:43:03 +02:00
BOTLester
c0af96fc28 new textures 2020-05-12 01:46:16 +02:00
BOTLester
93802f3331 small adjustments 2020-05-11 01:54:47 +02:00
BOTLester
14490daf9f new UI wip 2020-05-11 01:48:10 +02:00
BOTLester
5293312938 Merge branch 'Oskar-ML' into dev 2020-05-11 01:47:24 +02:00
BOTLester
b21fc0776e UI fix 2020-05-11 01:45:41 +02:00
BOTLester
e4568f2c81 correcting paths 2020-05-11 01:41:38 +02:00
Joel
7691828cae UI 2020-05-11 01:30:18 +02:00
BOTLester
70be7e0151 PerlinNoise map generator 2020-05-11 01:16:01 +02:00
Joel
c3048700f2 Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-11 01:11:07 +02:00
Joel
e2ac5f3572 More UI 2020-05-11 01:11:00 +02:00
BOTLester
9fd8bd6e9c fixing paths 2020-05-11 00:25:41 +02:00
Joel
dd96c58976 fixed typo 2020-05-11 00:04:59 +02:00
Joel
42e1212b0b Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-10 23:57:11 +02:00
Joel
e868578f9b fixed map generation 2020-05-10 23:56:52 +02:00
BOTLester
eba969f076 Fixing documenation 2020-05-10 23:21:03 +02:00
BOTLester
5424c2c66a Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-10 23:11:18 +02:00
BOTLester
4cbebfe8fd Creating documentation, small fixes 2020-05-10 23:11:15 +02:00
Joel
4aaf7077a9 Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-10 21:31:12 +02:00
Joel
97e3ed9a1c Fixed dynamic matrix 2020-05-10 21:31:06 +02:00
BOTLester
9e2636641f Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-10 21:16:51 +02:00
BOTLester
34233f92d2 fixing 2020-05-10 21:16:24 +02:00
Joel
e4d2086bf9 Fix 2020-05-10 21:07:03 +02:00
Joel
c17adf52cd Fixed tile speed 2020-05-10 19:39:38 +02:00
Joel
b083ae4293 Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-10 19:22:33 +02:00
Joel
913f813895 Somewhat finished 2020-05-10 19:21:52 +02:00
BOTLester
49182f0fd0 Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML 2020-05-10 18:18:16 +02:00
BOTLester
ef1e640f9e bugfixes, finetuning 2020-05-10 18:17:53 +02:00
Joel
f39f27ba4e Squared ProductionRate 2020-05-10 16:42:25 +02:00
Joel
e2f903eb8c Strange results 2020-05-10 16:00:39 +02:00
BOTLester
aee7262c45 small update 2020-05-10 15:02:22 +02:00
BOTLester
2375a52cd4 some fixes, optimized AI 2020-05-10 13:51:19 +02:00
BOTLester
3647b10dc5 ML fixes 2020-05-10 12:55:13 +02:00
BOTLester
34a0e8bd3a working ML, RC0.1 2020-05-10 01:38:08 +02:00
BOTLester
f475f5bab5 merge with dev 2020-05-09 15:59:12 +02:00
BOTLester
3134ce7d3a Merge branch 'dev' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into dev 2020-05-09 15:54:59 +02:00
BOTLester
3566a7af2e Some cleaning, error corrections 2020-05-09 15:54:53 +02:00
Joel
4173b26d30 Inventory System added into ai 2020-05-09 13:48:28 +02:00
BOTLester
e1b4dec764 Damn it works 2020-05-08 00:35:53 +02:00
BOTLester
3e034cf958 merge Joel to dev 2020-05-07 22:12:30 +02:00
BOTLester
7a35bb09fe Target Selection 2020-05-07 22:09:45 +02:00
Joel
fe35083968 Final ProductionRate 2020-05-07 21:46:33 +02:00