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

25313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c0473adec9 add button to create new domain ID in settings 2015-05-15 11:18:12 -07:00
Stephen Birarda
bb936657ae handle domain creation during account connect flow 2015-05-15 11:09:00 -07:00
Stephen Birarda
c4f926b25f hide domain ID + auto network options without account 2015-05-14 16:15:28 -07:00
Stephen Birarda
20940b55ba handle access token storage via sweet-alert 2015-05-14 15:47:20 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Stephen Birarda
a668ea7a4c remove a blank line 2015-05-14 12:53:23 -07:00
Stephen Birarda
4de006f9b9 handle OAuth access token retrieval 2015-05-14 12:22:23 -07:00
Stephen Birarda
fabe19a92c ask for OAuth token directly 2015-05-14 11:19:07 -07:00
Stephen Birarda
aff83be768 handle account disconnection from DS settings 2015-05-14 11:03:41 -07:00
Stephen Birarda
033007cce6 use viewHelpers to create HF account button 2015-05-14 10:45:26 -07:00
Stephen Birarda
52ce9af375 fix updateSetting conditionals after merge 2015-05-13 17:53:21 -07:00
Stephen Birarda
62c0aff16a handle falsy values returned from valueForKeyPath 2015-05-13 17:52:46 -07:00
Stephen Birarda
69fb6c73ac remove gui only feature in domain-server 2015-05-13 17:33:44 -07:00
Stephen Birarda
93973eecd1 resolve conflicts on merge with upstream/master 2015-05-13 17:13:33 -07:00
Brad Hefta-Gaub
3b7acae8a2 Merge pull request #4850 from jherico/web-entity 
Web entity
 2015-05-13 17:02:55 -07:00
Philip Rosedale
0a65c06e2b Merge pull request #4857 from sethalves/smaller-collision-margins 
Smaller collision margins
 2015-05-13 15:22:45 -07:00
Philip Rosedale
28643b8145 Merge pull request #4858 from birarda/domain-paths 
handle fail case in DS updateSetting
 2015-05-13 14:28:27 -07:00
Stephen Birarda
225b41d163 don't do dumb things with memory 2015-05-13 14:18:48 -07:00
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
Seth Alves
3f8f5fd82e Merge branch 'master' of github.com:highfidelity/hifi into smaller-collision-margins 2015-05-13 13:56:29 -07:00
Seth Alves
711752bff1 rather than call setMargin, clench in all the points of a collision-hull toward the center of the hull by the margin amount 2015-05-13 13:54:24 -07:00
Stephen Birarda
8b2ded1b79 handle case where QVariant is not QVariantMap 2015-05-13 13:16:06 -07:00
Seth Alves
2ec660bd42 try out smaller collision margins 2015-05-13 13:00:57 -07:00
Seth Alves
8102e534dd Merge pull request #4856 from birarda/master 
fix for audio-mixer ignore of deleteLater
 2015-05-13 12:36:58 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Brad Davis
ad5f1214bf Fix error when deleting web item 2015-05-13 11:58:18 -07:00
Seth Alves
80749195e6 don't ddeTracker->init if HAVE_DDE isn't set 2015-05-13 11:44:42 -07:00
Stephen Birarda
12a8f1436d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-13 11:27:01 -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
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
Brad Davis
9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-13 09:49:53 -07:00
Bradley Austin Davis
fc825f6632 Fixing the loading of local HTML so it works on both OSX and win32 2015-05-13 09:46:24 -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
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -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
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
 2015-05-12 15:56:02 -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