Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 04:29:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66117 commits 25 branches 0 tags 1.1 GiB
Commit graph

6974 commits

Author SHA1 Message Date
Seth Alves
dcfebde54a put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain 2018-03-29 10:50:43 -07:00
Seth Alves
bb101956a6 fix entity importing 2018-03-27 18:25:43 -07:00
Seth Alves
6c1d713968 review 2018-03-21 19:21:57 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00
Seth Alves
196f621a60 remove unneeded setSessionUUID 2018-03-21 15:21:49 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Seth Alves
585a523823 unmangle merge 2018-03-20 11:17:56 -07:00
John Conklin II
40d6e51da8
Merge pull request #12597 from ElderOrb/FB12956 
Fix for broken 'toggle audio meter' button
 2018-03-20 11:03:32 -07:00
Seth Alves
bd10cd6fa9 'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name) 2018-03-20 10:53:17 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload 
Add support for .content.zip content uploads
 2018-03-20 10:07:53 -07:00
Seth Alves
e3022da787 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 09:34:38 -07:00
Atlante45
d96f7553d9 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-03-15 15:22:43 -07:00
Ryan Huffman
03c8c14f61 Fix content replacement being allowed from all URLs 2018-03-15 12:49:22 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
Seth Alves
afcbb6751b disable loading of serverless-domains over http(s), for now 2018-03-14 15:53:35 -07:00
Seth Alves
e63558dc05 code review 2018-03-14 14:33:17 -07:00
David Rowe
966d711e56 Fix Window.raiseMainWindow() 2018-03-14 13:38:48 +13:00
David Rowe
c8b4217a96 Fix Window.hasFocus() 2018-03-14 12:57:23 +13:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa 
Temporal Anti-Aliasing
 2018-03-13 09:03:50 -07:00
David Rowe
16aefea2e1 Merge branch 'master' into 21776 2018-03-13 14:46:07 +13:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
Olivier Prat
aad571f6bd Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-03-12 14:22:57 -04:00
Seth Alves
5b5ea11a18 changes to openUrl aren't needed for serverless domains 2018-03-09 15:43:05 -08:00
Seth Alves
621e6a62d6 merge from upstream 2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c merge from upstream 2018-03-09 12:03:26 -08:00
John Conklin II
25b93d9fd7
Merge pull request #12606 from ElderOrb/FB12956_RC65 
Fix for broken 'toggle audio meter' button
 2018-03-09 11:20:27 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes 
tablet scale and position changes
 2018-03-08 15:36:06 -08:00
Alexander Ivash
b427d6c326 FB12956 - Audio Meter Toggle Button Broken 2018-03-09 02:20:34 +03:00
Zach Fox
ec6f66ee52 Try this 2018-03-08 14:31:56 -08:00
Zach Fox
747a6b07ce Fix font loading for MacOS via different font loading method 2018-03-08 14:31:48 -08:00
Alexander Ivash
1fb68ec5ca FB12956 - Audio Meter Toggle Button Broken 2018-03-09 00:55:49 +03:00
Zach Fox
409f5293bf Try this 2018-03-08 13:51:34 -08:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
David Rowe
b1bda281ee Merge branch 'master' into 21776 2018-03-08 15:36:10 +13:00
Seth Alves
7c7f42af06 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-07 18:26:15 -08:00
Seth Alves
4ed0c24a73 use static QStrings rather than functions 2018-03-07 18:25:55 -08:00
Seth Alves
e70ca252de Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-07 16:03:48 -08:00
Seth Alves
12eb0e4109 name emit from AddressManager like an event 2018-03-07 15:36:35 -08:00
Elisa Lupin-Jimenez
2987c90f96 fixed syntax for ubuntu 2018-03-07 13:48:35 -08:00
Elisa Lupin-Jimenez
9ae2da7e4b fixed logic for texture files/non-models 2018-03-07 13:18:36 -08:00
Elisa Lupin-Jimenez
28589094c2 hopefully fixed mac/ubuntu builds 2018-03-07 10:18:40 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
Elisa Lupin-Jimenez
c6e5f4c9c8 zip file drags don't auto add model textures 2018-03-06 19:24:09 -08:00