Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 11:48:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44447 commits 25 branches 0 tags 1.1 GiB
Commit graph

44447 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
7d602986cd removed multiple interface instances hack which you should never do anyways because it breaks everything 2016-06-17 12:01:02 -07:00
SamGondelman
5f7e49b087 possible fix, needs testing 2016-06-17 11:50:56 -07:00
howard-stearns
74a3db4e1c When setting Reticle.depth, don't assume that we're in the center of the 
HUD.
 2016-06-17 11:14:56 -07:00
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00
samcake
e2a3d1a750 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-17 09:51:02 -07:00
samcake
904efc8076 SPlitting appart the DeferredLIghting Effect 2016-06-17 09:31:32 -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
samcake
4ffaee9dce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-16 18:28:47 -07:00
samcake
350f06465d Introducing the deferredFRameTransform to DeferredLighting Effect and simplifying the rendering! 2016-06-16 18:28:08 -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
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
samcake
40a4e72f73 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-15 15:14:19 -07:00
samcake
e31a3b4d08 After trying stop trying to expose a generic [] operator on Varying and Containers 2016-06-15 15:13:51 -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