Commit graph

4086 commits

Author SHA1 Message Date
James Pollack
55f797838f remove unused key 2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea use constants 2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc update name of function 2015-11-28 22:55:44 -08:00
James Pollack
8f51ee6f58 rename hand disabler 2015-11-28 22:29:12 -08:00
James B. Pollack
9ec2a01475 isolate grab script changes from bow branch 2015-11-27 12:13:53 -08:00
Clément Brisset
5ff482071e Merge pull request #6465 from ericrius1/polyLineFix
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Andrew Meadows
bc20b72645 Merge pull request #6453 from howard-stearns/avatar-render-controller2
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
AlessandroSigna
cb0b5b5d02 added prompt 2015-11-24 18:31:41 -08:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
Brad Hefta-Gaub
1d8e2edafb Merge pull request #6464 from ericrius1/whiteboardFix
updated whiteboard to use new controller approach
2015-11-23 19:44:28 -08:00
AlessandroSigna
70cf5c6726 fixed icon position 2015-11-23 17:59:31 -08:00
AlessandroSigna
489cde7269 removed the local save of the recording 2015-11-23 17:51:58 -08:00
Eric Levin
40be9ae121 Commented out whiteboard cleanup 2015-11-23 17:15:26 -08:00
AlessandroSigna
44c95c13fb further UI fixes 2015-11-23 16:57:24 -08:00
AlessandroSigna
8f1ce6e1fb overlay added - waiting for official logos
missing null assignment
2015-11-23 14:52:16 -08:00
ericrius1
1409ed2d18 moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes 2015-11-23 12:28:44 -08:00
Eric Levin
7e8b692499 Update whiteboardEntityScript.js
Removed logging
2015-11-23 12:04:13 -08:00
ericrius1
08a64f6a6b updated whiteboard to use new controller approach' 2015-11-23 10:08:23 -08:00
AlessandroSigna
05d311cff3 remove Windows.prompt cause of crash 2015-11-20 18:58:49 -08:00
AlessandroSigna
a1053ee5a0 pop up a prompt with url 2015-11-20 18:58:47 -08:00
AlessandroSigna
7069f7d6ab added clip load to asset + clean code 2015-11-20 18:58:46 -08:00
AlessandroSigna
a306e8d5b1 master can upload performance file on asset 2015-11-20 18:58:45 -08:00
samcake
6e9e53bd0c Clean up a bit of the playbackAgent script 2015-11-20 18:17:53 -08:00
samcake
5d17fa0b34 Merge pull request #6458 from ZappoMan/acPlayback
allow playbackAgents to auto-register
2015-11-20 16:25:02 -08:00
Philip Rosedale
ba0f30a487 Merge pull request #6457 from imgntn/damping
Rename linearDamping to damping in scripts
2015-11-20 16:08:16 -08:00
Brad Hefta-Gaub
985fcf7c4b remove unneeded example 2015-11-20 16:02:01 -08:00
Brad Hefta-Gaub
f56d2fba7f allow playbackAgents to auto-register 2015-11-20 16:00:43 -08:00
EdgarPironti
46bb45cee9 Agents/Master upgrading 2015-11-20 15:51:16 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
Howard Stearns
a43b0e0ed8 Remove obsolete script (superseed by animatedAvatarAgent.js), per https://app.asana.com/0/26225263936266/55964805077915/f
(This PR does _not_ remove proceduralAnimationAPI.js that it includes, as the api is included in other scripts. Nor does this PR remove other scripts.)
2015-11-20 15:03:31 -08:00
Brad Hefta-Gaub
75dfef067c test script 2015-11-20 14:40:27 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture
Add texture property to polyline entity type
2015-11-20 13:31:34 -08:00
Clément Brisset
c45fe5caae Merge pull request #6440 from cozza13/20741
CR for Job #20741 - Change default
2015-11-20 11:43:57 -08:00
EdgarPironti
e267926725 JSON computing 2015-11-19 20:04:04 -08:00
EdgarPironti
d75209cb37 Fixes to clip_url overwriting 2015-11-19 20:04:03 -08:00
EdgarPironti
fb90ffec5c Migration of AC playback 2015-11-19 20:04:03 -08:00
Brad Hefta-Gaub
e6db72c887 Merge pull request #6437 from imgntn/grasp_equip
Grasp hands when equipping entities
2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub
a59dc6a423 Merge pull request #6419 from imgntn/betterbubbles
Improvments to Bubblewand
2015-11-19 18:26:59 -08:00
Brad Hefta-Gaub
ce9c3f1969 Merge pull request #6433 from AlessandroSigna/groupRecording
cleanup directory + recording bug fix
2015-11-19 18:26:33 -08:00
Chris Collins
7f8274f58f removed omnitool
removed omnitool
2015-11-19 18:08:12 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
James B. Pollack
6f76f0cbc0 release grasp at cleanup 2015-11-19 16:22:54 -08:00
James B. Pollack
3f89d73fc6 add grasp to equip and example 2015-11-19 16:15:34 -08:00
Ryan Huffman
b122dad7ea Add begin and middle textures to InfiniteLine 2015-11-19 15:16:23 -08:00
Seth Alves
2c1ca526df Merge pull request #6423 from ZappoMan/messaging
add an example of an entityScript that subscribes to messages
2015-11-19 10:32:36 -08:00
AlessandroSigna
b4f9c4158f cleanup directory + bug fix 2015-11-19 09:45:28 -08:00
Brad Hefta-Gaub
45e8ebbe8c Merge pull request #6432 from huffman/lod-range
Increase available range in LOD Tools
2015-11-19 09:40:10 -08:00
Ryan Huffman
f523cad0a9 Add lodTest.js for testing LOD settings 2015-11-19 09:24:29 -08:00
Howard Stearns
0a8fd9cbad Spread avatars around (not up to) a larger area. 2015-11-19 09:22:41 -08:00