Commit graph

36924 commits

Author SHA1 Message Date
Stephen Birarda
cd331bbb0f use short name for file description 2016-01-04 16:18:53 -08:00
Stephen Birarda
1526cccd0b const full name, use for description 2016-01-04 16:15:34 -08:00
Stephen Birarda
db68ee2f89 add company name and product name to win params 2016-01-04 16:13:45 -08:00
Stephen Birarda
7f9cd572c4 make WINDOW_SDK_PATH debug a status message 2016-01-04 16:08:15 -08:00
Stephen Birarda
c34ad7ceb8 add docstring for WINDOW_SDK_PATH 2016-01-04 16:07:36 -08:00
Stephen Birarda
4104aabc84 remove extra debugging of WINDOWS_SDK_PATH 2016-01-04 16:06:12 -08:00
Stephen Birarda
8d0478dbef remove ALL_TEST_TARGETS debug 2016-01-04 16:03:40 -08:00
Stephen Birarda
7b920b6047 cleanup WINDOWS_SDK_PATH debug 2016-01-04 16:02:17 -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
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
1646ac55ef include application version in networking 2016-01-04 15:32:07 -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
17a63cdcfc ignore the server-console binary folder for win/linux 2016-01-04 13:59:24 -08:00
Stephen Birarda
bf5f783e67 copy console icon for installer 2016-01-04 13:58:33 -08:00
Stephen Birarda
a1851e2a1a change a comment in packager.js 2016-01-04 13:54:39 -08:00
Stephen Birarda
f172c2b251 remove packaging options debug 2016-01-04 13:54:01 -08:00
Stephen Birarda
b3c5bafabc rename tooltip for tray to proper name 2016-01-04 13:53:34 -08:00
Stephen Birarda
1b79908546 setup packaging as a script 2016-01-04 13:53:26 -08:00
Stephen Birarda
efa0813ae9 Merge remote-tracking branch 'origin/console' into console-dev 2016-01-04 13:18:27 -08:00
Stephen Birarda
6484bf9e94 Merge pull request #65 from huffman/console
Add shared memory back into main.cpp
2016-01-04 13:17:37 -08:00
Stephen Birarda
3f7aa6a15a changes to shortcut names for win installer 2016-01-04 12:04:22 -08:00
Stephen Birarda
eef1139328 use new target names for console 2016-01-04 11:59:05 -08:00
Ryan Huffman
471c555bca Add shared memory back into main.cpp 2016-01-04 11:58:56 -08:00
Stephen Birarda
5f997c7cb7 fix for application name with space on win 2016-01-04 11:22:41 -08:00
Stephen Birarda
6755c31cd8 some changeover from stack manager to console for installer 2016-01-04 11:01:34 -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
9520bd7ba7 remove the beta stack-manager icons 2016-01-04 09:59:27 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -08:00
Leonardo Murillo
0bd823e20c Fix to install path 2015-12-31 10:09:27 -06:00
Leonardo Murillo
2bad5437a9 Adding default content set as optional installer component 2015-12-31 09:07:11 -06:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06:00
Eric Levin
9276c78368 Merge pull request #6741 from PhilipRosedale/master
Improved hand controller grab and mouse movement
2015-12-30 11:10:37 -08:00
Stephen Birarda
6ae4fc55a7 Merge pull request #64 from birarda/console-dev
switch to a tray only console for MVP
2015-12-30 09:45:49 -08:00
Stephen Birarda
a8896de140 remove dead code, use stop index 2015-12-30 09:45:23 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown
Don't send a domain-server check in when shutting down
2015-12-30 08:43:19 -08:00
Andrew Meadows
b83987331b Merge pull request #6725 from huffman/fix-avatar-get-myavatar
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin
Support for Perception Neuron
2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -08:00
Brad Davis
65862bfd02 Merge pull request #6747 from hyperlogic/tony/glmhelpers-tests
Added tests for GLMHelpers::safeEulerAngles.
2015-12-30 11:35:17 -05:00
Philip Rosedale
118f919c8b fix merge conflicts 2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00
Philip Rosedale
54edd94dd2 Merge pull request #6743 from zzmp/fix/skymap-tex-load
Guard against unloaded skymap tex
2015-12-29 21:34:48 -08:00
Philip Rosedale
a44a64d9c0 Merge pull request #6748 from ericrius1/gunFix
Fixing issue with muzzle flash and hit sparks being out of sync for pi…
2015-12-29 21:31:40 -08:00