Commit Graph

186 Commits

Author SHA1 Message Date
Joel
2e48e49239 Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-24 13:39:32 +02:00
Joel
46d27ab057 asd 2020-05-24 13:36:31 +02:00
BOTLester
38df90d9b5 merge 2020-05-24 13:27:09 +02:00
BOTLester
ec0819a337 lol 2020-05-24 13:25:46 +02:00
Joel
700979aded asd 2020-05-24 13:24:15 +02:00
Joel
9b99e0e710 added clouds 2020-05-24 13:21:17 +02:00
BOTLester
848cd6598a ml model created 2020-05-24 01:57:27 +02:00
Joel
444b5b0585 Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-23 20:55:55 +02:00
Joel
ba557d98f6 asd 2020-05-23 20:55:45 +02:00
BOTLester
57a9076771 rainfall noisemap 2020-05-23 20:55:38 +02:00
BOTLester
4a786a166e Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-23 20:39:08 +02:00
BOTLester
2a7c06fbd2 ML 2020-05-23 20:39:05 +02:00
Joel
32370470b5 yolo 2020-05-23 20:37:11 +02:00
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
8c976c4beb updating dev branch 2020-05-11 00:29:09 +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
4c18222a53 Fixing docs 2020-05-10 21:51:12 +00:00
BOTLester
f933f7c13a Final corrections 2020-05-10 23:40:55 +02:00
BOTLester
099a40be9f docs 2020-05-10 23:36:05 +02:00
BOTLester
2383ac5b9a Fixing documentation 2020-05-10 23:33:39 +02:00
BOTLester
d4f5c25d3b Fixing documentation 2020-05-10 23:31:30 +02:00
BOTLester
aa2ec07c35 Fixing documentation 2020-05-10 23:29:40 +02:00
BOTLester
a90602b9c6 Fixing documentation 2020-05-10 23:25:03 +02:00
BOTLester
af0a2bbefa document update 2020-05-10 23:24:06 +02:00
BOTLester
e84c9b897a more fixes 2020-05-10 23:23:18 +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