James B. Pollack
5713f19fa4
Merge pull request #6327 from AlessandroSigna/branchJS
...
Examples of the new input mapping system
2015-11-05 20:06:16 -08:00
AlessandroSigna
715b183a3c
unified two ways to do the mapping in a single JS
2015-11-05 19:10:06 -08:00
AlessandroSigna
f9ebbea585
Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS
2015-11-05 19:09:49 -08:00
AlessandroSigna
c6b42f5fbc
Added a second way to create mapping
2015-11-05 18:48:24 -08:00
AlessandroSigna
60cb736a48
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-05 18:47:36 -08:00
AlessandroSigna
23496617c1
Merge branch 'master' of https://github.com/AlessandroSigna/hifi
2015-11-05 17:13:02 -08:00
Atlante45
dbe25651cf
constify audio client loop
2015-11-05 16:57:51 -08:00
Atlante45
6c35ae48b0
Don't allocate big samples array in tight loop
2015-11-05 16:52:38 -08:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
Stephen Birarda
5bc5b3ce62
Merge pull request #6325 from howard-stearns/agent-avatar-sequenceNumber
...
Agent avatar sequenceNumber
2015-11-05 16:21:15 -08:00
Howard Stearns
aa1289bd7c
Update agent's outgoing avatar data packet with sequenceNumber as is now used in interface's MyAvatar.
2015-11-05 15:53:46 -08:00
Anthony Thibault
b6b596b8af
Merge pull request #6284 from howard-stearns/away
...
Away/Pause
2015-11-05 15:28:47 -08:00
Seth Alves
28d4d29bb6
smooth hold action velocity over 2 frames
2015-11-05 15:07:00 -08:00
Seth Alves
29ce1d50ae
Merge pull request #6323 from ericrius1/eraseBoardFix
...
Fixed bug where eraser wouldn't erase
2015-11-05 14:25:10 -08:00
ericrius1
f8de01a856
Fixed bug where eraser wouldn't erase
2015-11-05 14:14:49 -08:00
Atlante45
07b3597ae3
Fix recording scripts
2015-11-05 14:01:37 -08:00
Ryan Downe Karpf
c6c578e48c
Merge pull request #6321 from sethalves/fix-whiteboard
...
whiteboard fixes
2015-11-05 13:28:21 -08:00
Seth Alves
c4194f2359
don't try to grab polylines. set wantTrigger on various whiteboard parts
2015-11-05 13:26:23 -08:00
Howard Stearns
8f65ee87bc
Clean up script, go away when putting HMD (not just on startup), and clear stopper properly.
2015-11-05 13:19:29 -08:00
James B. Pollack
f83c0e7db7
Merge pull request #6310 from imgntn/build_text_edits
...
Update OpenSSL Binaries Link in Build docs
2015-11-05 12:56:22 -08:00
Anthony J. Thibault
20d95080f1
IK fix for avatars exported from Blender
...
This should fix the issue with the hips moving erratically when arm IK
is enabled. The main issue is that the IK system assumed that the "Hips"
joint was the root of the skeleton. For Blender avatar this is not the case
as it inserts an "Armature" node at the root instead.
2015-11-05 12:03:45 -08:00
Howard Stearns
aef8b7639d
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-05 11:58:08 -08:00
Howard Stearns
673de7f3e6
Merge pull request #6308 from hyperlogic/tony/mac-fixes
...
Fixes for Mac build and crash on startup
2015-11-05 11:52:52 -08:00
Anthony J. Thibault
50370479e4
Application.h: coding standard fixes
2015-11-05 11:03:32 -08:00
Anthony J. Thibault
50e8f49f52
SpacemouseManager Moved stub init into cpp file.
...
This should fix the windows build. For some reason
the linker was having a problem resolving this.
2015-11-05 10:56:24 -08:00
Seth Alves
669609d310
Merge pull request #6319 from imgntn/quickgrabfix
...
Set wantsTrigger correctly on lightswitch.js
2015-11-05 10:52:18 -08:00
James B. Pollack
c898d9a474
set wantstrigger correctly on lightswitch
2015-11-05 10:48:16 -08:00
Ryan Downe Karpf
ce80b2d7e5
Merge pull request #6318 from sethalves/non-colliding-to-trigger
...
grab changes
2015-11-05 10:43:23 -08:00
Seth Alves
4a3b434fd4
change grabbing-non-colliding to trigger. fix whiteboard and some other scripts
2015-11-05 10:35:02 -08:00
Anthony J. Thibault
2318e48fa8
AvatarRig: fix for crash when index was -1
2015-11-05 09:43:41 -08:00
Anthony J. Thibault
8d16f60b15
Removed hardcoded define HAVE_3DCONNEXIONCLIENT
...
This should be set from cmake, right?
2015-11-05 09:02:39 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
dba6031703
Merge pull request #6311 from jherico/marge
...
Fix crash in Oculus simulator
2015-11-05 00:57:05 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
AlessandroSigna
eac73671e0
Added some documentation and examples for the new mapping system
2015-11-04 17:40:35 -08:00
Philip Rosedale
8dc3d62d17
Merge pull request #6316 from sethalves/grab-release-velocity-experiment
...
don't set release velocity
2015-11-04 16:37:04 -08:00
Seth Alves
05a977e31b
get rid of code that computes release velocity
2015-11-04 16:26:30 -08:00
samcake
8dd8793fc0
Merge pull request #6315 from jherico/rec1
...
Creating recording library
2015-11-04 16:24:23 -08:00
Seth Alves
adb9118dc1
don't set release velocity
2015-11-04 16:21:02 -08:00
Brad Davis
69d29bbbbb
Creating recording library
2015-11-04 16:18:55 -08:00
Brad Davis
067a058799
Merge pull request #6312 from sethalves/dont-grab-zones
...
don't attempt to grab particles or zones
2015-11-04 16:03:05 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81
Added #else branch to #if 0
2015-11-04 15:10:23 -08:00
Alan Z
8b20a3c903
Created playaSpawner and fixed cleanup issue
2015-11-04 14:41:11 -08:00
Seth Alves
1cbe6c4463
don't attempt to grab particles or zones
2015-11-04 13:59:37 -08:00
Brad Davis
4dec31d524
Fix crash in Oculus simulator
2015-11-04 13:20:47 -08:00
James B. Pollack
6cfc0b9487
update openssl binaries link
2015-11-04 13:07:38 -08:00
Anthony J. Thibault
69f1cfbcb9
Fixes for Mac build and crash on startup
...
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.
In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized. To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
2015-11-04 12:04:34 -08:00
Brad Davis
017cb2cb6c
Getting rid of HTTPS external dependencies
2015-11-04 11:53:42 -08:00
