Commit graph

37394 commits

Author SHA1 Message Date
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
Seth Alves
202a6ae294 debugging 2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772 debugging 2016-01-04 15:52:58 -08:00
Stephen Birarda
8dc074c0a3 fix stars file discovery without full binary dir include 2016-01-04 15:52:06 -08:00
Stephen Birarda
184bae2561 undo change to Stars headers 2016-01-04 15:41:31 -08:00
Stephen Birarda
7304e695b3 resolve conflicts on merge with upstream/master 2016-01-04 15:40:16 -08:00
Eric Levin
f569d08ca8 Merge pull request #6761 from imgntn/grab_add_beam
Add Beam Visualization When Grab Doesn't Intersect
2016-01-04 15:36:05 -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
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -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
howard-stearns
715826cc0d Full speed (no more half speed), and fix shouldRender for objects larger
than their distance.
2016-01-04 15:12:14 -08:00
Seth Alves
d0c6604be8 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 15:05:54 -08:00
Seth Alves
5beba58e5f debugging 2016-01-04 15:05:08 -08:00
Seth Alves
10f5682a3e Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 15:03:36 -08:00
Brad Davis
125d103e29 Merge pull request #6762 from ZappoMan/hideMirrorAndAudioInHMD
hide the rear view mirror and the audio in the HMD
2016-01-04 18:03:33 -05:00
Seth Alves
bd35532c5d debugging 2016-01-04 15:02:45 -08:00
howard-stearns
a37b9157bc simplify preferences 2016-01-04 15:00:54 -08:00
Seth Alves
1ad4e39a85 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:58:59 -08:00
Seth Alves
ef8673610f debugging 2016-01-04 14:58:13 -08:00
Seth Alves
f06ae21da4 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:52:31 -08:00
Seth Alves
cd92a9fa1a adjust timestamps 2016-01-04 14:51:43 -08:00
Seth Alves
38b41298d6 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:49:37 -08:00
Seth Alves
9a708f2e74 try splitting edit into 2 packets 2016-01-04 14:48:49 -08:00
Andrew Meadows
164c649a33 Merge pull request #6681 from howard-stearns/pid-render-limits
Pid render limits
2016-01-04 14:47:31 -08:00
howard-stearns
333eadd551 Don't show render count / distance when using acuity. 2016-01-04 14:46:57 -08:00
Seth Alves
bb7a1515c6 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:43:23 -08:00
Seth Alves
6c8eb90ee0 debugging 2016-01-04 14:42:37 -08:00
Andrew Meadows
d2b757d6ad Merge pull request #6755 from zzmp/fix/optimize-gpu-stream-copy
Optimize getVertexStream() by using a const&
2016-01-04 14:31:21 -08:00
Seth Alves
9a979f4abf update doppelganger script 2016-01-04 14:18:24 -08:00
Seth Alves
e18298c974 Merge branch 'doppelganger' of github.com:imgntn/hifi into set-model-entity-joints 2016-01-04 14:16:30 -08:00
Seth Alves
7f2e0cd103 expose a way to set translation and rotation of all model joints at once 2016-01-04 14:13:08 -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
Brad Hefta-Gaub
2b5956af99 move alert and confirm to use offscreen ui 2016-01-04 13:57:36 -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
Brad Hefta-Gaub
f719f4a1cc hide the rear view mirror and the audio in the HMD 2016-01-04 13:31:01 -08:00