Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing ...

* Resolve conflicts

2021-03-02 15:49:39 +01:00

..

renderablecrawlingline.cpp

Make use of new verifiers (Color and File) (#1510)

2021-03-02 08:11:49 +01:00

renderablecrawlingline.h

Happy new year

2021-01-02 15:26:51 +01:00

renderablefov.cpp

Feature/codegen (#1480)

2021-02-09 09:12:43 +01:00

renderablefov.h

Happy new year

2021-01-02 15:26:51 +01:00

renderablemodelprojection.cpp

Merge branch 'master' into feature/multitexturing

2021-03-02 15:49:39 +01:00

renderablemodelprojection.h

Merge branch 'master' into feature/multitexturing

2021-02-01 11:57:31 +01:00

renderableplaneprojection.cpp

Feature/codegen (#1480)

2021-02-09 09:12:43 +01:00

renderableplaneprojection.h

Happy new year

2021-01-02 15:26:51 +01:00

renderableplanetprojection.cpp

Adapt to new Ghoul; fix previously undetected errors in uniform setting

2021-02-11 14:44:13 +01:00

renderableplanetprojection.h

Happy new year

2021-01-02 15:26:51 +01:00

renderableshadowcylinder.cpp

Make use of new verifiers (Color and File) (#1510)

2021-03-02 08:11:49 +01:00

renderableshadowcylinder.h

Happy new year

2021-01-02 15:26:51 +01:00