6 Commits

Author SHA1 Message Date
Zemledelec
febe57e601 Merge branch 'master' into geo_object_instancing
# Conflicts:
#	src/og/entity/Entity.js
#	src/og/math/Mat4.js
#	src/og/webgl/Handler.js
#	src/og/webgl/callbacks.js
#	tests/Globe.test.js
2021-11-13 00:07:12 +03:00
Thibaut Lassalle
e2f518931a fix eslint 2021-10-31 16:32:16 -07:00
Thibaut Lassalle
bf95fc3ec6 eslint rules 2021-10-16 04:20:59 -07:00
Zemledelec
9c42d3caa0 return files back 2018-03-15 00:37:39 +03:00
Zemledelec
be25af6bef remove globus 2018-03-15 00:36:11 +03:00
Zemledelec
80e7a33ff9 git core.ignorecase set to false 2018-03-14 23:39:35 +03:00