Malin Ejdbo 73fd118ee2 Merge branch 'master' into feature/multitexturing ...

* Resolve conflicts

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

..

dashboard

Fix issue with the item velocity not showing up correctly and with varying lengths

2021-01-31 23:59:21 +01:00

lightsource

Happy new year

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

rendering

Merge branch 'master' into feature/multitexturing

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

rotation

Happy new year

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

scale

Happy new year

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

shaders

Merge branch 'master' into feature/multitexturing

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

timeframe

Happy new year

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

translation

Happy new year

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

basemodule.cpp

Merge branch 'master' into feature/multitexturing

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

basemodule.h

Happy new year

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

CMakeLists.txt

Merge branch 'master' into feature/multitexturing

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

include.cmake

Getting a running version of modularized cmakelists up and running

2015-05-23 02:03:06 +02:00