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
fd84893c61
build separate debug and release versions of polyvox library
2015-07-15 09:42:26 -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
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
Seiji Emery
16e7af1848
Reverted macro naming convention
2015-07-02 17:41:38 -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
Seiji Emery
a48adf5ce5
Cleanup + formatting
2015-06-30 14:12:58 -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
e81b0a3c3a
Fixed tests for ALL_BUILD
...
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).
ALL_BUILD will now succeed.
2015-06-26 13:31:31 -07:00
Seiji Emery
6e87f44ec7
Merge remote-tracking branch 'upstream/master'
2015-06-24 15:12:57 -07:00
Seiji Emery
0ee0c92f2f
Re-added stuff
2015-06-24 14:54:54 -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
1846ead27c
Merge branch 'master' into vs2015
2015-06-10 10:11:58 -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
Brad Davis
119f37a178
Working on SDK 0.6
2015-06-07 14:34:40 -07:00
Brad Davis
f614268667
Moving windows to SDK 0.6
...
Working on SDK 0.6 for windows
Working on SDK 0.6 for windows
2015-06-07 01:40:44 -07:00
Brad Davis
f22682fe39
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2015-06-01 22:59:10 -07:00
Brad Davis
a483dd27ba
Trying to get widgets / windows working
2015-06-01 17:31:18 -07:00
Stephen Birarda
94131908fb
update polyvox for xcode C++11 build
2015-06-01 14:53:11 -07:00
Brad Davis
912c003d58
Making (most) plugins into a library
2015-05-29 16:49:11 -07:00
Brad Davis
8bad80324f
Merge branch 'master' into plugins_pt3
2015-05-29 09:05:01 -07:00
Brad Davis
1c49dde6f8
Merge branch 'master' into plugins
...
Conflicts:
CMakeLists.txt
2015-05-28 14:30:19 -07:00
Seth Alves
aefd34f8d6
trying again to get polyvox to build on osx
2015-05-28 06:43:31 -07:00
Seth Alves
24bb17f7b2
trying again to get polyvox to build on osx
2015-05-28 06:36:31 -07:00
