Commit graph

22721 commits

Author SHA1 Message Date
Ryan Huffman
74bc48ce55 Add message to edit entities list for when no entities are nearby 2015-02-26 14:34:32 -08:00
Ryan Huffman
ecc003c5e1 Adjust colors for disabled input elements 2015-02-26 14:23:25 -08:00
Ryan Huffman
3c5f11e6ed Add initial support for multi-selection in properties window 2015-02-26 14:23:11 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Andrew Meadows
375255f22e Merge pull request #4345 from virneo/20305
CR for Job #20305 - Physics: V-HACD convex decomposition utilities
2015-02-26 13:24:49 -08:00
Sam Gateau
96d5a2ab42 fixing tab maybe 2015-02-26 12:10:08 -08:00
Sam Gateau
bc8d688cde fixing tab maybe 2015-02-26 12:04:33 -08:00
Sam Gateau
e77d4572fa Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-02-26 12:03:39 -08:00
Virendra Singh
695cfb3397 VHACD dependency build instructions 2015-02-27 01:04:23 +05:30
Virendra Singh
d4367924ad Clean up coding standard violations 2015-02-27 00:59:59 +05:30
Virendra Singh
93106be466 VHACD dependency build instructions 2015-02-27 00:58:55 +05:30
dev
b04dbf7a34 fixing compilation issue on macos 2015-02-26 11:27:40 -08:00
Atlante45
5a556a06d2 Merge branch 'master' of https://github.com/highfidelity/hifi into relax_face_tracker 2015-02-26 20:06:20 +01:00
Atlante45
fdf9fdd877 Relax head/lean when not tracking 2015-02-26 20:05:47 +01:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Ryan Huffman
c3a7257439 Remove unused light properties from entity properties window 2015-02-26 11:03:06 -08:00
Virendra Singh
95839dd64e untabify the source files 2015-02-27 00:27:18 +05:30
Sam Gateau
38762e882e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-26 10:53:26 -08:00
Sam Gateau
fcb293d0b2 CLean up before pr 2015-02-26 10:45:00 -08:00
Virendra Singh
36c3131524 Rectifying bad merge in BUILD.md and BUILD_WIN.md 2015-02-27 00:14:46 +05:30
Atlante45
e37ef226fc Simplify lookForward compute 2015-02-26 19:21:14 +01:00
Atlante45
682b3f5e61 Remove unused angular velocity 2015-02-26 19:18:52 +01:00
Atlante45
f560f97c6b Only update active FaceTracker 2015-02-26 19:18:05 +01:00
Atlante45
b6968a6b15 Update Facetrackers 2015-02-26 19:15:49 +01:00
Atlante45
8eb4abc49c Rework FaceTracker 2015-02-26 19:14:09 +01:00
Seth Alves
7c7d727b55 mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 10:07:48 -08:00
Stephen Birarda
5a4a3ce6dd remove message calls to debug bullet vars 2015-02-26 09:59:15 -08:00
Stephen Birarda
ea88518a44 handle debug/release for multi-config on WIN32 2015-02-26 09:57:56 -08:00
Seth Alves
0918d4989b mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 09:53:23 -08:00
Stephen Birarda
621df1f66b remove win requirement of msbuild for bullet 2015-02-26 09:50:21 -08:00
Virendra Singh
19912930dd Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 2015-02-26 22:57:27 +05:30
Virendra Singh
bdb79f2619 Resetting from master 2015-02-26 22:56:21 +05:30
Seth Alves
9f83eabaad Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-26 09:21:53 -08:00
Philip Rosedale
c2e559342a Merge pull request #4341 from AndrewMeadows/bispinor
load non-moving dynamic objects as "inactive" in physics engine
2015-02-26 09:21:49 -08:00
Seth Alves
f157c5c60d Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-26 09:13:49 -08:00
Virendra Singh
ce60bb40d7 removed tags for *.md files 2015-02-26 22:32:47 +05:30
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305
Conflicts:
	BUILD.md
	BUILD_WIN.md
2015-02-26 22:16:35 +05:30
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
4959e2924e add an example script to control the sun light 2015-02-25 19:17:38 -08:00
Sam Gateau
b4cb5ca9d1 add an example script to control the sun light 2015-02-25 19:09:18 -08:00
Sam Gateau
6b29e314c2 Adding the Stage of the Scene and exposing control of the sun light from javascript 2015-02-25 19:05:27 -08:00
Leonardo Murillo
cfa6352c3a Merge pull request #4344 from birarda/master
better handling for externals folder name for msvc12
2015-02-25 17:58:07 -08:00
Stephen Birarda
53f265bca2 Merge branch 'master' of github.com:highfidelity/hifi 2015-02-25 17:49:02 -08:00
Stephen Birarda
f8627c8233 fix handling for vc12 externals 2015-02-25 17:48:26 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit
BUG FIX: Hang on exit
2015-02-25 17:02:26 -08:00
Virendra Singh
434c0b569f Make vhacd tool optional 2015-02-26 06:28:28 +05:30
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
ZappoMan
b03928cec7 some cleanup 2015-02-25 16:31:43 -08:00
ZappoMan
af43ba3444 used a registered quad for the audio box since its color constantly changes 2015-02-25 15:21:24 -08:00