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
|
3906a4fe38
|
drop the resources folder for DS beside executable
|
2016-01-15 15:41:34 -08:00 |
|
Stephen Birarda
|
71307c1280
|
remove extra debug from shell application copy
|
2016-01-15 15:41:34 -08:00 |
|
Stephen Birarda
|
b7154cacd2
|
use shell application to avoid fixup on Electron
|
2016-01-15 15:41:34 -08:00 |
|
Stephen Birarda
|
cbc0c4e31d
|
rename console packaging target
|
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
|
6eb96c27e5
|
use standard PlugIns path, fix for makefiles build
|
2016-01-15 15:41:34 -08:00 |
|
Stephen Birarda
|
e421624e99
|
put AC and DS binaries beside server-console
|
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
|
4f6595ed08
|
fix makefiles build on OS X
|
2016-01-15 15:41:34 -08:00 |
|
Ryan Huffman
|
196161fe93
|
Merge pull request #66 from birarda/console-dev
some initial packaging work and console fixes
|
2016-01-14 10:17:24 -08:00 |
|
Stephen Birarda
|
404fb2f781
|
Merge branch 'master' of https://github.com/highfidelity/hifi into console
|
2016-01-07 16:02:32 -08:00 |
|
Stephen Birarda
|
5832884b58
|
handle beta icon usage while packaging console
|
2016-01-05 10:27:46 -08:00 |
|
Stephen Birarda
|
139abf704d
|
use an s3 link for dependencies
|
2016-01-05 09:58:59 -08:00 |
|
Stephen Birarda
|
9c2eebfaeb
|
don't attempt to find nsight multiple times per run
|
2016-01-04 16:52:39 -08:00 |
|
Stephen Birarda
|
c4fdd86a56
|
use current source dir for console icon copy
|
2016-01-04 16:36:30 -08:00 |
|
Stephen Birarda
|
5e762a4b95
|
specify console folder to copy per-platform
|
2016-01-04 16:29:00 -08:00 |
|
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 |
|