Thijs Wenker
|
764af63ea9
|
remove Anchor entity from example and edit script, replace with invisible Box in example
|
2015-11-12 02:19:08 +01:00 |
|
Thijs Wenker
|
a58bd4ff05
|
Merge branch 'master' of https://github.com/worklist/hifi into 20724
|
2015-11-09 22:37:44 +01:00 |
|
Eric Levin
|
7700e67734
|
Merge pull request #6326 from imgntn/entity_params
Add Ability to Pass Parameters When Calling Methods on Entities
|
2015-11-09 12:17:58 -08:00 |
|
James B. Pollack
|
ef7caa8da9
|
Add new collision hull and sound to ping pong gun
|
2015-11-09 10:48:12 -08:00 |
|
Eric Levin
|
8e039fe465
|
Merge pull request #6338 from imgntn/string_polyfills
Add More Methods to stringHelpers.js
|
2015-11-09 10:25:13 -08:00 |
|
Eric Levin
|
ceba1c4b02
|
Merge pull request #6340 from imgntn/usertiming
Adapt UserTiming library and Add Example
|
2015-11-09 10:25:04 -08:00 |
|
Seth Alves
|
030bb71f19
|
Merge pull request #6337 from howard-stearns/fix-agent-avatar
fix agent avatar animation
|
2015-11-09 09:38:27 -08:00 |
|
James B. Pollack
|
bf4320e5cc
|
re-add this example
|
2015-11-06 22:55:33 -08:00 |
|
James B. Pollack
|
34d98cac5e
|
Update usertiming.js
|
2015-11-06 22:12:03 -08:00 |
|
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 |
|
Clément Brisset
|
517ef7dfc8
|
Merge pull request #6336 from ericrius1/avatarMover
Restores the avatar mover app after its loss in S3
|
2015-11-06 19:30:24 -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 |
|
James B. Pollack
|
f7d4a3821f
|
add more methods
|
2015-11-06 15:42:56 -08:00 |
|
Howard Stearns
|
619746676b
|
Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script.
|
2015-11-06 15:31:03 -08:00 |
|
ericrius1
|
c1690bcf32
|
restoring avatarMover app post S3-loss event
|
2015-11-06 15:19:14 -08:00 |
|
James B. Pollack
|
ced1a4899d
|
promises
|
2015-11-06 15:10:23 -08:00 |
|
ericrius1
|
c289474909
|
avatr mover
|
2015-11-06 14:25:01 -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 |
|
James B. Pollack
|
cf86d27417
|
cleanup headers
|
2015-11-06 11:50:34 -08:00 |
|
James B. Pollack
|
e928c8278b
|
overload a single function and cleanup, add examples
|
2015-11-06 11:48:51 -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
|
2fdc9202e4
|
Merge pull request #6313 from AlanZimmerman/playa
Created playaSpawner
|
2015-11-05 20:47:00 -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 |
|
Thijs Wenker
|
de98a17ada
|
- rename CameraEntityItem to AnchorEntityItem
|
2015-11-06 01:58:08 +01:00 |
|
Anthony Thibault
|
b6b596b8af
|
Merge pull request #6284 from howard-stearns/away
Away/Pause
|
2015-11-05 15:28:47 -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 |
|
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 |
|
Howard Stearns
|
aef8b7639d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into away
|
2015-11-05 11:58:08 -08:00 |
|
James B. Pollack
|
c898d9a474
|
set wantstrigger correctly on lightswitch
|
2015-11-05 10:48:16 -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 |
|
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 |
|
Seth Alves
|
05a977e31b
|
get rid of code that computes release velocity
|
2015-11-04 16:26:30 -08:00 |
|
Seth Alves
|
adb9118dc1
|
don't set release velocity
|
2015-11-04 16:21:02 -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 |
|
Thijs Wenker
|
ee218faf5e
|
Merge branch '20724' of github.com:thoys/hifi into 20724
|
2015-11-04 21:21:57 +01:00 |
|
Thijs Wenker
|
0ebd6e47cc
|
fix magic number
|
2015-11-04 21:21:03 +01:00 |
|
Howard Stearns
|
4fd2027fb4
|
change name
|
2015-11-04 11:42:21 -08:00 |
|
Thijs Wenker
|
128a0c2397
|
securityCamera.js - Camera Entity example
|
2015-11-04 20:23:03 +01:00 |
|
Seth Alves
|
c2f9a49598
|
don't grab light
|
2015-11-04 11:15:57 -08:00 |
|
Howard Stearns
|
3fdd7ca470
|
obscure the code and increase the likelihood of future whitespace-only diffs
|
2015-11-04 10:57:03 -08:00 |
|
Howard Stearns
|
883f9c09bf
|
add gratuitous whitespace
|
2015-11-04 10:49:12 -08:00 |
|
Howard Stearns
|
fe12891f61
|
whitespace only
|
2015-11-04 10:48:02 -08:00 |
|