Brad Davis
a47614c9b6
Revert "Build a better event bridge"
...
This reverts commit a43fde0803
2016-03-25 09:48:25 -07:00
Brad Hefta-Gaub
fc41c5bca9
Merge pull request #7448 from Menithal/entity-properties-refresh-cache
...
Added Refresh Buttons to entityProperties
2016-03-24 17:34:46 -07:00
Brad Hefta-Gaub
d26fe77803
Merge pull request #7454 from jherico/qml_crashes
...
Fix async issues related to JS <-> App <-> QML <-> HTML communication
2016-03-24 17:32:38 -07:00
Menithal
24f2bdac77
Fixed Styling
2016-03-24 20:58:32 +02:00
Brad Davis
a43fde0803
Build a better event bridge
2016-03-24 11:01:06 -07:00
Andrew Meadows
c8655b8524
Merge pull request #7438 from PhilipRosedale/airship
...
Sample script: Airship
2016-03-24 08:40:36 -07:00
Philip Rosedale
8e572ed635
Merge pull request #7423 from thoys/20859
...
CR for Job #20859 - Fix particle color selection
2016-03-24 00:20:59 -07:00
PhilipRosedale
8c4ecc64d9
fix entity script location
2016-03-23 22:49:18 -07:00
PhilipRosedale
7b326c9d7b
fixes per review
2016-03-23 17:56:02 -07:00
Menithal
12ecd592ab
Added Refresh Buttons to entityProperties
...
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
2016-03-24 01:14:48 +02:00
PhilipRosedale
7e658896e6
update header
2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625
airship from hack project
2016-03-22 22:39:22 -07:00
Thijs Wenker
d47e8eb999
Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays.
2016-03-22 17:39:57 +01:00
Philip Rosedale
c8816f8e76
Merge pull request #7389 from Menithal/on-grab-fix
...
Grab.js: Update Position on Mouse Grab Start
2016-03-21 17:10:00 -07:00
Brad Hefta-Gaub
6822f0643b
Merge pull request #7397 from zzmp/fix/ambient-url-listener
...
Add back ambientURL listener in editor
2016-03-21 08:49:43 -07:00
Seth Alves
b600000307
refactor code a bit
2016-03-20 17:59:15 -07:00
Seth Alves
21c688390c
make voxels.js buttons work, again
2016-03-20 17:40:03 -07:00
Zach Pomerantz
105b4e16a9
Add back ambientURL listener in editor
2016-03-18 16:18:41 -07:00
James B. Pollack
ce932640bd
Merge pull request #7353 from huffman/fix-keylight-edit
...
Fix keylight direction naming and usage in edit.js
2016-03-18 12:35:48 -07:00
Menithal
066c517dd7
Grab.js: Update Position on Mouse Grab Start
...
Fixes grab event issue where if the object is moving, the position does
not update until the user has moved their mouse.
This commit makes sure that the moment the user starts dragging on a
object that isnt grabbed by another, the position is immediately updated
instead of waiting for the user to move their mouse.
2016-03-18 08:59:07 +02:00
David Rowe
ebe13b7b93
Fix edit toolbar's upload button
2016-03-17 14:44:57 +13:00
David Rowe
62b24e6626
Explicitly enable button-down behavior in scripts
2016-03-17 11:49:49 +13:00
David Rowe
004a694741
Make toolbar buttons "click"
2016-03-17 11:25:37 +13:00
David Rowe
df870d6e82
Merge branch 'master' into 20852
2016-03-17 10:35:26 +13:00
Andrew Meadows
7acc56bf00
Merge pull request #7359 from zzmp/feat/bg-gpu-timer
...
Add a DrawBackgroundDeferred gpu timer
2016-03-16 07:58:53 -07:00
David Rowe
46a953885f
Increase size of frame around and between buttons
...
Makes easier to click and drag toolbar to new position.
2016-03-16 11:43:11 +13:00
David Rowe
3a28772729
Regularize toolbar margins and make draggable from all four sides
2016-03-16 10:29:26 +13:00
David Rowe
a5e0d93dd5
Update directory, edit, and marketplace toolbar buttons
2016-03-16 10:29:25 +13:00
David Rowe
3991c984a8
Remove voxels button from edit.js toolbar
2016-03-16 10:29:23 +13:00
Brad Hefta-Gaub
11c318305f
Merge pull request #7340 from sethalves/edit-js-grabbable
...
edit.js has checkboxes for grabbable pseudo-properties
2016-03-14 18:58:37 -07:00
Brad Hefta-Gaub
447918d148
Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes
...
Avatar & Animation cppcheck static analysis fixes
2016-03-14 18:58:25 -07:00
Zach Pomerantz
0ea70f234f
Add bg gpu timer display
2016-03-14 17:53:48 -07:00
Clément Brisset
e38c08ebd9
Merge pull request #7335 from imgntn/photosphere
...
Add Photo Sphere Example
2016-03-14 16:56:17 -07:00
Ryan Huffman
850fb51f72
Fix keylight direction naming and usage
2016-03-14 14:45:00 -07:00
Seth Alves
d811c4f6b5
dynamic is the same as grabbable-by-default
2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a
dynamic is the same as grabbable-by-default
2016-03-14 11:36:44 -07:00
Chris Collins
e577658315
Merge pull request #7333 from PhilipRosedale/testSound
...
playTestSound.js - better clip for testing/showing audio
2016-03-14 08:44:28 -07:00
Anthony Thibault
1e94d9bdf5
interface/src/avatar: cppcheck fixes
2016-03-13 18:56:15 -07:00
Brad Davis
798d2a73db
Merge pull request #7326 from ZappoMan/toggleOverlay
...
Various Overlay, Menu, and Away Mode bug fixes
2016-03-13 11:44:19 -07:00
James B. Pollack
96bc17cd5e
Update photo_sphere.js
2016-03-12 16:01:10 -08:00
Seth Alves
cca4a93b2b
don't full up userData with default grabbable data
2016-03-12 14:09:52 -08:00
Seth Alves
be51040420
grabbable controlls are working
2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e
started to add grabbable psuedo properties to edit.js
2016-03-12 13:20:00 -08:00
James B. Pollack
b0109133c0
add git handle
2016-03-11 22:02:49 -08:00
James B. Pollack
cecebc9ae4
add example
2016-03-11 22:01:01 -08:00
PhilipRosedale
9823ecffa7
new test sound script
2016-03-11 17:00:44 -08:00
Brad Hefta-Gaub
6083706151
CR feedback
2016-03-11 16:47:16 -08:00
Brad Hefta-Gaub
082bb8c4b8
auto-show reticle on mouse click
2016-03-11 12:49:42 -08:00
Brad Hefta-Gaub
e341419090
enter away mode when you remove the Vive HMD
2016-03-11 11:56:39 -08:00
Brad Hefta-Gaub
d32611a7f9
make away show overlays if they are hidden when you enter away
2016-03-11 11:45:52 -08:00
