Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 08:13:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Thijs Wenker fa4555a7a2 Merge branch 'master' of https://github.com/worklist/hifi into 20176 
Conflicts:
	interface/src/ui/overlays/Grid3DOverlay.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
	interface/src/ui/overlays/Line3DOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.h
	interface/src/ui/overlays/Overlay.h
	interface/src/ui/overlays/Overlay2D.cpp
	interface/src/ui/overlays/Text3DOverlay.cpp
	interface/src/ui/overlays/TextOverlay.cpp
	interface/src/ui/overlays/TextOverlay.h
2014-11-14 20:09:27 +01:00
..
external typo 2014-10-23 14:07:42 -07:00
resources Perspective correction fix (lets us use lower tesselation on light volumes). 2014-11-05 16:50:34 -08:00
src Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-14 20:09:27 +01:00
ui Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
CMakeLists.txt Merge pull request #3652 from ctrlaltdavid/19976 2014-10-29 20:46:12 -07:00
interface.icns
interface_en.ts importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in