Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Brad Davis 180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
2015-08-01 20:01:59 -07:00
..
external The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 2015-07-27 19:04:49 +02:00
icon fix check for debug/release icon 2015-01-30 15:41:44 -08:00
resources Working on line height 2015-07-17 14:33:32 -07:00
src Merge remote-tracking branch 'upstream/master' into core 2015-08-01 20:01:59 -07:00
ui Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
CMakeLists.txt A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU 2015-07-29 14:42:24 -07:00
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceVersion.h.in