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
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
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
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
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
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
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
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
Seth Alves
7d2bdb3689
Merge pull request #5719 from ericrius1/spraypaint
...
added spraypaint-can entity script
2015-09-04 11:27:52 -07:00
Howard Stearns
d623ba3ef2
Merge pull request #5700 from hyperlogic/ajt/new-anim-system
...
New Animation System
2015-09-04 11:24:31 -07:00
Anthony J. Thibault
5882ec02d0
Merge branch 'master' into ajt/new-anim-system
2015-09-04 11:05:29 -07:00
Anthony J. Thibault
3f258c89b4
Fix transition from AG+Rig to AG only.
2015-09-04 11:03:59 -07:00
ericrius1
f48cfa1208
added spawner script for spray paint toy
2015-09-04 10:36:14 -07:00
Andrew Meadows
5d40517edd
Merge pull request #5706 from sethalves/polyvox-again
...
Polyvox improvements
2015-09-04 10:32:36 -07:00
ericrius1
878d42a8d0
added spraypaint can entity script
2015-09-04 10:30:12 -07:00
Brad Hefta-Gaub
143376f501
Merge pull request #5718 from jherico/homer
...
Magballs: Cleaning up some debugging spew and fixing UI HTML paths
2015-09-04 10:01:01 -07:00
Brad Davis
80f2ecbab6
Cleaning up some debugging spew and fixing UI HTML paths
2015-09-04 09:59:42 -07:00
Brad Davis
3573fe8d11
Merge pull request #5717 from ZappoMan/breakDanceEntityScript
...
add breakdance game as entity script that works with hydra grab
2015-09-04 09:49:54 -07:00
Seth Alves
1b92ae95d7
put glm:: before vec3
2015-09-04 09:41:53 -07:00
Brad Hefta-Gaub
895028134b
add breakdance game as entity script that works with hydra grab
2015-09-04 09:40:09 -07:00
Seth Alves
8c3bea6d0d
Merge pull request #5713 from AndrewMeadows/flerovium
...
fix collision shape of avatars
2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Seth Alves
72322c0270
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-04 09:12:32 -07:00
Brad Hefta-Gaub
762bed8223
Merge pull request #5715 from jherico/apu
...
Fix mirror to display on Oculus
2015-09-04 09:06:40 -07:00
Brad Hefta-Gaub
20bd14c8db
Merge pull request #5684 from rabedik/fxaa
...
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
2eb3d90ac2
Merge pull request #5708 from howard-stearns/new-default-avatar-collision-sound
...
Change default avatar collision sound
2015-09-04 08:48:30 -07:00
Brad Hefta-Gaub
127271110c
Merge pull request #5714 from jherico/lisa
...
Magballs polish
2015-09-04 08:48:15 -07:00
Leonardo Murillo
b836abd246
Merge pull request #5716 from murillodigital/master
...
Including Visual Studio 2010 Redistributable in installer
2015-09-04 09:30:36 -06:00
Leonardo Murillo
2f2558724f
Including Visual Studio 2010 Redistributable in installer
2015-09-04 09:28:28 -06:00
Seth Alves
fff3da0cc3
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-04 07:17:01 -07:00
