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

66121 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
9275fe1f7d Update backup downloads to use .content.zip extension 2018-03-15 12:47:51 -07:00
Atlante45
bbe98f61a6 Pull GUID storage in Registry for now. 2018-03-15 12:20:19 -07:00
Stephen Birarda
499defe77e grab VS2013 redistributables that are needed by externals 2018-03-15 12:20:07 -07:00
Ryan Huffman
6552aeac4d Fix quazip not building with correct build type 2018-03-15 12:17:35 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
Seth Alves
a64f0d2779 if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done. 2018-03-15 11:39:05 -07:00
Seth Alves
8a0b8aa034 make tablet invisible in secondary-camera if wallet passphrase page is up 2018-03-15 11:01:13 -07:00
Seth Alves
a5b94f22fa works now 2018-03-15 10:31:55 -07:00
John Conklin II
a7dc2cd12e
Merge pull request #12645 from sethalves/rename-getpos3 
Rename getpos3
 2018-03-15 10:02:00 -07:00
Seth Alves
bb370caccc Merge branch 'overlay-visible-in-2nd-cam' of github.com:sethalves/hifi into overlay-visible-in-2nd-cam 2018-03-15 09:56:07 -07:00
Seth Alves
72d2253297 Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-15 09:55:48 -07:00
Seth Alves
b22e0f6209 use TAG_BITS_1 for cam rather than TAG_BITS_ALL 2018-03-15 09:55:42 -07:00
Seth Alves
f1b81731c1 Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-15 09:52:37 -07:00
David Rowe
a7cd5a240a Fix "text" overlay not clipping to right and bottom margins 2018-03-15 17:31:02 +13:00
Bradley Austin Davis
b25beeb10b
Merge pull request #12640 from jherico/fix/web_process 
Don't leave trash web processes when changing web entity urls
 2018-03-14 19:40:13 -07:00
David Rowe
63e07f1a7f Fix typo in developer Messages test script 2018-03-15 15:23:46 +13:00
David Rowe
369970f120 Messages API JSDoc 2018-03-15 15:23:02 +13:00
Ken Cooke
b1dd63cfd3
Merge pull request #12619 from kencooke/audio-src-kernel-128 
Improved audio quality for streaming music
 2018-03-14 18:30:23 -07:00
Stephen Birarda
10dd16ae8d remove VS redist handling from NSIS template 2018-03-14 17:59:04 -07:00
Simon Walton
4fd6eb559b Remove dangling packet sender pointer before it's invalid. 2018-03-14 17:06:38 -07:00
Zach Fox
2d57c444b6 Don't auto apply 'updatable' filter 2018-03-14 16:02:33 -07:00
Seth Alves
afcbb6751b disable loading of serverless-domains over http(s), for now 2018-03-14 15:53:35 -07:00
Sam Gondelman
46bbfc2680
Merge pull request #12643 from gcalero/keyboard_crashing 
Possible fix for keyboard crash
 2018-03-14 15:53:17 -07:00
Zach Fox
cc4726b24b Some bugfixes 2018-03-14 15:47:19 -07:00
Gabriel Calero
d0f1aa9020 Refactor fix for keyboard crash 2018-03-14 19:18:42 -03:00
Cristian Luis Duarte
379fa9783f No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized 2018-03-14 19:09:21 -03:00
Seth Alves
ee515a44e7 Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3 2018-03-14 14:56:50 -07:00
Zach Fox
f3efdda6b0 Fix content set filter 2018-03-14 14:34:15 -07:00
Seth Alves
e63558dc05 code review 2018-03-14 14:33:17 -07:00
Atlante45
2fe9f6df6f Add google analytics to installer 2018-03-14 14:17:38 -07:00
Gabriel Calero
e744edc6a0 Possible fix for keyboard crash 2018-03-14 18:11:23 -03:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script 
Stop server-script URLs when deleted from entity properties (case 11244)
 2018-03-14 14:01:01 -07:00
Seth Alves
93978209d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-14 13:49:46 -07:00
Sam Gondelman
815260933a
Merge pull request #12642 from gcalero/android_change_default_mode 
Change default mode to My View in Android
 2018-03-14 13:47:16 -07:00
Simon Walton
d67044f220 EntityScriptServer should wait for script engine to finish when stopping 
Script engine will still running and using EntityEditPacketSender,
which is owned by EntityScriptServer, which was destroyed.
https://highfidelity.manuscript.com/f/cases/11071/
 2018-03-14 13:32:48 -07:00
Gabriel Calero
04decfa89c Merge remote-tracking branch 'upstream/master' into android_change_default_mode 2018-03-14 16:49:41 -03:00
Sam Gondelman
ba0c273614
Merge pull request #12641 from SamGondelman/android 
Update gpu-gles based on TAA PR
 2018-03-14 12:41:24 -07:00
Cristian Luis Duarte
80abe1865a Remove unused variable thisPointConsumed 2018-03-14 16:22:24 -03:00
SamGondelman
e59af8892a make same changes to gles backend from taa pr 2018-03-14 12:09:59 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
Brad Davis
baa4dc3383 Don't leave trash web processes when changing web entity urls 2018-03-14 11:38:46 -07:00
Zach Fox
6647475f5c Wrong sign 2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Gabriel Calero
884da98466 Change default mode to My View (android) 2018-03-14 14:50:44 -03:00
Seth Alves
2fd6bc4130 rename Mesh api getPos3 to getPos, deprecate but still support getPos3 2018-03-14 10:24:44 -07:00
Zach Fox
6d45d69ed8 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-14 09:54:16 -07:00
Zach Fox
70b3d0fe5f Merge branch 'filterBar' into commerce_upgrades_1 2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Sam Gateau
2487e34ee8
Merge pull request #12633 from SamGondelman/aa 
Fix HUD sphere rendering after TAA changes
 2018-03-14 09:26:25 -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