Stephen Birarda
b8ac2ff48e
Merge branch 'protocol' of github.com:birarda/hifi into protocol
2015-09-08 13:43:51 -07:00
Stephen Birarda
e0a8469354
fix for sequence point warning
2015-09-08 13:42:52 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
David Rowe
99c1e06201
Code tidying
2015-09-08 13:25:15 -07:00
Brad Hefta-Gaub
57c27f7049
added an example script that detects being touched by avatars hand
2015-09-08 13:06:20 -07:00
ericrius1
7133fc94f5
hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey
2015-09-08 12:54:02 -07:00
Brad Hefta-Gaub
781f19c9e3
position the puppet on level of nearby table
2015-09-08 12:27:24 -07:00
Anthony J. Thibault
c728cd4c4c
Fix for RenderableParticleffectEntityItem assert.
...
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0]. In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here. So, let's be safe and early
return when the number of particles is 0.
2015-09-08 12:03:41 -07:00
Stephen Birarda
9a8bd607b5
Merge pull request #5729 from rudi-c/build_docs_and_fixes
...
Build docs and dependency fixes
2015-09-08 11:29:15 -07:00
David Rowe
cdd5e68815
Add colorStart and colorFinish entity particle properties
2015-09-08 11:28:53 -07:00
Anthony J. Thibault
6d5927c0c9
Now with less copies.
...
* AnimSkeleton now returns AnimPoses by const ref.
* AnimDebugDraw: uses references to Poses on the stack instead of copies
within inner loops.
* AnimDebugDraw: Removed unnecessary universal refs in range based for loops.
2015-09-08 10:51:23 -07:00
Stephen Birarda
b3f1b1a8e1
Merge pull request #52 from huffman/byte-range-comment
...
Add comment about byte range for ATP get asset request
2015-09-08 09:53:49 -07:00
Ryan Huffman
8fffb77f13
Add comment about byte range for ATP get asset request
2015-09-08 09:53:02 -07:00
Brad Hefta-Gaub
ed546885af
Merge pull request #5730 from jherico/marge
...
Procedural shaders V2
2015-09-08 09:16:35 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Stephen Birarda
b2778bff09
fix a bad replacement for AC server hostname
2015-09-08 08:30:16 -07:00
Stephen Birarda
c49088846f
add an alias for AvatarDataSequenceNumber
2015-09-08 08:26:14 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
James B. Pollack
670c5ee484
Merge pull request #5723 from jherico/lisa
...
Toggle mute while holding the hydras
2015-09-06 21:45:47 -07:00
Rudi Chen
b703ce01fb
Make sure libdl is linked after libcrypto.
...
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
2015-09-06 21:42:02 -04:00
Rudi Chen
f2fdb97f16
Add additional linux dependencies.
...
It is a dependency of libjack-dev but without manually specifying it,
I would get the error message (on Linux Mint 17.2):
```
The following packages have unmet dependencies:
libjack-dev : Depends: libjack0 (=
1:0.121.3+20120418git75e3e20b-2.1ubuntu1) but it is not going to be
installed
```
libudev-dev is used in linking the interface executable.
2015-09-06 21:41:36 -04:00
Rudi Chen
fe13d59146
Troubleshooting tip for repeated build failures with cmake.
2015-09-06 21:40:31 -04:00
Brad Hefta-Gaub
34c41c6682
Merge pull request #5728 from ctrlaltdavid/misc
...
Miscellaneous code tidying
2015-09-06 17:40:29 -07:00
David Rowe
6923e3ce70
Fix logging of intentionally crashing Interface
2015-09-06 16:28:55 -07:00
David Rowe
16346dd717
Fix some build warnings
2015-09-06 16:20:46 -07:00
Brad Hefta-Gaub
ebeedb5cde
work on moving dancers to center of table if it's present
2015-09-05 22:05:53 -07:00
David Rowe
47b27a3280
Add alphaStart and alphaFinish entity particle properties
2015-09-05 16:30:01 -07:00
David Rowe
042384b5b0
Tidy and finish alpha and alphaSpread
2015-09-05 14:51:48 -07:00
David Rowe
1b3d125cb3
Add alphaSpread entity particle property
2015-09-05 14:39:10 -07:00
Brad Hefta-Gaub
1df3a8f814
Merge pull request #5727 from jherico/marge
...
Procedural rendering for box & sphere entities
2015-09-05 12:43:21 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
d8e5945d14
Removing procedural edit work in progress for now
2015-09-05 12:17:36 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
8b296f53e6
Short-circuit radius values and interpolation when can
2015-09-05 11:13:48 -07:00
David Rowe
8d85309925
Use cubic interpolation instead of cosine
2015-09-05 10:50:05 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
Brad Hefta-Gaub
50e6d2f769
Merge pull request #5712 from highfidelity/bubblewand
...
wand.js + bubble.js = bubblewand
2015-09-04 20:07:22 -07:00
Brad Hefta-Gaub
7b4e69a92d
Merge pull request #5698 from Nex-Pro/20657
...
CR for Job #20657 - Entities list trouble past 100 entities
2015-09-04 20:06:33 -07:00
James B. Pollack
ec06c2ff4a
Merge pull request #5725 from ZappoMan/breakdanceToy
...
have breakdance entity script use the model and location of the entity
2015-09-04 19:27:15 -07:00
Seiji Emery
68a4f4ac5e
Added js benchmark scripts
...
Adds a small declarative benchmarking library and some sample tests to
examples/utils/tests.
2015-09-04 17:36:09 -07:00
Anthony Thibault
083c5b6738
Merge pull request #5721 from howard-stearns/default-avatar-for-animations
...
avatar animation defaults
2015-09-04 17:06:53 -07:00
Brad Hefta-Gaub
10585a1b30
have breakdance entity script use the model and location of the entity
2015-09-04 16:20:12 -07:00
Brad Davis
644e81e20b
Toggle mute while holding the hydras
2015-09-04 16:19:58 -07:00
Anthony J. Thibault
bb5d061d78
linux and mac compile fixes.
...
Removed "friend MyAvatar" from Rig and JointState.
This was only there for debugging, but I accidentally committed it.
2015-09-04 16:17:35 -07:00
Anthony J. Thibault
69e463bbfd
AnimDebugDraw Improvements
...
* Now always works, regardless of whether or not Rig or AnimGraph animations
are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
2015-09-04 16:01:05 -07:00
James Pollack
5684e13400
updates for cleaner PR
2015-09-04 15:49:12 -07:00
David Rowe
c9cf426dba
Fix EntityPropertyList merge
2015-09-04 15:31:21 -07:00
