James B. Pollack
|
369eec2abd
|
Update usertimingExample.js
|
2015-11-06 22:05:30 -08:00 |
|
James B. Pollack
|
4fbff5d667
|
Update usertimingExample.js
|
2015-11-06 21:39:53 -08:00 |
|
James B. Pollack
|
f478261ed0
|
cleanup
|
2015-11-06 16:21:53 -08:00 |
|
James B. Pollack
|
5893bfeb06
|
add user timing
|
2015-11-06 16:19:49 -08:00 |
|
Eric Levin
|
7be537c49c
|
Merge pull request #6332 from imgntn/bubblwand_links
Update Bubblewand Model References
|
2015-11-06 13:28:27 -08:00 |
|
James B. Pollack
|
1d41ef868b
|
update bubblewand model refs
|
2015-11-06 13:11:06 -08:00 |
|
Clément Brisset
|
5d80dc0c90
|
Merge pull request #6324 from sethalves/smooth-hold-action-velocity
smooth hold action velocity over 2 frames
|
2015-11-06 12:25:52 -08:00 |
|
Seth Alves
|
46b7b92b2f
|
prefix private member variables with _
|
2015-11-06 11:54:51 -08:00 |
|
Brad Davis
|
1dc392bb36
|
Merge pull request #6330 from Atlante45/master
// FIXME incredibly evil....
|
2015-11-06 11:43:33 -08:00 |
|
samcake
|
640845c944
|
Merge pull request #6328 from jherico/rec2
Add recording classes
|
2015-11-06 11:39:14 -08:00 |
|
Brad Davis
|
0bf29a441f
|
Add recording classes
|
2015-11-06 11:14:46 -08:00 |
|
Atlante45
|
e630f3072e
|
Bit of cleanup
|
2015-11-06 11:14:10 -08:00 |
|
Atlante45
|
c53c0ec53f
|
Fix double delete on shutdown
|
2015-11-06 11:13:10 -08:00 |
|
Stephen Birarda
|
ed960b02ec
|
Merge pull request #6291 from zzmp/fix/script-engine-run-bail
Bail early from ScriptEngine::run if stopped
|
2015-11-06 10:05:02 -08:00 |
|
samcake
|
63106f6991
|
Merge pull request #6322 from Atlante45/record
Recording fixes from Clement.
|
2015-11-06 09:28:58 -08:00 |
|
James B. Pollack
|
11b01b3b9d
|
Merge pull request #6307 from jherico/barney
Getting rid of HTTPS external dependencies
|
2015-11-05 20:53:43 -08:00 |
|
James B. Pollack
|
2fdc9202e4
|
Merge pull request #6313 from AlanZimmerman/playa
Created playaSpawner
|
2015-11-05 20:47:00 -08:00 |
|
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 |
|
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 |
|
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 |
|