Commit graph

44104 commits

Author SHA1 Message Date
SamGondelman
9a17f5b439 update homebrew instructions 2016-06-21 14:12:27 -07:00
Zach Pomerantz
1c188a270d Merge pull request #8087 from zzmp/feat/send-domain-descriptors
send domain metadata to metaverse for authed domains
2016-06-20 11:22:01 -07:00
Brad Hefta-Gaub
b012e46dc7 Merge pull request #8097 from sethalves/make-permissions-names-case-insensitive
fix domain-server permissions-grid usernames to be case insensitive
2016-06-20 09:57:47 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Brad Hefta-Gaub
c297fa7c0e Merge pull request #8060 from imgntn/usersUpdates
Hide users.js options when logged out
2016-06-17 14:17:42 -07:00
Brad Hefta-Gaub
abd368b69d Merge pull request #8071 from ctrlaltdavid/20969
let user choose an existing file in the file save dialog
2016-06-17 14:14:37 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText
Add face camera option to edit.js text entity properties
2016-06-17 14:14:06 -07:00
Brad Hefta-Gaub
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks
Initial Steamworks integration
2016-06-16 18:49:51 -07:00
Brad Hefta-Gaub
3b132e7376 Merge pull request #8076 from ZappoMan/reduceLogSpam
don't log spam on empty URL
2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub
99a0804429 Merge pull request #8086 from imgntn/activeElement
Fix some edit.js errors and log messages
2016-06-16 18:25:20 -07:00
Brad Hefta-Gaub
7d0cd38c8e Merge pull request #8075 from ctrlaltdavid/20970
fix reporting of JSON export failure
2016-06-16 18:24:48 -07:00
Brad Hefta-Gaub
fd163ecc20 Merge pull request #8089 from ctrlaltdavid/20973
make audio device selection available without advanced menus enabled
2016-06-16 18:24:36 -07:00
David Rowe
77976281ab Make audio device selection available without advanced menus enabled 2016-06-17 09:58:44 +12:00
Brad Hefta-Gaub
d7cd82a24e Merge pull request #8085 from ZappoMan/fixShaders
fix v1 procedural shaders
2016-06-16 13:06:15 -07:00
Zach Pomerantz
1ce9e96cba Send domain metadata for authed domains 2016-06-16 13:00:28 -07:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -07:00
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
David Rowe
775656eb1d Delete comment 2016-06-16 08:48:30 +12:00
Clément Brisset
6ed972257f Merge pull request #8077 from birarda/api-recheck-on-fail
clear domain connection refusals on hard reset only
2016-06-15 10:24:39 -07:00
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Brad Hefta-Gaub
3e459085ac don't log spam on empty URL 2016-06-15 09:25:46 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Bradley Austin Davis
3525498550 Merge branch 'rc12-merge' 2016-06-14 17:44:24 -07:00
Bradley Austin Davis
21adf4fe68 Merge branch 'master' into rc12-merge 2016-06-14 17:42:22 -07:00
Bradley Austin Davis
d778ec96d7 Revert "fix shapes to property polymorph and persist"
This reverts commit 3bee4b1f9f.
2016-06-14 17:42:13 -07:00
Bradley Austin Davis
747b33f756 Revert "additional revert related change"
This reverts commit 8586e91a3b.
2016-06-14 17:42:01 -07:00
Bradley Austin Davis
f6994f2783 Revert "Revert "refresh API info during re-connect - case 570""
This reverts commit 1624146fc2.
2016-06-14 17:41:53 -07:00
Atlante45
1403fad04e Add cmd line opt to disable settings reset popup 2016-06-14 16:34:46 -07:00
Atlante45
cc16dc07df Add sandbox option to load home locally 2016-06-14 16:29:50 -07:00
Atlante45
925375fb7a Move steamworks archive zip to dependencies 2016-06-14 16:29:50 -07:00
Atlante45
5560ba9a4c Quit application when SteamVR requests it 2016-06-14 16:29:50 -07:00
Atlante45
1a8d6ea614 Make steamworks an external dependency 2016-06-14 16:29:50 -07:00
Atlante45
fc7b271e50 Missed OS X Warning 2016-06-14 16:29:50 -07:00
Atlante45
96258a795a Initial Steamworks integration 2016-06-14 16:29:50 -07:00
David Rowe
3c2b98b15a Let user choose an existing file in the file save dialog 2016-06-15 11:28:38 +12:00
Chris Collins
55330f2205 Merge pull request #8057 from jherico/settings
Fixing issues with unclosed groups in settings persistence
2016-06-14 14:34:14 -07:00
James B. Pollack
b97dc584ea fix bug where buttons would show when minimized 2016-06-14 14:14:31 -07:00
Chris Collins
0236af8bcd Merge pull request #8067 from birarda/api-recheck-on-fail
only signal once on a protocol mismatch with DS
2016-06-14 12:53:21 -07:00
Bradley Austin Davis
b1c472e82b Fixing settings, even in release builds 2016-06-14 12:16:40 -07:00
Brad Hefta-Gaub
c614b10694 Merge pull request #8063 from SamGondelman/viveGripFix
Reset Vive grip buttons to 0 if not pressed
2016-06-14 11:47:49 -07:00
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957
fix model export continued
2016-06-14 10:57:25 -07:00
Brad Hefta-Gaub
b1de94f39d Merge pull request #8061 from imgntn/entityaddtypeserrors
More verbose messaging about incorrect case in entity types
2016-06-14 10:56:58 -07:00
Stephen Birarda
2163f9b5f3 signal once for domain protocol mismatch, case 918 2016-06-14 10:43:45 -07:00
Bradley Austin Davis
d52a1fe6f9 Fix persistence for global scope settings handles, clean up invalid variants in settings 2016-06-14 09:49:38 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Brad Davis
196ab401e5 Merge pull request #8046 from SamGondelman/proceduralRaymarch
Exposed orientation and eye position to procedural entity shaders
2016-06-14 09:48:07 -07:00
Brad Hefta-Gaub
19352a12ea Merge pull request #8056 from imgntn/editbugztab
Fix tabbing behavior in edit.js
2016-06-14 09:14:10 -07:00
James B. Pollack
3b2e0842b0 add face camera to text properties 2016-06-13 23:27:08 -07:00
Brad Hefta-Gaub
7da29daf9d Merge pull request #8036 from ctrlaltdavid/20955
Fix image2d overlay color property
2016-06-13 19:21:59 -07:00
SamGondelman
df9fd6c7fc reset vive grip buttons to 0 if not pressed 2016-06-13 18:35:39 -07:00