Commit graph

16995 commits

Author SHA1 Message Date
Atlante45
11e60c864a Changed recording file format 2014-09-24 15:17:23 -07:00
Philip Rosedale
e485b278ef Merge pull request #3475 from Atlante45/reduce_penumbra_filter
Decreased penumbra filter values
2014-09-23 15:33:59 -07:00
Atlante45
22b39fd62a Decreased penumbra filter values 2014-09-23 15:17:46 -07:00
Clément Brisset
c535d0170d Merge pull request #3473 from AndrewMeadows/ragdoll
remove build warnings
2014-09-23 11:07:23 -07:00
Andrew Meadows
58bcb98dd6 remove virtual for ListShape::findRayIntersection() 2014-09-23 10:04:36 -07:00
Brad Hefta-Gaub
b7245f8259 Merge pull request #3469 from ctrlaltdavid/20054
Code Review for Job #20054
2014-09-23 09:57:31 -07:00
Philip Rosedale
20b123b6fd Merge pull request #3472 from birarda/move-locations
more location cleanup and options for editing and creation
2014-09-23 09:17:52 -07:00
Andrew Meadows
7dd9587d20 remove warning about hidden virtual override 2014-09-23 09:07:23 -07:00
Andrew Meadows
ab53202003 remove warning about signed/unsigned comparison 2014-09-23 09:07:05 -07:00
Stephen Birarda
7bae88e996 fix for calls to glm sqrt with ints 2014-09-23 08:52:22 -07:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00
Stephen Birarda
65a557b71a don't change the NodeList auth URL 2014-09-22 16:59:32 -07:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Philip Rosedale
4733945300 Merge pull request #3470 from ey6es/master
Fixes for billboards, Xcode warnings.
2014-09-22 16:36:49 -07:00
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
Andrzej Kapolka
e6b0dc592b Don't save the billboard. 2014-09-22 15:03:25 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
Philip Rosedale
034870e46e Merge pull request #3466 from birarda/master
use 10.8 only in deployment target, base SDK should be latest
2014-09-22 11:45:52 -07:00
AndrewMeadows
a0b458fd1d Merge pull request #3465 from chansensturm/audio-noise
New Audio Edit Buffer Object / Click Removal /  ....
2014-09-22 11:38:42 -07:00
Craig Hansen-Sturm
75858b07c6 coding standard + missing frame-offsets in audiobuffer 2014-09-22 11:21:18 -07:00
Craig Hansen-Sturm
66ec43c066 coding standard - else clause 2014-09-22 11:04:21 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
2014-09-22 10:42:25 -07:00
Stephen Birarda
84df6058cb add domainID to location scripting interface 2014-09-22 10:42:14 -07:00
Stephen Birarda
25c86af40f Merge branch 'master' into move-locations 2014-09-22 10:22:30 -07:00
Stephen Birarda
49e3f4bdb0 use 10.8 only in deployment target, base SDK should be latest 2014-09-22 09:20:34 -07:00
Brad Hefta-Gaub
631171eb2e Merge pull request #3462 from Atlante45/fix_attachment_bug_with_recording
Fixes concurrency issue with ScriptEngine timers
2014-09-21 20:48:05 -07:00
Brad Hefta-Gaub
4921ff025a Merge pull request #3464 from AndrewMeadows/ragdoll
add move.js demo MyAvatar.motorVelocity feature
2014-09-21 20:47:01 -07:00
Craig Hansen-Sturm
049810c00d Merge pull request #3454 from ZappoMan/perListenerSourcePairMixerData
Per listener source pair mixer data
2014-09-21 16:28:19 -07:00
Craig Hansen-Sturm
4372410fa7 unrolling for int16_t<->float32_t conversion/scaling and copy in/out 2014-09-20 14:49:41 -07:00
Craig Hansen-Sturm
1b2ee4023a out of line inline members for coding standard 2014-09-20 05:46:27 -07:00
Craig Hansen-Sturm
90379ee7eb frame and channel counts are now consistently uint32_t / float32_t replaces float 2014-09-20 04:50:11 -07:00
Craig Hansen-Sturm
47c6ba708f new audio edit buffer object / click removal / apply linear fade to sound clip endpoints 2014-09-20 04:45:58 -07:00
Andrew Meadows
57dd9fba28 adding move.js, removing swissArmyJetpack.js 2014-09-19 16:55:04 -07:00
Andrew Meadows
09d3c51120 add multiply(float, Vec3) because multiply commutes 2014-09-19 16:54:03 -07:00
Andrzej Kapolka
6c907a9d83 Read the emissive color property and use it to effect glow. 2014-09-19 16:49:51 -07:00
Andrzej Kapolka
9515145b9b Removed commented lines. 2014-09-19 15:48:56 -07:00
Atlante45
36a3372f58 Same fix for MyAvatar class 2014-09-19 15:47:13 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
2014-09-19 15:43:22 -07:00
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -07:00
Atlante45
3d8f3ad9fa Fixes concurrency issue with scriptengine timers 2014-09-19 13:21:24 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
446c2193ff Limit what we render for deferred point/spot lights based on the light's
radius.
2014-09-19 12:18:00 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
AndrewMeadows
76f78e77d1 Merge pull request #3461 from PhilipRosedale/master
final tweaks to movement script
2014-09-19 09:23:14 -07:00
Philip Rosedale
6c808f2979 final tweaks to movement script 2014-09-19 09:22:27 -07:00
AndrewMeadows
2a5ec89e3b Merge pull request #3460 from PhilipRosedale/master
Added JS support for neck position for headMove script
2014-09-19 09:04:12 -07:00
Philip Rosedale
c6d6c347cd head move using neck measurement for movement rather than head. 2014-09-19 08:48:55 -07:00