Brad Davis
86e21c91ba
Case issues again
2015-08-18 18:56:00 -07:00
Brad Davis
eba446e7f6
Updating to the new version of the sixense library
2015-08-18 18:55:59 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Stephen Birarda
653e0d29c7
resolve conflicts on merge with upstream/core
2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb
repairs for build type of glew external
2015-08-05 14:30:36 -07:00
Bradley Austin Davis
252677e1c2
Fix MD5 of glew dep
2015-08-05 14:02:14 -07:00
Stephen Birarda
34e188fe6e
log more of the steps for glew external project
2015-08-05 12:35:37 -07:00
Stephen Birarda
cc909507f4
get GLEW for all platforms as external project
2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a
Removing integrated glew
2015-08-05 11:21:59 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Bradley Austin Davis
6d8adbf2b5
Make OpenVR windows only for now
2015-07-27 09:13:04 -04:00
Bradley Austin Davis
671bda8883
Working on linux build
2015-07-25 20:58:13 -04:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Bradley Austin Davis
c3f77a1c24
Merge branch 'master' into maggie
2015-07-21 19:21:45 -04:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -07:00
Brad Davis
ae882c8347
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/ui/ApplicationCompositor.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-16 16:37:55 -07:00
Seth Alves
4db66e7894
build separate debug and release versions of polyvox library
2015-07-15 14:38:44 -07:00
Seth Alves
930e570b48
build separate debug and release versions of polyvox library
2015-07-15 13:54:57 -07:00
Seth Alves
f1c10f5119
build separate debug and release versions of polyvox library
2015-07-15 13:38:12 -07:00
Seth Alves
3bc182730a
build separate debug and release versions of polyvox library
2015-07-15 10:52:38 -07:00
Seth Alves
a71c5cae5f
build separate debug and release versions of polyvox library
2015-07-15 10:33:22 -07:00
Seth Alves
443cfc8970
build separate debug and release versions of polyvox library
2015-07-15 10:31:21 -07:00
Seth Alves
316c322118
build separate debug and release versions of polyvox library
2015-07-15 09:36:51 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Brad Davis
9eb15d3d55
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/GLCanvas.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
libraries/render-utils/src/DeferredLightingEffect.cpp
2015-07-13 12:54:19 -07:00
Brad Davis
0c50cb670a
Moving boostconfig folder in IDEs
2015-07-13 12:40:26 -07:00
Brad Davis
0a389a9daa
Updating oglplus version and switching to url based dist
2015-07-07 11:11:52 -07:00
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Sam Gondelman
a6cbc09eac
reverted to openvr 0.9.1
2015-07-02 12:32:35 -07:00
Sam Gondelman
81efd99ae4
merge with hifi/plugins
2015-07-02 10:13:28 -07:00
Bradley Austin Davis
54bbc841e2
Working on mac compilability
2015-07-01 23:03:33 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -07:00
Brad Davis
e7f31ec811
Move to latest Oculus SDK
2015-06-27 00:27:22 -07:00
Seiji Emery
6e87f44ec7
Merge remote-tracking branch 'upstream/master'
2015-06-24 15:12:57 -07:00
Brad Davis
a5428ae24a
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-24 10:39:31 -07:00
Andrew Meadows
1ceed98ca2
Merge pull request #5166 from jherico/64bit
...
Enable Windows 64 bit builds
2015-06-23 17:03:42 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Seiji Emery
0cc940d433
Modified the build files for external targets so that they longer show up project view in IDEs (which clutters up the view, etc).
...
Said files are now buried under hidden/externals; the (phony) build targets still exist and are visible in the target dropdown, but this is filterable (in Xcode, dunno about Visual Studio (just start typing and a filter/search box comes up))
2015-06-19 21:58:16 -07:00
Brad Davis
d65e5882aa
Working on 64 bit builds
2015-06-18 21:44:12 -07:00
Brad Davis
a8d3dc7218
Updating oglplus version
2015-06-17 23:50:38 -07:00
Brad Davis
4f8ea3f624
Merge remote-tracking branch 'upstream/master' into ovr6
2015-06-16 09:58:20 -07:00
Brad Davis
15d214f335
Initial pass at OpenVR
2015-06-12 17:29:05 -07:00
Brad Davis
7955eeda28
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.h
2015-06-12 15:49:35 -07:00
Stephen Birarda
128b086e82
don't build the polyvox examples
2015-06-12 10:25:34 -07:00
Brad Davis
e9587d90c4
Trying to fix linux build
2015-06-09 01:50:32 -07:00
Brad Davis
43bddf23b4
Grabbing correct oglplus commit
2015-06-09 01:03:14 -07:00
Brad Davis
5a1b713160
Fixing texture include error in oglplus
2015-06-09 00:59:17 -07:00
Brad Davis
11bc838be9
Switching to Git for oglplus
2015-06-09 00:48:42 -07:00
