Seth Alves
f07d5d9d3f
show network and physics status on boxes and spheres
2015-11-11 11:32:12 -08:00
Seth Alves
31ebe5dba1
terse logging for sim ownership
2015-11-11 08:51:10 -08:00
Seth Alves
c2b0ccd6b3
show simulation ownership with status icons
2015-11-11 08:30:04 -08:00
Seth Alves
4cf84a4e5b
use makeEntityItemStatusGetters from more entity types
2015-11-10 17:14:09 -08:00
Seth Alves
7b4dd9a908
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 17:06:16 -08:00
Seth Alves
39b92d2b52
terse log when ownership changes
2015-11-10 17:06:12 -08:00
Seth Alves
66387c4530
use icons to show network and physics status
2015-11-10 17:02:57 -08:00
Seth Alves
774e2ab6d6
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:13:07 -08:00
Seth Alves
97fec5b814
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:09:53 -08:00
Seth Alves
df5d161721
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:02:17 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
Seth Alves
e067195dfe
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:42:40 -08:00
Seth Alves
82bd506086
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:32:57 -08:00
Eric Levin
a2abc11df1
Merge pull request #6351 from huffman/script-path-resolution
...
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
Seth Alves
5e4f30b2bb
improve terse entity logging. change how action data sending is triggered
2015-11-10 13:58:09 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Seth Alves
d043011a11
Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 10:16:02 -08:00
Seth Alves
8e466190e0
working toward display icons for debug/status display
2015-11-10 10:15:58 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf
attempt to fix render-collision hull feature
2015-11-10 09:49:31 -08:00
samcake
2cf2257783
Fix warning
2015-11-10 09:20:43 -08:00
samcake
d1df6854ac
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-10 09:16:28 -08:00
Brad Hefta-Gaub
0ea901fd72
fix various warnings
2015-11-10 08:34:58 -08:00
Sam Gateau
06a87012ad
Removing the setJointTranslations which is not helping...
2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2
Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays
2015-11-09 23:12:04 -08:00
samcake
77e21b7190
Trying to fix the animation recording and playback, but still not good
2015-11-09 18:18:30 -08:00
Brad Hefta-Gaub
021a6e689d
added some asserts to test future mistakes that would cause render item leaks
2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub
e47b049200
fix render item leak on Model::reset()
2015-11-09 16:41:40 -08:00
U-GAPOS\andrew
390310f822
swap the order of checks
2015-11-09 14:15:09 -08:00
U-GAPOS\andrew
c07b97920e
fix for avatars created with blender
2015-11-09 14:11:45 -08:00
U-GAPOS\andrew
2716a9f2b4
fix IK for feet targets
2015-11-09 13:11:03 -08:00
samcake
5bc827981d
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 12:32:10 -08:00
Eric Levin
7700e67734
Merge pull request #6326 from imgntn/entity_params
...
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266
Update script engine path resolution behavior
...
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
2015-11-09 12:04:17 -08:00
samcake
25d67656e9
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 11:35:43 -08:00
James B. Pollack
1812444614
Merge pull request #6278 from ericrius1/particleSorting
...
Added additiveBlending property to particle effect entity
2015-11-09 11:32:44 -08:00
Brad Davis
07be03dc7e
Bad merge fix, PR feedback
2015-11-09 09:30:18 -08:00
samcake
2078c753ae
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 09:23:59 -08:00
Brad Davis
2ecc4f8a5c
Prevent sixense manager from triggering continuous reset
2015-11-09 09:16:32 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
Clément Brisset
2c27d18922
Merge pull request #6282 from jherico/externals
...
Runtime plugins fixes
2015-11-06 19:30:40 -08:00
Brad Davis
e84f3af483
Merge pull request #6343 from Atlante45/sixense
...
Sixense cleanup
2015-11-06 17:50:12 -08:00
Atlante45
68a72b0f41
Bit of cleanup
2015-11-06 17:28:51 -08:00
samcake
cbeb56aba4
using the frameInterpolatorCOrrectly
2015-11-06 17:25:50 -08:00
Brad Davis
6122fa145d
More PR feedback
2015-11-06 17:17:26 -08:00
Atlante45
137a2c1c48
Fix file headers
2015-11-06 17:15:34 -08:00
samcake
07fb3a0532
Merge pull request #6341 from howard-stearns/for-sam
...
Make life easier for Sam.
2015-11-06 17:13:22 -08:00
Howard Stearns
314c11e8d4
Make life easier for Sam.
2015-11-06 16:59:46 -08:00
Brad Davis
37a9538f10
PR feedback, ensure destruction of shared objects
2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00