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

22819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
61bc32493f Fix entity version name in LightEntityItem 2015-02-27 13:49:17 -08:00
Ryan Huffman
20f3d23ae7 Update editEntities to use new light properties 2015-02-27 13:46:26 -08:00
Ryan Huffman
a7f84bcd30 Update entity server version number 2015-02-27 13:46:04 -08:00
Ryan Huffman
093e5db90d Update entity light properties to use new model 
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
 2015-02-27 13:42:56 -08:00
Philip Rosedale
9eee213bce Merge pull request #4353 from Atlante45/relax_face_tracker 
Relax blendshapes
 2015-02-27 13:36:22 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
David Rowe
797b1649a6 Merge branch 'master' into 20368 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-02-27 12:48:21 -08:00
Ryan Huffman
5c9473cd24 Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties 
Conflicts:
	libraries/entities-renderer/src/RenderableLightEntityItem.cpp
 2015-02-27 12:20:10 -08:00
Ryan Huffman
fdc1146339 Update RenderableLightEntityItem to use update light entity 2015-02-27 12:14:50 -08:00
Seth Alves
f54f41fcf0 fix typo 2015-02-27 11:36:45 -08:00
Philip Rosedale
7f915fbe79 Merge pull request #4354 from sethalves/assignment-client-dont-spam-log 
add suppressions for log-spam caused by idle assignment-client
 2015-02-27 11:26:29 -08:00
Seth Alves
ce3c8f87d9 Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-27 11:08:29 -08:00
Seth Alves
01cac7445a add suppressions for log-spam caused by idle assignment-client 2015-02-27 10:58:04 -08:00
Brad Hefta-Gaub
addc729654 Merge pull request #4350 from huffman/multi-select 
Multi select properties for edit entities
 2015-02-27 10:54:42 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties 
Update light properties (primarily for editEntities.js)
 2015-02-27 10:54:19 -08:00
Brad Hefta-Gaub
e78b2ced4a Merge pull request #4349 from huffman/no-nearby-entities-msg 
Add message to edit entities list for when no entities are nearby
 2015-02-27 10:53:17 -08:00
Philip Rosedale
35205fbbf3 Merge pull request #4347 from samcake/temp1 
Introducing the SunSkyStage
 2015-02-27 10:37:02 -08:00
Atlante45
fa8e1549f6 Relax blendshapes 2015-02-27 19:33:01 +01:00
Seth Alves
48322cf222 Merge branch 'domain-server-http-port-in-shmem' of github.com:sethalves/hifi into domain-server-http-port-in-shmem 2015-02-27 10:20:40 -08:00
Seth Alves
fb4f2fe89c Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-27 10:19:06 -08:00
Philip Rosedale
1663fcb489 Merge pull request #4348 from Atlante45/relax_face_tracker 
Relax face tracker
 2015-02-27 08:37:49 -08:00
Philip Rosedale
df553ac65e Merge pull request #4335 from sethalves/assignment-client-keep-a-spare-x 
Assignment client keep a spare
 2015-02-27 07:39:06 -08:00
Atlante45
db90fcdb62 Simplify expression 2015-02-27 16:09:15 +01:00
Atlante45
8615bb7cff Make relaxation go to EPSILON within TIME 2015-02-27 15:58:28 +01:00
Atlante45
9849efe013 Exponential relaxation 2015-02-27 15:33:24 +01:00
Sam Gateau
c7eeebe52c and fixing a bug with shadowing of lightmapped surface 2015-02-26 18:07:43 -08:00
Sam Gateau
74f0d98fd6 REfining the naming and introducing an orientation offset 2015-02-26 17:44:04 -08:00
Andrew Meadows
7836bb4dcd rayIntersection uses meters instead of tree units 2015-02-26 17:42:17 -08:00
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Stephen Birarda
fc2f6d47bb remove references to PrioVR in interface code 2015-02-26 17:28:00 -08:00
Sam Gateau
f6a9bd1870 REfining the naming and introducing an orientation offset 2015-02-26 17:26:41 -08:00
Stephen Birarda
38f77190eb remove PrioVR from build files 2015-02-26 17:20:45 -08:00
Stephen Birarda
e95c197756 fix header in win build guide 2015-02-26 17:17:55 -08:00
Seth Alves
c80995170a -n and -t are okay together 2015-02-26 17:17:19 -08:00
Stephen Birarda
95c25086d7 handle QTTOOLDIR env when looking for qmake 2015-02-26 16:59:37 -08:00
Stephen Birarda
eb646383e9 Revert "attempt to remove out-of-date warning for tbb" 
This reverts commit 43da329eb4.
 2015-02-26 16:21:15 -08:00
Stephen Birarda
43da329eb4 attempt to remove out-of-date warning for tbb 2015-02-26 16:14:09 -08:00
Sam Gateau
e3b3c8e1ef Setting the defalt at a better time of the day 2015-02-26 16:09:21 -08:00
Stephen Birarda
9979bbd8b5 actually link debug bullet lib for WIN32 2015-02-26 15:49:03 -08:00
Andrew Meadows
64c28fe925 remove EntityItem::getSize() 2015-02-26 15:36:59 -08:00
Andrew Meadows
7210c7a88b added EntityTree::findEntitiesInMeters() 
progress toward conversion to meters
 2015-02-26 15:16:59 -08:00
Ryan Huffman
d60618a582 Remove unused variables from RenderableLightEntityItem::render 2015-02-26 14:58:06 -08:00
Ryan Huffman
dc2b670fa8 Remove extraneous comments 2015-02-26 14:46:05 -08:00
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
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Andrew Meadows
9ad88c3793 Referentials do math using meters 2015-02-26 13:42:08 -08:00