Seiji Emery
3d59f8d7e8
changed setup_project to only use the generated shader source files
2015-08-25 14:40:52 -07:00
Seiji Emery
316ddd68ef
force cmake autoscribe to use full paths
2015-08-25 13:46:50 -07:00
Seiji Emery
4d9f45475e
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
2015-08-24 14:38:26 -07:00
Seiji Emery
bd18951be8
fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/
2015-08-24 13:13:24 -07:00
MarcelEdward
3ab63ba613
Update Find3DConnexionClient.cmake
...
The space navigator stopped working, this hopefully will fix it.
The framework is 3DconnexionClient.framework for osx, not sure why connexion named it that way. It is a library in /Library/Frameworks, the library name is in stone.
for apple, this works in cmake/modules/Find3DConnexionClient.cmake
find_library(3DConnexionClient 3DconnexionClient)
And for windows it has to find the I3dMouseParams.h file in interface/external/3dconnexionclient/includes.
So for windows the line in Find3DConnexionClient.cmake has to be:
hifi_library_search_hints("3dconnexionclient")
2015-08-22 22:48:51 +02:00
Brad Davis
7fb491e48c
Cleanup plugin interface, break up oculus plugins
2015-08-21 00:29:25 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e
Revert "Updating to the new version of the sixense library"
2015-08-19 09:44:51 -07:00
Brad Davis
7f09df1d0b
Fixing external
2015-08-18 18:56:01 -07:00
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
Leonardo Murillo
cda5b29fd3
Another take at versioning details exchange - checkpoint
2015-08-13 14:19:13 -06:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -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
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -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
Brad Davis
754bf5c6f7
Merge pull request #5509 from birarda/core
...
get GLEW for all platforms as external project
2015-08-05 13:41:48 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -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
David Rowe
1201073709
Add DLLs needed for Interface to run without iViewHMD installed
2015-08-04 13:15:26 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f
Merge branch 'master' into core
2015-08-03 22:18:38 -07:00
David Rowe
86ad490bde
Fix to build on build PC without iViewHMD software installed
2015-08-03 20:52:11 -07:00
Sam Gondelman
95232920f1
trying to fix mac linking errors
2015-08-03 16:35:34 -07:00
Sam Gondelman
c9780338ae
merge from master
2015-08-03 16:27:45 -07:00
David Rowe
7749b912ea
Merge branch 'master' into 20639
2015-08-03 09:55:35 -07:00
David Rowe
e300eb27c0
Fix libs directory path
2015-08-03 09:55:14 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Sam Gondelman
647bb2b9ce
removing unnecessary weak link
2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94
more work on cleaning up connexion
2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236
trying to fix connexion linker errors, general style fixes, renamed some files
2015-08-01 11:41:29 -07:00
SamGondelman
e8daee013e
windows finds framework
2015-07-31 16:27:10 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
SamGondelman
25e75bcc79
WIP: trying to fix windows not finding framework
2015-07-30 18:11:24 -07:00
Sam Gondelman
a01a4f929f
removing unnecessary weak link
2015-07-30 15:14:51 -07:00
Sam Gondelman
b8f7d4b8c8
more work on cleaning up connexion
2015-07-30 13:19:05 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -07:00
David Rowe
02ae008c9c
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-07-29 16:24:30 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
David Rowe
70d155048f
Add SMI iViewHMD eye tracking as an optional library
2015-07-27 14:43:32 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02: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
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
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
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
Seth Alves
b024bd0ff2
trying again to get polyvox to build on osx
2015-05-27 22:00:20 -07:00
Seth Alves
6a1ea820e7
trying again to get polyvox to build on osx
2015-05-27 21:50:35 -07:00
Seth Alves
1026da18b2
trying again to get polyvox to build on osx
2015-05-27 21:32:20 -07:00
Seth Alves
5b62714ba4
trying again to get polyvox to build on osx
2015-05-27 21:09:48 -07:00
Seth Alves
5e79b03faf
trying to get polyvox to build on osx
2015-05-27 20:55:16 -07:00
Seth Alves
f4b7a41006
trying to get polyvox to build on osx
2015-05-27 20:46:50 -07:00
Seth Alves
6711c64cc6
trying to get polyvox to build on osx
2015-05-27 20:20:37 -07:00
Seth Alves
00296faa51
trying to get polyvox to build on osx
2015-05-27 20:00:37 -07:00
Seth Alves
aff82a90ce
try, try again
2015-05-27 19:16:50 -07:00
Seth Alves
05cd7fb8c4
update polyvox external source
2015-05-27 18:39:13 -07:00
Seth Alves
25df777132
fix polyfox url
2015-05-27 16:15:58 -07:00
Seth Alves
c933c42b18
move polyvox external source to s3
2015-05-27 15:02:20 -07:00
Seth Alves
1109444c3d
attempt to make sure the ray that picks against polyvox entities is long enough
2015-05-27 14:57:12 -07:00
Brad Davis
810db39233
Working on oculus rendering
2015-05-27 12:42:05 -07:00
Seth Alves
7c4b89d917
get polyvox to build on osx
2015-05-27 11:56:57 -07:00
Brad Davis
09085f1cd9
Working towards display plugins
2015-05-26 18:42:38 -07:00
Brad Davis
e69362dadc
Working on stereo rendering
2015-05-22 17:51:59 -07:00
Brad Davis
ac93d2c721
Working on display plugins
2015-05-21 18:50:11 -07:00
Seth Alves
6a3203475a
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-21 11:57:54 -07:00
Seth Alves
0c1ad258f3
update polyvox
2015-05-21 11:57:37 -07:00
Seth Alves
bd94d28075
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-21 11:55:17 -07:00
Seth Alves
8e76887101
working on windows build of polyvox
2015-05-21 11:55:13 -07:00
Seth Alves
b74262f2ce
update polyvox
2015-05-21 11:53:56 -07:00
Seth Alves
c02b87ad1c
update polyvox
2015-05-21 11:09:44 -07:00
Seth Alves
4166c3224f
link polyvox library in with entities
2015-05-19 16:24:13 -07:00
Bradley Austin Davis
03bd17ed49
Rebasing onto scale changes
2015-05-08 15:09:46 -07:00
Bradley Austin Davis
5f12af75bd
Tweaking to match master
2015-05-08 11:11:46 -07:00
Bradley Austin Davis
5e821b4447
Updating plugins
2015-05-07 22:32:28 -07:00
Bradley Austin Davis
77a9f7fa2a
Merge branch 'plugins_pt1' into plugins
2015-05-06 14:22:13 -07:00
Stephen Birarda
b28e7cc765
handle case where a symlink replaces copy
2015-05-04 17:46:03 -07:00
Stephen Birarda
a24789b721
remove extra space from SetupHifiProject
2015-05-01 16:32:05 -07:00
Brad Davis
ba4ae3762d
Working on merging in master
2015-04-30 22:01:03 -07:00
Stephen Birarda
b50545f414
use symlink for DS resources, add AM bandwidth
2015-04-30 13:53:44 -07:00
Stephen Birarda
e8ee9e4b3a
try performing copy in PRE_BUILD for VS
2015-04-30 13:42:30 -07:00
Stephen Birarda
3c7f1cc565
add the symlink or copy directory macro
2015-04-30 13:37:15 -07:00
Stephen Birarda
42c40a7164
attempt add of resources to executable sources
2015-04-30 13:32:25 -07:00
Stephen Birarda
f9ac918ff0
add macro to copy directory beside target
2015-04-30 13:10:59 -07:00
Stephen Birarda
38ae3afc82
add a macro for directory copying
2015-04-30 13:06:00 -07:00
Brad Davis
a83616a7dc
Don't prevent building on Visual Studio 2015
2015-04-30 10:32:19 -07:00
Stephen Birarda
ec2f54b90a
add a macro to recursively correctly handle resources
2015-04-27 16:02:52 -07:00
Seth Alves
34e64e5007
Merge pull request #4650 from birarda/vhacd-external
...
add v-hacd as an external project
2015-04-21 09:44:52 -07:00
Stephen Birarda
cfac4fe9c1
remove the Visage find module
2015-04-17 14:28:41 -07:00
Stephen Birarda
b25d22aa53
use debug/release for IDE handling of V-HACD
2015-04-15 14:38:24 -07:00
Stephen Birarda
03129f98d4
make VHACD an external project
2015-04-15 13:51:51 -07:00
Stephen Birarda
08b155146a
move externals from build-ext inside the build folder
2015-04-15 12:12:21 -07:00
Clément Brisset
01dc1b058c
Merge pull request #4580 from birarda/master
...
use non-persistent settings to avoid lobby crash confusion
2015-04-02 17:37:24 +02:00
Bradley Austin Davis
4a7fd318c3
Fixing build problem on linux
2015-04-01 18:45:50 -07:00
Stephen Birarda
12cacad8f8
remove a stray message call in cmake file
2015-04-01 18:02:48 -07:00
