Commit graph

37270 commits

Author SHA1 Message Date
Anthony J. Thibault
8f71a5fda5 ModelEntityItem: Fix for missing pre-rotations for animated models.
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
2015-12-30 10:17:18 -08:00
Brad Davis
d6f5296c3b Working on event bridge and scripting interfaces 2015-12-30 09:14:50 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Brad Davis
07531353e4 Allow a script to set a resource override. 2015-12-30 09:06:04 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown
Don't send a domain-server check in when shutting down
2015-12-30 08:43:19 -08:00
Andrew Meadows
b83987331b Merge pull request #6725 from huffman/fix-avatar-get-myavatar
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin
Support for Perception Neuron
2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -08:00
Brad Davis
65862bfd02 Merge pull request #6747 from hyperlogic/tony/glmhelpers-tests
Added tests for GLMHelpers::safeEulerAngles.
2015-12-30 11:35:17 -05:00
Philip Rosedale
118f919c8b fix merge conflicts 2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00
Philip Rosedale
54edd94dd2 Merge pull request #6743 from zzmp/fix/skymap-tex-load
Guard against unloaded skymap tex
2015-12-29 21:34:48 -08:00
Philip Rosedale
a44a64d9c0 Merge pull request #6748 from ericrius1/gunFix
Fixing issue with muzzle flash and hit sparks being out of sync for pi…
2015-12-29 21:31:40 -08:00
James B. Pollack
5caa6cbdbf Update pistol.js
leading zeroes
2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba muzzle is in sync 2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0 Fixing issue with muzzle flash and hit point being out of sync for pistol 2015-12-29 18:13:34 -08:00
Anthony J. Thibault
feb63772f3 ThreadSafeValueCache added class and method descriptions
Also, changed callback prototype.
2015-12-29 17:08:17 -08:00
Anthony J. Thibault
17e6a04aa8 Renamed ThreadSafeValue to ThreadSafeValueCache
Also bug fixes where I was incorrectly swapping left and right hands.
2015-12-29 16:35:31 -08:00
Anthony J. Thibault
e7f3f549a5 Avatar getPalm* methods are thread-safe and non-blocking
Uses newly added ThreadSafeValue template class.
2015-12-29 15:10:38 -08:00
Anthony J. Thibault
e67fdf1c04 Merge branch 'master' into tony/get-palm-thread-safe 2015-12-29 14:08:55 -08:00
Anthony J. Thibault
f4f4bd44cb SoftAttachmentModel: added a descriptive comment. 2015-12-29 13:28:04 -08:00
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
Eric Levin
f71a4807f7 Merge pull request #6667 from imgntn/light_mod
Entity Sliders for Changing Spotlight Properties
2015-12-29 10:58:47 -08:00
Zach Pomerantz
12fa223004 Render SKY_DOME when SKY_MAP tex is loading 2015-12-29 10:58:23 -08:00
Anthony J. Thibault
5d596bcbc4 Added tests for GLMHelpers::safeEulerAngles.
To verify that converting to and from quats and eulers will use the same angle order.

Also I fixed some naming inconsistencies in GeometryUtilTests.
2015-12-29 10:07:38 -08:00
Anthony J. Thibault
e10cecd310 Build fix for linux #2? 2015-12-29 09:23:03 -08:00
Anthony J. Thibault
c35995b8e3 Build fix for linux? 2015-12-29 08:51:44 -08:00
James B. Pollack
a2d21ed5cb Update doppelganger.js
delete correct id
2015-12-28 21:42:54 -08:00
James B. Pollack
74badfb667 Update masterReset.js
leading zeroes
2015-12-28 21:16:38 -08:00
James B. Pollack
79a60c0648 Update hiddenEntityReset.js
leading zeroes
2015-12-28 21:16:15 -08:00
James B. Pollack
3a6478aac1 Update raveStick.js
leading zeroes
2015-12-28 21:15:52 -08:00
Anthony J. Thibault
7e514d2f4d Mac build fix 2015-12-28 18:42:03 -08:00
James B. Pollack
bf296a36ed cleanup change model 2015-12-28 18:38:09 -08:00
James B. Pollack
d8ef19a019 working!! 2015-12-28 18:32:49 -08:00
Anthony J. Thibault
4661152aa7 NeuronAvatar.js: Now aligns the head with the HMD if active 2015-12-28 17:57:24 -08:00
ericrius1
cc35eaf4be Added glow effect to ravestick 2015-12-28 17:32:10 -08:00
Eric Levin
034b28e1b3 Merge pull request #6742 from zzmp/fix/empty-poly-line
Guard against empty polyline index out of range
2015-12-28 17:30:27 -08:00
James B. Pollack
93a81315f2 Merge branch 'master' into doppelganger 2015-12-28 16:43:28 -08:00
James B. Pollack
2ec712a5db disable near grabbing on sliders 2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0 clear sliders at cleanup 2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce readme 2015-12-28 15:14:59 -08:00
James B. Pollack
5786789a66 cleanup cleanup 2015-12-28 15:12:29 -08:00
Zach Pomerantz
bea18e91aa Guard against empty polyline index out of range 2015-12-28 15:09:49 -08:00
Philip Rosedale
36beea17fa Improved hand controller reticle movement 2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251 switch 2015-12-28 14:50:35 -08:00
James B. Pollack
d4fd59edc0 send blacklist messages 2015-12-28 13:49:00 -08:00
Eric Levin
890b39f04b Merge pull request #6740 from imgntn/blacklist_grab
Add Raypick Blacklisting to handControllerGrab.js
2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07 mege 2015-12-28 13:21:00 -08:00
James B. Pollack
5e6e2bd11c work 2015-12-28 13:06:43 -08:00