Commit Graph

73 Commits

Author SHA1 Message Date
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
Thyme1
39711ab8d9 comment out big bubble 2022-01-08 14:07:56 +01:00
000296afe1 Merge pull request 'add specular lighting based on cw5 earlier shaders' (#6) from lighting into master
Reviewed-on: #6
2022-01-08 14:04:47 +01:00
Thyme1
73e2bbff4a change bubble to refract 2022-01-02 17:29:41 +01:00
Thyme1
62f81b5d34 create bubbles with good rotation 2022-01-02 02:22:53 +01:00
Thyme1
fb55f586f5 bubble is not upside down 2022-01-02 01:26:44 +01:00
Thyme1
21615e0296 change bubble shaders 2022-01-02 00:03:53 +01:00
Thyme1
78dbab04f5 change bubble.frag to reflective 2022-01-01 14:05:58 +01:00
Thyme1
33a09475d2 minor changes 2022-01-01 12:35:51 +01:00
Thyme1
f03ed1fa4b create sphere with nice skybox texture 2022-01-01 12:21:15 +01:00
Thyme1
ce82c3f8ec change bubble texture 2021-12-31 20:07:14 +01:00
Thyme1
b80447f837 change bubble keypoints 2021-12-31 19:54:17 +01:00
Thyme1
d862125ec7 Merge branch 'lighting' into bubbles 2021-12-31 19:30:47 +01:00
Thyme1
bde06c173d create blue bubbles from floor to ceiling 2021-12-31 17:01:42 +01:00
Thyme1
537681ccaa merge with fish 2021-12-31 13:52:46 +01:00
d5df497f92 Add cursos centering 2021-12-31 13:45:16 +01:00
Thyme1
e79f286293 add blue sphere 2021-12-31 13:36:08 +01:00
960a6ef21d Add fish scaling 2021-12-31 13:30:36 +01:00
e041b6fceb Changed keyPoints 2021-12-31 13:28:10 +01:00
3ee0d0d64e Add shoal 2021-12-31 12:57:26 +01:00
Thyme1
63be4af1be merge with master 2021-12-30 18:34:27 +01:00
Thyme1
707c5557e4 add specular lighting based on cw5 earlier shaders 2021-12-30 18:06:40 +01:00
Thyme1
c662b48305 change light 2021-12-30 14:58:41 +01:00
8821c01e2f ryby robia wziu 2021-12-30 14:56:31 +01:00
Thyme1
1ffaf2b993 change light in shader_tex.frag 2021-12-30 14:50:39 +01:00
Thyme1
94a77b45b4 add ambient lightning 2021-12-30 14:42:41 +01:00
Thyme1
17eefb3324 change lightDir 2021-12-30 14:27:10 +01:00
34c4b58a16 Solve fish error 2021-12-30 14:10:58 +01:00
ac7f096101 Add moving fish with error 2021-12-30 13:05:52 +01:00
matixezor
fa6074be89 chore: remove debug folders 2021-12-30 12:49:00 +01:00
Thyme1
ba468047ba testing refraction 2021-12-30 12:14:47 +01:00
4ed9db4b96 Merge pull request 'submarine' (#4) from submarine into master
Reviewed-on: #4
2021-12-30 12:11:44 +01:00
7dccc9d362 Minor changes 2021-12-30 12:08:05 +01:00
Thyme1
29872be109 change names from fish to submarine 2021-12-29 21:47:09 +01:00
Thyme1
cad4a437de merge master to fish 2021-12-29 21:34:53 +01:00
Thyme1
a1b32f2402 update gitignore to remove debug folder 2021-12-28 20:21:07 +01:00
Thyme1
484757822e add submarine 2021-12-28 20:16:19 +01:00
matixezor
0db1ae34cb refactor: rename skybox related parameters 2021-12-28 19:40:13 +01:00