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

61190 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode 
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
 2017-10-30 08:56:26 -07:00
Ryan Downe Karpf
8fbe7f050f
Merge pull request #11712 from vladest/fix_avatar_browser 
fix typo in tablet avatar browser
 2017-10-30 08:49:58 -07:00
Stephen Birarda
05cfd72464
Merge pull request #11707 from Atlante45/feat/wizard 
Domain Settings tweaks + Domain Setup Wizard
 2017-10-30 08:39:31 -07:00
Ryan Huffman
70d3bd3672 Fix label/auto networking not being hidden for temp domains 2017-10-29 20:48:03 -07:00
Ryan Huffman
ed99541b5f Fix domain info not loading for temp domains in DS settings 2017-10-29 20:47:52 -07:00
divya
de4fd269ef
Merge pull request #11701 from birarda/bug/local-ds-inconnect 
only respond to expected ICE peers in DS
 2017-10-28 21:23:05 -07:00
Atlante45
b0d838cb9b Fix UNIX warning 2017-10-28 14:57:16 -07:00
Ryan Huffman
3616ef7c49 Fix ip-only in DS settings to show port instead of address 2017-10-28 14:19:14 -07:00
Ryan Huffman
88e22f7507 Remove unneeded logging in DomainServer.cpp 2017-10-28 14:19:14 -07:00
vladest
b1601dcd4c fix typo in tablet avatar browser 2017-10-28 12:07:29 +02:00
Atlante45
56e9a9aaf9 Handle old configs 2017-10-27 17:32:11 -07:00
Andrew Meadows
f958829d00
Merge pull request #11708 from samcake/blue 
Expose the Render api to the tablet js context and update render engine tool
 2017-10-27 17:12:36 -07:00
Brad Hefta-Gaub
8322631a6d
Merge pull request #11695 from luiscuenca/case6719 
6719 Avatar attachment window will update when attachments are modified
 2017-10-27 17:01:05 -07:00
Ryan Huffman
c42ef4f88c Update most DS API forwarding APIs to use a single forwarding function 2017-10-27 15:53:50 -07:00
Atlante45
ae9f87873f Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard 2017-10-27 15:27:00 -07:00
samcake
7e149fe30d Remove unecessary comments 2017-10-27 15:18:50 -07:00
Atlante45
c7b8d1114d CR 2017-10-27 15:11:31 -07:00
samcake
8a3b1a20cc merge with upstream 2017-10-27 14:57:25 -07:00
Ryan Huffman
75e98dcef9 Cleanup style in DS js files 2017-10-27 14:55:50 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211 
8211 Add very short haptic feedback when highlighting letters on keyboard
 2017-10-27 13:26:41 -07:00
Brad Hefta-Gaub
25b5657d58
Merge pull request #11702 from misslivirose/fix/remove-address 
remove href property for non-owned avatar entities
 2017-10-27 13:15:47 -07:00
Atlante45
203a419f2a Setup Wizard 2017-10-27 12:52:36 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Zach Fox
3fae121335
Merge pull request #11670 from zfox23/stagingSetting 
Make it easier to switch between STABLE and STAGING Metaverses
 2017-10-27 12:03:29 -07:00
samcake
715cf301d5 cleaning the layout finally 2017-10-27 12:00:10 -07:00
Ryan Huffman
390dae3918 Fix DS settings sidebar moving incorrectly 2017-10-27 11:49:41 -07:00
Ryan Huffman
2944d76ef0 Update settings with auto domain creation and restart 2017-10-27 11:49:41 -07:00
Ryan Huffman
1bb778c21f Fix label support in DS settings and add automatic domain generation: 2017-10-27 11:49:41 -07:00
Ryan Huffman
92aa66cdd7 Update domain settings to include domain info editing 2017-10-27 11:49:40 -07:00
Ryan Huffman
7dc475c695 Update domain server settings 
Move requests that require access token to go through DS
Update various styling and ease of use on DS settings page

Update domain server settings

CP

CP
 2017-10-27 11:49:34 -07:00
Stephen Birarda
689828e3fa add packet version change for ICE ping change 2017-10-27 10:00:49 -07:00
samcake
55f6ecb070 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-27 09:29:41 -07:00
Sam Gateau
a2765cffbd adjusting the qml again ? i just hate the layout / anchor system 2017-10-26 23:22:06 -07:00
Brad Hefta-Gaub
f21a284324 Merge pull request #11700 from SamGondelman/face 
Billboardables face avatar instead of facing away
 2017-10-26 20:40:29 -07:00
samcake
1dbeac7b88 Adding the idons for Luci and cleaning up the scripts 2017-10-26 19:55:59 -07:00
samcake
0636a2db06 removing historic changes 2017-10-26 19:19:52 -07:00
MissLiviRose
c7857d4fc3 actually remove href not script 2017-10-26 17:47:04 -07:00
MissLiviRose
0ab06d624a remove href property for non-owned avatar entities 2017-10-26 17:35:51 -07:00
samcake
79338f4316 removing the the unecessary files and trying using qrc:///qml 2017-10-26 17:12:49 -07:00
Zach Fox
9481824d0a Fix enabled status of wear button 2017-10-26 17:02:09 -07:00
Zach Fox
8cb60fc62c Small edit.js changes 2017-10-26 16:44:21 -07:00
Stephen Birarda
10d05ba6c9 only respond to expected ICE peers in DS 2017-10-26 16:34:49 -07:00
beholder
6093cef6f0 add comments to explain '-1' 2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2 adjust to coding standards 2017-10-27 01:25:25 +03:00
samcake
b9112024b8 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-26 14:27:23 -07:00
SamGondelman
755ce183e0 fix is facing avatar 2017-10-26 14:16:31 -07:00
Zach Fox
002141724b Return to using NetworkingConstants 2017-10-26 14:12:36 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
Brad Hefta-Gaub
e6dca8de86 Merge pull request #11698 from kencooke/audio-sample-sound-fix 
Tighter version of sample sound
 2017-10-26 13:45:19 -07:00
Zach Fox
d24f241b88 Fix silly javascript error 2017-10-26 13:31:15 -07:00