Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:01:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49339 commits 25 branches 0 tags 1.1 GiB
Commit graph

618 commits

Author SHA1 Message Date
Stephen Birarda
f8f0b99a46 add icon to interface exec, icons in start menu 2016-01-15 15:41:34 -08:00
Stephen Birarda
8662fd0afb use correct dde install path for win 2016-01-15 15:41:34 -08:00
Stephen Birarda
fcd9d9b810 setup optional dde archive for windows 2016-01-15 15:41:34 -08:00
Stephen Birarda
8842c66109 include trailing slash in windows file copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
aa9e9836b4 repair another committed conflict 2016-01-15 15:41:34 -08:00
Stephen Birarda
6db36a3863 remove accidentally committed conflict 2016-01-15 15:41:34 -08:00
Stephen Birarda
3b3140de48 exclude console build from all by default 2016-01-15 15:41:34 -08:00
Stephen Birarda
acdd0bda2e use external project hack on win only 2016-01-15 15:41:34 -08:00
Stephen Birarda
dedb7e2778 bury components in a shell application inside the server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
55886d43f5 add DDE component as downloadable optional 2016-01-15 15:41:34 -08:00
Stephen Birarda
4f00982724 remove extraneous add dependency for FIXUP_LIB 2016-01-15 15:41:34 -08:00
Stephen Birarda
817d651c47 add initial fixup install commands for interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
e3ef18ae6e customize Interface output name for PR/dev/prod 2016-01-15 15:41:34 -08:00
Stephen Birarda
f87d8885f4 rename interface bundle for production and pr build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d491a7f0e5 work around OS X package installer relocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
92064fe507 generate a componentized server/client installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
0463e008cf base cpack configuaration using install commands 2016-01-15 15:41:34 -08:00
Stephen Birarda
8dc074c0a3 fix stars file discovery without full binary dir include 2016-01-04 15:52:06 -08:00
Stephen Birarda
508a5c74a2 include application version to interface 2016-01-04 15:35:22 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK 
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
 2015-12-21 18:30:15 -08:00
Leonardo Murillo
aca60e23c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-19 18:44:21 -06:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Leonardo Murillo
c1bac2f9bd Fixing uninstall record 2015-12-18 08:47:47 -06:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Bradley Austin Davis
c5f5e8de60 Trying to fix build problem 2015-12-10 12:00:40 -08:00
Leonardo Murillo
9ba5670c76 Fix 2015-12-08 14:20:19 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Leonardo Murillo
9062cca8c4 Restoring 2015-12-08 13:33:15 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
Leonardo Murillo
6a53140720 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-30 08:38:13 -06:00
Anthony Thibault
a9e25c51e5 Fix for linker warning LNK4075 on Windows 
Specifcally, this warning:

    LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification

The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
 2015-11-27 20:56:57 -08:00
Leonardo Murillo
766f0dbd32 Have stack manager use bundled stack 2015-11-27 14:04:33 -06:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Brad Davis
0bf29a441f Add recording classes 2015-11-06 11:14:46 -08:00
Brad Davis
eeabc9b093 Removing iviewhmd due to broken production builds 2015-11-02 23:49:03 -08:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Brad Davis
f77878ee79 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-12 11:05:28 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
184e9a2209 Prototyping controllers 2015-10-09 16:20:55 -07:00
Brad Hefta-Gaub
255689e24f add GLEW_STATIC to fix link warnings 2015-10-02 15:08:04 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Thijs Wenker
fd82f05307 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-21 19:29:38 +02:00
Thijs Wenker
7f5fc64f6c Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-20 21:09:22 +02: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
Seth Alves
2056f588e3 if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux 2015-08-19 18:03:16 -07:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Thijs Wenker
aed0688d17 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-13 21:02:39 +02:00
Thijs Wenker
a97524f954 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-12 15:26:53 +02: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
Brad Davis
ccc4a59992 Cleanup and PR comments 2015-08-08 13:54:37 -07:00
Thijs Wenker
d10ae4a68d Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-07 21:43:32 +02:00
Thijs Wenker
25266b986c added basic implementation of WebSocket class ( https://developer.mozilla.org/en-US/docs/Web/API/WebSocket ) using QWebSocket 2015-08-07 21:43:14 +02:00
David Rowe
d7b42e264e Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-08-05 16:49:06 -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
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
Sam Gondelman
01c4e17236 trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -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
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
9601e09ba9 A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU 2015-07-29 14:42:24 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Sam Gateau
661f29924f Clean up the cmakelist to normally onlly do th eminimal linking and include for gl 2015-07-29 13:55:26 -07:00
Sam Gateau
76acbde595 Removing the opengl and glew links from Interface since now coming from gpu lib 2015-07-29 09:54:10 -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
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
Brad Davis
359abd6474 Merge branch 'master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/GLCanvas.cpp
	interface/src/GLCanvas.h
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
	libraries/render-utils/src/OffscreenGlCanvas.cpp
	libraries/render-utils/src/OffscreenGlCanvas.h
	libraries/render-utils/src/text/EffectType.h
 2015-07-20 13:33:24 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Brad Davis
d4e637c5b8 Removing superfluous lighting and naked GL in mirror 2015-07-20 09:36:05 -07:00
Brad Davis
0da8b27fcf Removing unused files 2015-07-18 22:53:43 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -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
Jenkins Slave Access
981ff2d5fa Enhancing PR installer titles 2015-07-01 14:13:37 -04:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Brad Davis
9f98547390 Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Leonardo Murillo
1d785c714b Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-09 09:01:50 -06:00
Leonardo Murillo
cefdbc3126 Checkpoint auto updater 2015-06-02 19:32:03 -06:00
Brad Davis
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Brad Davis
23d6725a6a Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -07:00
Brad Davis
e69362dadc Working on stereo rendering 2015-05-22 17:51:59 -07:00
Sam Gateau
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -07:00