Seth Alves
30be515a94
remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity
2015-06-27 08:53:27 -07:00
Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
Seth Alves
9f6ec4120d
undo previous experiment
2015-06-26 18:43:56 -07:00
Seth Alves
0739c46249
if new action data is the same as the old action data, don't re-unpack it
2015-06-26 18:13:53 -07:00
Brad Hefta-Gaub
fbf2f51ded
Merge pull request #5224 from sethalves/fix-nan-in-vec3
...
don't try to convert a vec3 containing NaN to a script value
2015-06-26 17:55:38 -07:00
Seth Alves
0f3ac976c3
don't try to convert a vec3 containing NaN to a script value
2015-06-26 17:53:28 -07:00
Stephen Birarda
8fd309027f
add a forced failover for hanging STUN dns lookup
2015-06-26 17:35:14 -07:00
Brad Davis
84505c49c4
Merge pull request #5213 from birarda/hyperlink-photo
...
add photo replacement for hyperlinked places
2015-06-26 17:05:33 -07:00
Seth Alves
5e65972265
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 16:55:34 -07:00
Seth Alves
1326791502
add sanity check to PhysicalEntitySimulation::addAction
2015-06-26 16:55:16 -07:00
Seth Alves
31a3ca641d
clean up left-over action if it's re-added
2015-06-26 16:54:46 -07:00
Seth Alves
300d35219d
move functions our of header to cpp file
2015-06-26 16:54:01 -07:00
Seth Alves
b4537b081f
fix clearActions
2015-06-26 16:02:47 -07:00
ZappoMan
f61581d29d
possible fix for deadlock
2015-06-26 15:42:04 -07:00
Seth Alves
70aa762f61
merge from upstream
2015-06-26 15:34:10 -07:00
Stephen Birarda
ff33922716
handle conflicts on merge with upstream master
2015-06-26 15:33:35 -07:00
ZappoMan
ccbc048f64
repair bad ordering of PROP_SCRIPT_TIMESTAMP
2015-06-26 14:59:40 -07:00
Stephen Birarda
9b84eabd18
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c
merge from master
2015-06-26 14:29:40 -07:00
Stephen Birarda
a0df52e860
add note for UI link
2015-06-26 14:17:54 -07:00
Stephen Birarda
7e19a540fd
add the new placeholder image
2015-06-26 14:13:23 -07:00
Stephen Birarda
18e2b62ecc
initial image replacement for hyperlink preview
2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
9e8113a63c
bump protocol version
2015-06-26 12:36:10 -07:00
Seth Alves
005bd8bda5
merge from upstream
2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229
Merge pull request #5210 from bwent/faceCameraProp
...
Added faceCamera property for text entities
2015-06-26 12:29:25 -07:00
Seth Alves
d09588b7fa
put upper bound on size of serilized action parameters so they'll fit in MTU
2015-06-26 12:11:34 -07:00
Seth Alves
6a39aecdd4
back out mistaken commit
2015-06-26 12:11:03 -07:00
Seth Alves
798c9492d3
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 11:47:21 -07:00
Stephen Birarda
522b715628
remove comment, styling cleanup
2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Brad Davis
8dcd91fdab
Merge pull request #5192 from venkatn93/master
...
Hyperlink tooltip and address bar remodel
2015-06-26 10:28:52 -07:00
Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c
Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire
2015-06-26 07:20:51 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
bwent
aa865680ab
Added faceCamera property to Text Entities
...
…and removed from base
2015-06-25 15:38:38 -07:00
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
Brad Hefta-Gaub
6c4a4866d3
Merge pull request #5202 from Atlante45/overlay
...
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Clément Brisset
e05b4e3115
Merge pull request #5203 from howard-stearns/set-injector-options-from-script
...
Set injector options from script
2015-06-24 16:54:11 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Atlante45
85b2771c4a
Extend Extents
2015-06-24 15:44:48 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
bwent
0516caaa32
Added CHECK_PROPERTY_CHANGE macro
2015-06-24 14:58:33 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Howard Stearns
3b8a46b87d
Allow scripted audio injectors to have options set.
2015-06-23 21:01:34 -07:00
