Howard Stearns
26f63a44fc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 15:30:22 -07:00
Eric Levin
69612551e2
Merge pull request #5739 from ctrlaltdavid/20669
...
CR for 20669 - Add additional particle properties controlling size, colour, and opacity
2015-09-08 14:51:54 -07:00
Howard Stearns
27f4bca0a4
Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread!
...
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
2015-09-08 14:49:58 -07:00
James B. Pollack
4d907aa53b
Merge pull request #5726 from SeijiEmery/jsbenchmarks
...
Javascript benchmarking
2015-09-08 14:24:30 -07:00
James B. Pollack
11f53708e0
Merge pull request #5738 from ZappoMan/boombox
...
added an example script that detects being touched by avatars hand
2015-09-08 14:12:23 -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
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
Brad Hefta-Gaub
ed546885af
Merge pull request #5730 from jherico/marge
...
Procedural shaders V2
2015-09-08 09:16:35 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
Howard Stearns
d472fd66ff
Cleanup.
2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305
Checkpoint smoother.
2015-09-07 16:32:51 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
Howard Stearns
0065c64b31
Snapshot of no-judder, before cleanup.
2015-09-07 09:57:05 -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
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
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
Seth Alves
66bd59b142
Merge pull request #5722 from ZappoMan/fixPPSError
...
fix a bug in bad PPS calculation
2015-09-04 15:29:20 -07:00
Brad Hefta-Gaub
b63e15f2e9
fix a bug in bad PPS calculation
2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1
Avatar animations on by default. (Using the now old animation machinery.)
...
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
2015-09-04 14:24:37 -07:00
Seth Alves
e0840b79ef
Merge pull request #5720 from ZappoMan/fixHoldAction
...
fix hold action with zero offsetLength
2015-09-04 14:19:13 -07:00
Brad Hefta-Gaub
21afafd4e6
fix hold action with zero offsetLength
2015-09-04 14:07:12 -07:00
David Rowe
e86581ab64
Update scripts to use HiFi smoke particle
2015-09-04 13:51:25 -07:00
