Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 02:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36916 commits 25 branches 0 tags 1.1 GiB
Commit graph

863 commits

Author SHA1 Message Date
Stephen Birarda
c9c536ff00 remove FIND_NSIGHT_CALLED variable 2016-01-04 16:00:42 -08:00
Stephen Birarda
7892808b28 cleanup TargetNsight, remove extra debug 2016-01-04 15:58:13 -08:00
Stephen Birarda
1e2ae87dee make application version a private include 2016-01-04 15:20:17 -08:00
Stephen Birarda
9e252f0b08 exclude targets from all build, include app version 2016-01-04 15:18:57 -08:00
Stephen Birarda
fcc0c92ff1 put console/build-package in installer folder 2016-01-04 15:13:29 -08:00
Stephen Birarda
bf5f783e67 copy console icon for installer 2016-01-04 13:58:33 -08:00
Stephen Birarda
817bbb09d2 rename console target to High Fidelity Console 2016-01-04 10:54:51 -08:00
Stephen Birarda
90cf69b9b5 add console handling to installer component consolidation 2016-01-04 10:47:25 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -08:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Anthony J. Thibault
c35995b8e3 Build fix for linux? 2015-12-29 08:51:44 -08:00
Leonardo Murillo
ea6850c423 Changes per convo with Philip 2015-12-29 10:16:27 -06:00
Anthony J. Thibault
7e514d2f4d Mac build fix 2015-12-28 18:42:03 -08:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Leonardo Murillo
baf095f4af Lots and lots of changes to installer 2015-12-23 14:16:49 -06:00
Leonardo Murillo
ec6f572d68 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-23 08:26:24 -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
Brad Hefta-Gaub
ce426f0144 Merge pull request #6695 from birarda/qxmpp-deletion 
remove an unused qxmpp external
 2015-12-21 16:49:04 -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
Brad Hefta-Gaub
868d10651a Merge pull request #6651 from jherico/webengine 
Migrate QML based web views to Qt WebEngine
 2015-12-18 14:56:35 -08:00
Stephen Birarda
de9e03a379 remove qxmpp external 2015-12-18 10:54:04 -08:00
Leonardo Murillo
736977a4c2 Using correct Icons for PR vs Relesae 2015-12-18 08:16:39 -06:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
Leonardo Murillo
3e6316f089 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-16 11:34:58 -06:00
Andrew Meadows
51ff8f096e correct input plugin load path on linux 2015-12-15 08:43:04 -08:00
Leonardo Murillo
0136e5fe97 Merge branch 'master' of https://github.com/murillodigital/hifi 2015-12-14 20:20:36 -06:00
Andrew Meadows
6d7597e9fc remove comments and remove dangling whitespace 2015-12-11 09:40:15 -08:00
Andrew Meadows
9231692d23 fix asset URL and windows cmake command for bullet 2015-12-11 09:40:15 -08:00
Andrew Meadows
cb65a6f640 fix cmake to build bullet-2.83 2015-12-11 09:40:15 -08:00
Leonardo Murillo
bce808cdbe Merge branch 'master' of https://github.com/murillodigital/hifi 2015-12-11 08:42:40 -08:00
Philip Rosedale
4a1d0e5a26 Merge pull request #6623 from ZappoMan/switchToJulySixenseSDK 
switch to july sixense SDK
 2015-12-10 21:21:01 -08:00
Brad Hefta-Gaub
e5a5c05e84 switch to july sixense SDK 2015-12-10 17:56:31 -08:00
Brad Davis
98263f0c0d Moving sdl2 to external plugin 2015-12-10 14:56:41 -08:00
Bradley Austin Davis
1644bda908 Migrate to latest Oculus SDK (0.8) 2015-12-09 17:32:11 -08:00
Brad Davis
978d39b7f4 Moving OpenVR to external plugin and updating to latest version 2015-12-09 16:20:24 -08:00
Leonardo Murillo
d811660ed6 DO NOT MERGE - Testing PR environment 2015-12-09 11:07:10 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Brad Hefta-Gaub
ab63f19b6a Merge pull request #6546 from kencooke/audio-reverb 
Reverb
 2015-12-04 10:19:56 -08:00
Ken Cooke
aad4743bf0 Completely remove Gverb from cmake 2015-12-03 18:06:50 -08:00
Stephen Birarda
bddb8d5b68 remove Quazip files used by CMake 2015-12-03 14:08:10 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
Brad Davis
55799403c9 64 bit support for Leap Motion on windows 2015-12-02 21:52:06 -08:00