Commit graph

42808 commits

Author SHA1 Message Date
James B. Pollack
afb2342781 Merge remote-tracking branch 'upstream/master' into defaultScripts 2016-04-26 16:16:56 -07:00
James B. Pollack
37fa703279 use system path instead of default for loading scripts 2016-04-26 15:50:45 -07:00
James B. Pollack
cd59c462d1 users and voxel fixes 2016-04-26 15:34:24 -07:00
James B. Pollack
db197b5014 fix users 2016-04-26 14:50:19 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00
James B. Pollack
251769a0b9 put toolbar.js at latest 2016-04-26 14:35:39 -07:00
James B. Pollack
5cb88b957c update paths for users and voxels 2016-04-26 14:35:24 -07:00
James B. Pollack
2f069b4051 sort out voxel pics 2016-04-26 14:09:22 -07:00
James B. Pollack
8d506f6242 new voxel pic 2016-04-26 14:04:57 -07:00
James B. Pollack
db00df8020 update butterflies url to production 2016-04-26 13:26:34 -07:00
James B. Pollack
4431d869e7 move butterflies.js to tutorials at freidricas request 2016-04-26 13:25:43 -07:00
James B. Pollack
927ac60a8c add images for voxels 2016-04-26 13:24:22 -07:00
Andrew Meadows
e158ea9d92 update asset urls in users.js 2016-04-26 11:41:39 -07:00
Andrew Meadows
e87b06657c remove whitespace and fix formatting 2016-04-26 11:24:38 -07:00
Andrew Meadows
e436c355a1 get viewport dimensions from controller 2016-04-26 11:23:29 -07:00
Andrew Meadows
8a02a585f2 use array of colors 2016-04-26 11:23:05 -07:00
Andrew Meadows
6e28538063 support toggling locked and visible properties 2016-04-26 11:22:45 -07:00
Andrew Meadows
39a1b9e75d update script/tutorials 2016-04-26 11:21:56 -07:00
Andrew Meadows
3a9cde8510 use local paths rather than remote URLs 2016-04-26 11:21:11 -07:00
Andrew Meadows
3d1abf8fb1 use the new JS script location 2016-04-26 11:20:08 -07:00
Andrew Meadows
c0b446ca4b archive remaining JS scripts 2016-04-26 11:18:22 -07:00
Andrew Meadows
9556995f2f move users.js and voxels.js 2016-04-26 11:15:21 -07:00
Brad Hefta-Gaub
28b5ef63b8 Merge pull request #7748 from ctrlaltdavid/20890
Position default toolbar buttons bottom center of screen
2016-04-26 10:18:40 -07:00
Brad Hefta-Gaub
cf49ba26ad Merge pull request #7760 from hyperlogic/tony/away-reset-avatar
Reset avatar on exit of away-mode.
2016-04-26 09:51:47 -07:00
Brad Hefta-Gaub
03321e1fca Merge pull request #7753 from thoys/planky-settings-fix
Fix for Planky Settings window
2016-04-26 09:51:21 -07:00
Brad Hefta-Gaub
c6be616401 Merge pull request #7758 from sethalves/fix-crash-in-model-loading
fix a crash in RenderableModelEntityItem::getModel
2016-04-25 23:50:04 -07:00
Andrew Meadows
50117e2ff4 add some new tutorial JS files 2016-04-25 17:53:10 -07:00
Andrew Meadows
3a2cb37ce2 move and rename some JS files 2016-04-25 17:50:35 -07:00
Andrew Meadows
e32fface93 add some local assets 2016-04-25 17:46:02 -07:00
Andrew Meadows
4630bdea58 move from examples/ to scripts/templates/ 2016-04-25 17:38:34 -07:00
Andrew Meadows
3f5a5a831e move examples/toybox to unpublishedScripts/DomainContent/Toybox/ 2016-04-25 17:37:40 -07:00
Andrew Meadows
0cc12fdaa6 move from examples/ to scripts/developer/ 2016-04-25 17:36:35 -07:00
Andrew Meadows
582b20227a move from examples/ to scripts/default/ 2016-04-25 17:35:27 -07:00
Anthony J. Thibault
b7f157f4ff Reset avatar on exit of away-mode.
Exposed MyAvatar.reset(bool) to script.
away.js now calls this on exit of away-mode.
2016-04-25 14:10:20 -07:00
Clément Brisset
d74b5bdb17 Merge pull request #7756 from sethalves/add-missing-delete
fix memory leak in AssetMappingModel
2016-04-25 12:56:26 -07:00
Ryan Huffman
84ed57cf0f Merge pull request #7755 from birarda/hello-worlds-link
change docs link on Sandbox splash screen
2016-04-25 11:30:26 -07:00
Anthony Thibault
6dfd174285 Merge pull request #7750 from hyperlogic/tony/thousand-yard-stare
Avatar eye gaze fix for HMDs
2016-04-25 10:29:41 -07:00
Anthony Thibault
573e5ffdd8 Merge pull request #7751 from hyperlogic/tony/eye-contact-improvements
Eye contact improvements
2016-04-25 10:29:24 -07:00
Seth Alves
16bf59f8a6 fix a crash in RenderableModelEntityItem::getModel 2016-04-25 10:26:32 -07:00
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Stephen Birarda
f5fdc9e28f change link on Sandbox splash screen 2016-04-25 09:53:41 -07:00
Anthony J. Thibault
0c200e8c00 MyAvatar: coding convention fix for updateEyeContactTarget() 2016-04-25 09:27:43 -07:00
Thijs Wenker
1066efc737 - fix the settings window of Planky
- set lifetime Planky blocks 60 minutes (per request of Ryan)
2016-04-25 17:12:32 +02:00
Anthony Thibault
0da3fb8eee Eye contact improvements
* After eyes change targets there is now a minimum 1/3rd second delay before they will again.
* Changing gaze from eye to mouth is less likely then switching between eyes.
2016-04-24 18:50:14 -07:00
Anthony Thibault
d8a32c8329 Avatar eye gaze fix for HMDs
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
2016-04-24 17:59:51 -07:00
Brad Hefta-Gaub
88ab52d340 Merge pull request #7747 from hyperlogic/tony/avatar-look-at-fixes
Fixes for avatar eye tracking.
2016-04-23 17:04:15 -07:00
Brad Hefta-Gaub
8c7ef31636 Merge pull request #7746 from AndrewMeadows/supress-spurious-logs
reduce warnings about truncated kinematic timesteps
2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew
support for larger than 35 minute clock skew
2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
21b324e1f3 Merge pull request #7742 from birarda/new-default-av
replace the default avatar with the being of light
2016-04-23 08:42:00 -07:00
David Rowe
958c6f48c2 Maintain relative spacing among toolbars as the window is resized 2016-04-23 18:16:20 +12:00