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

20295 commits

Author SHA1 Message Date
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
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash 
Fix invalid QML surface cache interaction
 2018-03-20 14:26:39 -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
f61504b814 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-19 14:59:18 -07:00
John Conklin II
47437c9564
Merge pull request #12651 from ctrlaltdavid/21799 
Fix "text" overlay not clipping to right and bottom margins
 2018-03-19 14:12:20 -07:00
Brad Davis
2f59283053 Fix initialization of QML overlay surfaces 2018-03-16 14:48:08 -07:00
Seth Alves
50b9716a17 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 14:45:49 -04:00
Brad Davis
1dfde86680 Fix typo 2018-03-16 11:11:08 -07:00
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -07:00
Brad Hefta-Gaub
634e642db3
Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam 
Overlays visible in 2nd cam
 2018-03-16 10:07:26 -07:00
Seth Alves
4f72503d2d put default home back to sandbox 2018-03-16 09:39:42 -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
a5b94f22fa works now 2018-03-15 10:31:55 -07:00
Seth Alves
b22e0f6209 use TAG_BITS_1 for cam rather than TAG_BITS_ALL 2018-03-15 09:55:42 -07:00
David Rowe
a7cd5a240a Fix "text" overlay not clipping to right and bottom margins 2018-03-15 17:31:02 +13: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
Seth Alves
93978209d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-14 13:49:46 -07:00
Seth Alves
21088cfbcc Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-14 09:00:21 -07:00
David Rowe
966d711e56 Fix Window.raiseMainWindow() 2018-03-14 13:38:48 +13:00
David Rowe
025d2807f4 Fix Window.setFocus() JSDoc 2018-03-14 12:59:27 +13:00
David Rowe
c8b4217a96 Fix Window.hasFocus() 2018-03-14 12:57:23 +13:00
Seth Alves
602bc37b1a oops 2018-03-13 16:39:56 -07:00
Seth Alves
271badfa62 provide an overlay property to control if the overlay is visible in the secondary camera view 2018-03-13 16:33:32 -07:00
SamGondelman
4adc357534 apply taa to text and web entities/overlays 2018-03-13 11:57:14 -07: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
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android 
Android: Fix corruption on startup
 2018-03-12 15:03:07 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07: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
samcake
10016756b7 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-03-09 16:32:37 -08:00
Seth Alves
c781f88239 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-09 15:43:14 -08:00
Seth Alves
5b5ea11a18 changes to openUrl aren't needed for serverless domains 2018-03-09 15:43:05 -08:00
samcake
c78df4d967 Setting the correct Job config for ssao check box and fixing typo 2018-03-09 15:41:56 -08:00
samcake
fec30b8363 Fixing the menu for Shadow and AO to do the correct path to engine config 2018-03-09 15:04:14 -08:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00