Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 00:34:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25273 commits 71 branches 56 tags 1.2 GiB
Commit graph

25273 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Cake
8324268ec8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 11:32:39 -07:00
Philip Rosedale
96b761357b Merge pull request #4853 from huffman/remove-scripts-tip 
Remove scripts 'Tip' label and fix tool window heights
 2015-05-13 11:21:49 -07:00
Sam Cake
65e83df214 Generating the SH from the cube map! 2015-05-13 11:08:18 -07:00
Philip Rosedale
a5c49b7a13 Merge pull request #4813 from ctrlaltdavid/20532 
CR for 20532 - Default face tracking to Use Camera for first time users
 2015-05-13 11:06:46 -07:00
Ryan Huffman
7ff9422717 Fix runningScripts and tool window height 2015-05-13 09:45:18 -07:00
Ryan Huffman
8e5438a4ad Remove scripts 'Tip' label 2015-05-13 09:32:17 -07:00
Philip Rosedale
b658c26799 Merge pull request #4840 from jherico/menu 
Only display new menu in VR mode
 2015-05-13 08:15:04 -07:00
Sam Cake
04d3f690dc Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-12 23:12:37 -07:00
Sam Cake
536fff4502 Trying to create the SH from the skybox cubemap 2015-05-12 23:11:52 -07:00
David Rowe
8a3c8e0d9a Merge branch 'master' into 20532 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-05-12 17:41:12 -07:00
Philip Rosedale
349886c146 Merge pull request #4847 from birarda/domain-paths 
add initial support for local paths in domain
 2015-05-12 17:09:13 -07:00
Philip Rosedale
65277e0573 Merge pull request #4836 from ctrlaltdavid/20535 
CR for #20535 - Improve DDE eyelid control
 2015-05-12 17:00:02 -07:00
Philip Rosedale
107faf39c4 Merge pull request #4844 from huffman/color-picker-reduce-size 
Make edit color picker slimmer
 2015-05-12 16:35:09 -07:00
Philip Rosedale
aea0824020 Merge pull request #4849 from sethalves/line-entity 
bump protocol version for line entities
 2015-05-12 16:34:50 -07:00
Seth Alves
4a533748f4 Merge pull request #4848 from PhilipRosedale/master 
update position and rotation from the script, even though we should not have to
 2015-05-12 16:13:29 -07:00
Seth Alves
db704874b9 bump protocol version for line entities 2015-05-12 16:02:45 -07:00
Brad Hefta-Gaub
7ad696895c Merge pull request #4829 from jherico/info-view 
Fixing info-view popup on every launch
 2015-05-12 15:58:49 -07:00
Brad Davis
fa416cf382 Merge pull request #4843 from sethalves/line-entity 
Line entity
 2015-05-12 15:51:04 -07:00
Stephen Birarda
e88cfc913f make sure viewpoint is prepended with slash 2015-05-12 15:45:13 -07:00
Stephen Birarda
89cb3d66e4 make sure paths are prepended with a slash 2015-05-12 15:39:22 -07:00
Stephen Birarda
edadaea604 add help text for domain-server paths 2015-05-12 15:30:25 -07:00
Seth Alves
500bb13cbb c++ 2015-05-12 15:17:27 -07:00
Seth Alves
4e679c7e3a use toGlm for color. remove some commented-out code 2015-05-12 15:08:26 -07:00
Stephen Birarda
8c9a14cd9d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths 2015-05-12 15:04:59 -07:00
Brad Davis
f42e0c696a Merge branch 'master' into menu 2015-05-12 14:58:42 -07:00
Brad Davis
4d53010ab0 Merge branch 'master' into info-view 2015-05-12 14:58:22 -07:00
samcake
81e9918a4c Merge pull request #4845 from highfidelity/revert-4837-dk1 
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing t…
 2015-05-12 14:36:56 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
Stephen Birarda
332601b91c final fixes for path query from DS 2015-05-12 14:34:14 -07:00
Ryan Huffman
2e31cca7e5 Make edit color picker slimmer 2015-05-12 14:03:06 -07:00
Stephen Birarda
7330e5255d handle path query response from DS in NL/AM 2015-05-12 13:48:41 -07:00
Philip Rosedale
11ab97e0fc update position and rotation from the script, even though we should not have to. 2015-05-12 13:11:11 -07:00
Stephen Birarda
993984134c add the path to DS response for path query 2015-05-12 12:48:01 -07:00
Stephen Birarda
0562fee82a Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths 2015-05-12 12:39:05 -07:00
samcake
7c255738af Merge pull request #4837 from jherico/dk1 
Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff
 2015-05-12 12:30:32 -07:00
Stephen Birarda
e0ccc986b1 add a method to DS to respond to path query 2015-05-12 12:29:09 -07:00
Stephen Birarda
d8b17ffeb0 add packets for a path query and path response 2015-05-12 12:00:03 -07:00
Stephen Birarda
c66bd9b1aa complete addition of paths to DS settings 2015-05-12 11:58:55 -07:00
Seth Alves
f647db3bf0 Merge branch 'master' of github.com:highfidelity/hifi into line-entity 2015-05-12 11:36:56 -07:00
Seth Alves
7a85bfa0d1 fix up grab.js to use line entity 2015-05-12 11:36:05 -07:00
Stephen Birarda
3daabd262b remove debugs from DSSettingsManager 2015-05-12 11:24:47 -07:00
Stephen Birarda
2185cf1883 Merge pull request #4842 from ZappoMan/fixParticles 
fix particle properties
 2015-05-12 14:07:21 -04:00
ZappoMan
c81f6dc69c fix particle properties 2015-05-12 11:03:16 -07:00
Seth Alves
38caed00ca Attempt to draw line entity item 2015-05-12 10:25:50 -07:00
Stephen Birarda
c49d73ea35 handle root key settings when updating 2015-05-12 10:25:11 -07:00
Brad Hefta-Gaub
a32b4df6a5 Merge pull request #4841 from huffman/color-picker 
Fix skybox color picker
 2015-05-12 09:24:50 -07:00
Ryan Huffman
e673746d58 Fix skybox color picker 2015-05-12 09:22:53 -07:00
Bradley Austin Davis
14efe912a6 Because sometimes I just don't think things through 2015-05-12 09:20:02 -07:00
Brad Davis
f844dcd25f Only display new menu in VR mode 2015-05-12 09:05:24 -07:00
Brad Hefta-Gaub
9e308cce21 Merge pull request #4839 from huffman/color-picker 
Add color picker to entity properties
 2015-05-12 08:58:41 -07:00