Malin E 4d9983a867 Solve 1 more conflict

2023-02-01 14:57:31 +01:00

..

grids

Happy new year

2023-01-02 11:19:33 +01:00

renderablecartesianaxes.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderablecartesianaxes.h

Happy new year

2023-01-02 11:19:33 +01:00

renderabledisc.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderabledisc.h

Happy new year

2023-01-02 11:19:33 +01:00

renderablelabel.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderablelabel.h

Happy new year

2023-01-02 11:19:33 +01:00

renderablemodel.cpp

Solve 1 more conflict

2023-02-01 14:57:31 +01:00

renderablemodel.h

Merge branch 'master' into feature/model-opacity

2023-02-01 14:52:33 +01:00

renderablenodeline.cpp

Small cleanup of property documentation

2023-01-09 00:11:58 +01:00

renderablenodeline.h

Happy new year

2023-01-02 11:19:33 +01:00

renderableplane.cpp

Small cleanup of property documentation

2023-01-09 00:11:58 +01:00

renderableplane.h

Happy new year

2023-01-02 11:19:33 +01:00

renderableplaneimagelocal.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderableplaneimagelocal.h

Happy new year

2023-01-02 11:19:33 +01:00

renderableplaneimageonline.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderableplaneimageonline.h

Happy new year

2023-01-02 11:19:33 +01:00

renderableplanetimevaryingimage.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderableplanetimevaryingimage.h

Happy new year

2023-01-02 11:19:33 +01:00

renderableprism.cpp

Small cleanup of property documentation

2023-01-09 00:11:58 +01:00

renderableprism.h

Happy new year

2023-01-02 11:19:33 +01:00

renderablesphere.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderablesphere.h

Happy new year

2023-01-02 11:19:33 +01:00

renderabletimevaryingsphere.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderabletimevaryingsphere.h

Happy new year

2023-01-02 11:19:33 +01:00

renderabletrail.cpp

Small cleanup of property documentation

2023-01-09 00:11:58 +01:00

renderabletrail.h

Happy new year

2023-01-02 11:19:33 +01:00

renderabletrailorbit.cpp

Happy new year

2023-01-02 11:19:33 +01:00

renderabletrailorbit.h

Happy new year

2023-01-02 11:19:33 +01:00

renderabletrailtrajectory.cpp

Don't render RenderableTrailTrajectory if the time is _exactly_ the start time (closes #2314)

2023-01-27 21:02:27 +01:00

renderabletrailtrajectory.h

Happy new year

2023-01-02 11:19:33 +01:00

screenspacedashboard_lua.inl

Happy new year

2023-01-02 11:19:33 +01:00

screenspacedashboard.cpp

Cleanup code with designated initializer lists

2023-01-22 23:01:32 +01:00

screenspacedashboard.h

Happy new year

2023-01-02 11:19:33 +01:00

screenspaceframebuffer.cpp

Merge branch 'master' into feature/model-opacity

2023-02-01 14:52:33 +01:00

screenspaceframebuffer.h

Happy new year

2023-01-02 11:19:33 +01:00

screenspaceimagelocal.cpp

Correctly swizzle the textures for ScreenSpaceImage types to allow for 8 bit grayscale images (closes #2330)

2023-01-27 21:29:12 +01:00

screenspaceimagelocal.h

Happy new year

2023-01-02 11:19:33 +01:00

screenspaceimageonline.cpp

Correctly swizzle the textures for ScreenSpaceImage types to allow for 8 bit grayscale images (closes #2330)

2023-01-27 21:29:12 +01:00

screenspaceimageonline.h

Happy new year

2023-01-02 11:19:33 +01:00