Commit Graph

110 Commits

Author SHA1 Message Date
Matraf
890ed85c2f merge master to floor 2022-01-25 23:58:54 +01:00
Matraf
c76b8476a6 deleted floor 2022-01-25 23:19:17 +01:00
matixezor
1ecf2d309f feat: make skybox bigger, add new sand texture 2022-01-25 17:33:01 +01:00
cef7267f78 Merge pull request 'feat: add terrain generation using perlin noise' (#12) from terrain-generation-second-approach into master
Reviewed-on: #12
2022-01-25 12:18:30 +01:00
matixezor
9a45f056a8 refactor: code refactor 2022-01-24 23:18:16 +01:00
matixezor
f2f5a18cc1 refactor: code refactor 2022-01-24 20:02:48 +01:00
Matraf
ebb270c746 xd 2022-01-24 15:46:52 +01:00
matixezor
4f03876027 debug plane obj 2022-01-24 14:04:46 +01:00
matixezor
5fc16bb2c0 init 2022-01-24 13:40:40 +01:00
matixezor
7a2a862a94 feat: refactor 2022-01-24 12:06:17 +01:00
Thyme1
246011dfd8 change shaders back 2022-01-23 21:38:42 +01:00
Thyme1
0058724ddd zmiany w generowaniu terenu 2022-01-23 21:19:33 +01:00
Thyme1
06e04c26e9 zmiany jakies 2022-01-23 21:05:59 +01:00
Matraf
fc6b24fb3d no i chuj 2022-01-23 19:19:09 +01:00
matixezor
e7a5d0aa2b feat: add terrain class and height generator 2022-01-23 16:27:17 +01:00
Matraf
b0a88f49d0 change fishKeyPointsSecond 2022-01-21 13:13:02 +01:00
Matraf
801653b4cf add third fish and delete unused models/textures 2022-01-21 12:53:35 +01:00
Matraf
ea9f2b23db change fishKeyPointsThird 2022-01-21 12:36:09 +01:00
Matraf
312d30ec3e add reading keypoints from file 2022-01-21 12:34:15 +01:00
Matraf
a500d8febc small change for shark 2022-01-21 10:59:00 +01:00
Matraf
37c38f6fbc Merge master to floor 2022-01-20 14:04:50 +01:00
Matraf
9fcf4ad62c fixed shark 2022-01-20 14:01:40 +01:00
Matraf
1611666e96 add more fish 2022-01-17 16:20:48 +01:00
Thyme1
91ebcef017 change light to directional and remove unused shaders 2022-01-13 22:06:57 +01:00
Thyme1
a4694c930b change light to directional and remove unused shaders 2022-01-13 22:06:03 +01:00
Matraf
44164da244 add working terrain 2022-01-12 15:07:37 +01:00
Matraf
9100642ce7 add new floor obj 2022-01-12 14:17:16 +01:00
Matraf
e75d13e4fd merge master to floor 2022-01-12 13:50:45 +01:00
Thyme1
fe4bad6a19 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452622/GRK-Projekt 2022-01-12 13:29:57 +01:00
13298e75f6 Merge pull request 'bubbles' (#11) from bubbles into master
Reviewed-on: #11
2022-01-12 13:29:25 +01:00
8373fbf2c5 Merge branch 'master' into bubbles 2022-01-12 13:29:18 +01:00
Thyme1
551dc2e3e0 add phong for bubbles 2022-01-12 13:28:22 +01:00
Thyme1
9ee4d45a9b smaller bubbles 2022-01-10 21:43:19 +01:00
Thyme1
0c12d3adf3 clean bubble shaders 2022-01-10 21:14:14 +01:00
Thyme1
acd223d652 clean main 2022-01-10 17:31:56 +01:00
Thyme1
ffd6bfbb56 add different seabed 2022-01-08 23:58:10 +01:00
Thyme1
0e5d73c49d add floor 2022-01-08 23:38:26 +01:00
Thyme1
38f9de35fa Merge branch 'bubbles' 2022-01-08 22:36:49 +01:00
Thyme1
c11c78114f add transparency for bubbles 2022-01-08 22:35:24 +01:00
Thyme1
ce3acacbcf add transparency for bubbles 2022-01-08 22:34:09 +01:00
c14b1a6f34 Merge pull request 'bubbles' (#10) from bubbles into master
Reviewed-on: #10
2022-01-08 19:56:25 +01:00
Thyme1
8b3aa7a4ee add more bubbles 2022-01-08 19:49:33 +01:00
Thyme1
84074a4263 merge with fog 2022-01-08 16:04:07 +01:00
Thyme1
9b0fed73c1 add fog on skybox 2022-01-08 15:59:37 +01:00
Thyme1
deec0c2300 add fog on objects 2022-01-08 15:55:06 +01:00
Thyme1
1b7e6d9bb1 make skybox bigger 2022-01-08 14:37:23 +01:00
128a22519e Merge pull request 'fish' (#9) from fish into master
Reviewed-on: #9
2022-01-08 14:22:36 +01:00
7b06f6b3a6 Merge branch 'master' into fish 2022-01-08 14:22:26 +01:00
Matraf
102a842f71 Scalanie 2022-01-08 14:10:19 +01:00
Matraf
8ba06e7539 Scalanie 2022-01-08 14:10:07 +01:00