Commit graph

43049 commits

Author SHA1 Message Date
Seth Alves
8c2b89b910 trying to get /~/ from web sorted out 2016-04-28 18:29:46 -07:00
Seth Alves
82b43dbfec Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-04-28 18:29:40 -07:00
James B. Pollack
4fd6647d0b add rave stick entity script 2016-04-28 18:25:09 -07:00
James B. Pollack
45bb91cb0b planky 2016-04-28 18:20:20 -07:00
samcake
88f816fab4 Adding reflection of the ambient map for translucent 2016-04-28 18:18:18 -07:00
James B. Pollack
d7d667c99b add utils scripts 2016-04-28 18:17:38 -07:00
Stephen Birarda
09981db834 use a setting handle for UAL disabled to fix startup race 2016-04-28 18:05:06 -07:00
Atlante45
9a7bebaaa2 Fix dangling reference into container 2016-04-28 18:04:04 -07:00
James B. Pollack
f73ef9b4a9 cleanup 2016-04-28 18:03:38 -07:00
James B. Pollack
366d9869e6 convert the rest 2016-04-28 18:03:18 -07:00
Brad Hefta-Gaub
19e069f6ef Merge pull request #7790 from birarda/anon-events
don't require authentication to send usage data
2016-04-28 18:01:33 -07:00
James B. Pollack
5e31c5f385 convert flashlight and music player 2016-04-28 17:44:14 -07:00
James B. Pollack
a9c95d8e7c convert flappy avatars 2016-04-28 17:42:33 -07:00
David Rowe
6b8109f164 Fix avatar browser top border height and remove separate "close" button 2016-04-29 12:42:10 +12:00
James B. Pollack
cf2d82d320 convert cat and doll 2016-04-28 17:19:35 -07:00
Stephen Birarda
6883891748 don't require authentication to send user activity 2016-04-28 17:08:40 -07:00
Brad Hefta-Gaub
e92e4e57b1 Merge pull request #7772 from AndrewMeadows/minor-optimizations
minor cleanup and optimizations around EntityItem::getDimensions()
2016-04-28 17:04:42 -07:00
Brad Hefta-Gaub
647ec69aaf Merge pull request #7789 from imgntn/movetemplates
Move developer templates into a different location
2016-04-28 17:02:42 -07:00
Brad Hefta-Gaub
e881cba502 Merge pull request #7777 from ctrlaltdavid/20897
Move directory, examples, and edit toolbar buttons down a bit
2016-04-28 17:00:49 -07:00
James B. Pollack
703acd61eb convert bubblewand 2016-04-28 16:38:33 -07:00
Brad Hefta-Gaub
5314755e0d Merge pull request #7782 from ctrlaltdavid/20898
Automatically upgrade toolbar position to bottom center of window
2016-04-28 16:37:34 -07:00
James B. Pollack
6fc1cdc41f convert bow 2016-04-28 16:37:19 -07:00
James B. Pollack
6c6d5905cc more bball 2016-04-28 16:29:32 -07:00
Brad Hefta-Gaub
bc57719f5f Merge pull request #7771 from ericrius1/lampFix
Lamp fix- moves light position up a bit on desklamp at home
2016-04-28 16:29:03 -07:00
Brad Hefta-Gaub
6488744bd5 Merge pull request #7780 from imgntn/defaultScripts
Remove directory.js from default scripts
2016-04-28 16:28:33 -07:00
Brad Hefta-Gaub
b72ac35e8e Merge pull request #7785 from imgntn/editicons
Re-add locking/visibility tools to edit.js
2016-04-28 16:27:34 -07:00
James B. Pollack
e519d483a9 convert sounds 2016-04-28 16:27:31 -07:00
James B. Pollack
851f9b0914 move dev templates into a dif location 2016-04-28 16:23:32 -07:00
James B. Pollack
40c1563b1f convert bball rack 2016-04-28 16:21:03 -07:00
Seth Alves
648e6a74d7 don't let people access scripts outside of /~/ 2016-04-28 15:43:58 -07:00
James B. Pollack
e68909ce3e re add local paths 2016-04-28 13:48:09 -07:00
James B. Pollack
aafed4e1b8 fix horizontal typo in examples 2016-04-28 13:42:10 -07:00
Seth Alves
8c278563f5 allow scripts on the web to refer to interface-local javascript libraries 2016-04-28 13:41:50 -07:00
James B. Pollack
b52406e127 horizontal 2016-04-28 13:40:58 -07:00
James B. Pollack
795d866da9 re add locking/visibility tools to edit.js 2016-04-28 13:29:54 -07:00
David Rowe
1cf53829d3 Fix upgrading for all toolbar buttons 2016-04-29 08:20:20 +12:00
David Rowe
b7188bad30 Automatically upgrade toolbar position to bottom center of window 2016-04-29 07:13:56 +12:00
Zach Pomerantz
30e7b950a1 Fix script engine deletion 2016-04-28 11:41:36 -07:00
James B. Pollack
90c59c5af0 remove directory from default 2016-04-28 10:39:53 -07:00
Andrew Meadows
b95c81d0ba Merge pull request #7763 from huffman/fix/gpu-ident-debug
Fix assert crash in GPUIdent
2016-04-28 08:02:11 -07:00
James B. Pollack
3f0807fc68 add utils and rewrite a lot of include refs 2016-04-27 23:49:38 -07:00
James B. Pollack
b2564e8266 move toybox resetter scripts 2016-04-27 23:42:01 -07:00
Zach Pomerantz
2f20e58301 Avoid crashing on missed pipelines 2016-04-27 19:54:52 -07:00
Zach Pomerantz
854c0ea3e3 Clean out updateMemoryCost 2016-04-27 19:20:43 -07:00
Zach Pomerantz
1e8d45aecb Put ScriptableResource state enum in prototype 2016-04-27 19:20:43 -07:00
Zach Pomerantz
0c78d5bdd1 Change ScriptableResource signal to state 2016-04-27 19:20:42 -07:00
Zach Pomerantz
de8145ec71 Nest TextureType JS interface in Type 2016-04-27 19:20:41 -07:00
Zach Pomerantz
c2909946e6 Split test to prefetch, movie 2016-04-27 19:20:33 -07:00
Seth Alves
5cec928ad1 Merge pull request #7776 from huffman/fix/build-copy-scripts
Fix interfaces scripts not copying from /scripts in local builds
2016-04-27 19:15:09 -07:00
David Rowe
eee3cedd95 Fix typo 2016-04-28 12:55:41 +12:00