Commit Graph

163 Commits

Author SHA1 Message Date
d8246cce37 Upload files to 'Game1' 2020-05-25 09:30:24 +00:00
Joel
631ad7c12f Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-25 11:08:14 +02:00
Joel
8b115ec1f5 fixed everything 2020-05-25 11:07:58 +02:00
Joel
090a612660 asd 2020-05-25 10:59:17 +02:00
BOTLester
561287f99e merge 2020-05-25 00:05:11 +02:00
BOTLester
0b7ff8a949 fixes 2020-05-25 00:03:32 +02:00
Joel
c89fee6b05 asd 2020-05-25 00:03:26 +02:00
Joel
8ab1d77d9c asd 2020-05-24 23:10:51 +02:00
Joel
94c2792ef3 asd 2020-05-24 22:24:32 +02:00
Joel
5e9c9f503d asd 2020-05-24 22:22:09 +02:00
BOTLester
e406823e47 ml implement 2020-05-24 22:21:49 +02:00
BOTLester
6bb5073048 Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-24 21:22:50 +02:00
BOTLester
fe04a5cd07 enigne 2020-05-24 21:22:47 +02:00
Joel
10e58f984f Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-24 21:22:26 +02:00
Joel
14e0e92f9b zxdfzdf 2020-05-24 21:22:17 +02:00
BOTLester
c858261c89 merge 2020-05-24 21:02:46 +02:00
BOTLester
cfbe80cb25 ML update 2020-05-24 21:00:54 +02:00
Joel
5e907deca7 asd 2020-05-24 21:00:24 +02:00
BOTLester
0dfef73667 MERGIN 2020-05-24 18:50:47 +02:00
BOTLester
585522b4df changes 2020-05-24 18:50:01 +02:00
Joel
50fd54ee3b asd 2020-05-24 18:49:23 +02:00
Joel
0a31c36c93 asd 2020-05-24 17:08:41 +02:00
Joel
f63bdcee77 Merge branch 'Joel-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Joel-ML 2020-05-24 16:51:40 +02:00
Joel
eb99fd3f02 gtyhsy 2020-05-24 16:51:29 +02:00
BOTLester
5a208e116f merge 2020-05-24 16:27:28 +02:00
BOTLester
8b84387c81 asdasd 2020-05-24 16:26:28 +02:00
Joel
64aaef69dd asd 2020-05-24 16:26:04 +02:00
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