Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 21:12:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44381 commits 76 branches 59 tags 1.2 GiB
Commit graph

44381 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Zach Pomerantz
aca3d4d90b add example script for metadata from metaverse 2016-06-16 15:22:34 -07:00
David Rowe
77976281ab Make audio device selection available without advanced menus enabled 2016-06-17 09:58:44 +12:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Zach Pomerantz
0f9c637c5a Wireframe a metadata overlay tutorial 2016-06-16 13:27:36 -07:00
Ryan Huffman
bce05df56b Update enabled_edit to only get sent when you have permission 2016-06-16 13:25:14 -07:00
Ryan Huffman
56c84bbc27 Add opened_marketplace and enabled_edit to edit.js 2016-06-16 13:18:08 -07:00
Ryan Huffman
3650377745 Clean up NULL => nullptr 2016-06-16 13:17:31 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07: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
Howard Stearns
4f6d65a961 Merge pull request #8082 from jherico/explicit_overlay_alpha 
Hand Controller UI Tweaks
 2016-06-16 10:35:51 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
SamGondelman
f02ffa92fd undo debugging 2016-06-15 18:00:08 -07:00
Bradley Austin Davis
067539ff6d Fix overlay stuck to face 2016-06-15 17:44:58 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
SamGondelman
59b785a33b trying to debug 2016-06-15 16:55:34 -07:00
Howard Stearns
faa2624ca7 Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays 
Continue grabbing through overlays
 2016-06-15 16:07:01 -07:00
Howard Stearns
0915d1287f Merge pull request #8079 from howard-stearns/no-laser-without-trigger 
No laser without trigger
 2016-06-15 16:06:56 -07:00
Howard Stearns
357b9353dc Merge pull request #8074 from jherico/lasers 
Vive hand controller updates
 2016-06-15 16:06:49 -07:00
Howard Stearns
980eafb972 Merge pull request #8065 from hyperlogic/feature/grab-script-preliminaries 
grab script preliminaries
 2016-06-15 16:06:06 -07:00
howard-stearns
6f671b7cde see comment. 2016-06-15 15:17:34 -07:00
Bradley Austin Davis
87dc6649ce Better track keyboard open state, fix text replacement 2016-06-15 15:16:29 -07:00
howard-stearns
1e3b20b66d Explicit check enumerated states instead of relying on order, per 
feedback.
 2016-06-15 15:06:36 -07:00
David Rowe
775656eb1d Delete comment 2016-06-16 08:48:30 +12:00
howard-stearns
2c7642a367 Do not make ReticleClick when we enter an overlay with the trigger 
pressed.
 2016-06-15 12:28:42 -07:00
Bradley Austin Davis
bc838ac0b4 Fix vive json 2016-06-15 11:41:28 -07:00
howard-stearns
6366ca7508 Go red for full trigger. 2016-06-15 11:08:59 -07:00
Bradley Austin Davis
60035486d3 Build fix 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07: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
Howard Stearns
b9754c8564 continue grabbing through overlays 2016-06-14 20:17:52 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Howard Stearns
ae65790bf3 no laser (or mouse cursor) from hand controllers unless trigger squeezed 2016-06-14 18:07:08 -07: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