Commit graph

5754 commits

Author SHA1 Message Date
ericrius1
adeaa9475e num 2016-03-21 16:49:55 -07:00
ericrius1
9c18d6c016 change name 2016-03-21 16:47:51 -07:00
ericrius1
efd56ac22a spawner 2016-03-21 16:45:23 -07:00
ericrius1
51508b467c uupdate 2016-03-21 15:59:03 -07:00
ericrius1
98e43a8d0f more logging 2016-03-21 15:54:47 -07:00
ericrius1
b4509e428b bugs 2016-03-21 15:37:20 -07:00
ericrius1
81901dc73d log change 2016-03-21 15:04:57 -07:00
ericrius1
b8cb71e16a debug 2016-03-21 15:02:39 -07:00
ericrius1
7659aed97a dont delete the entity when spawner script shutdown 2016-03-21 14:42:53 -07:00
ericrius1
b4e400f3aa baton sound logging updates 2016-03-21 14:42:28 -07:00
ericrius1
493a91fa27 with debug box 2016-03-21 14:32:22 -07:00
ericrius1
e5b2483604 sound seems to be working" 2016-03-21 14:09:02 -07:00
ericrius1
68dc5a8251 just playing on start update 2016-03-21 13:57:54 -07:00
ericrius1
b7534fbd57 basics of virtual baton 2016-03-21 13:52:26 -07:00
ericrius1
6c5ad187a0 Merge remote-tracking branch 'upstream/master' 2016-03-21 11:51:38 -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
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
ericrius1
9d24887ff4 Merge remote-tracking branch 'upstream/master' 2016-03-15 13:50:23 -07: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