Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 03:54:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22552 commits 71 branches 56 tags 1.2 GiB
Commit graph

22552 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Sam Gateau
f6a9bd1870 REfining the naming and introducing an orientation offset 2015-02-26 17:26:41 -08:00
Seth Alves
c80995170a -n and -t are okay together 2015-02-26 17:17:19 -08:00
Sam Gateau
e3b3c8e1ef Setting the defalt at a better time of the day 2015-02-26 16:09:21 -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
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
Seth Alves
0918d4989b mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 09:53:23 -08:00
Virendra Singh
19912930dd Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 2015-02-26 22:57:27 +05:30