Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 01:07:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
66176 commits 75 branches 59 tags 1.2 GiB
Commit graph

66176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
Seth Alves
ae94ab3d67 make sure _sockAddr is cleared if the new url isn't a hifi:// one 2018-03-21 15:28:12 -07:00
Seth Alves
196f621a60 remove unneeded setSessionUUID 2018-03-21 15:21:49 -07:00
Ryan Huffman
dc694fb0b7 Update content backup downloads to be asynchronous 
Previously backups would be consolidated into a full .zip when the
backup was requested. Because of the potential for a large number of
assets, this could take awhile, causing a browser to fail due to timeout
before the backup was available. This change splits the download
endpoint into 2 parts - one to request information about a backup and
possibly kick off a consolidation, and another to request the actual
file once the consolidate backup is available.
 2018-03-21 15:02:38 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
Ryan Huffman
655636c44f Remove redundant if block in AssetServer.cpp 2018-03-21 12:16:12 -07:00
Ryan Huffman
42324d79f1 Remove unused DS settings.js change 2018-03-21 12:15:54 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
Stephen Birarda
e05ee55495
Merge pull request #12691 from huffman/fix/oven-exit-crash 
Fix crashes on exit because of ResourceManager thread destruction
 2018-03-21 11:56:06 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common 
Break out common GL and GLES code into a single shared library
 2018-03-21 11:28:24 -07:00
John Conklin II
5bd3d0fab9
Merge pull request #12647 from birarda/feat/client-only-installer 
add a CLIENT_ONLY build option and handle for installer
 2018-03-21 11:20:36 -07:00
John Conklin II
3937f43fa5
Merge pull request #12648 from SimonWalton-HiFi/serversExist-crash 
EntityScriptServer should wait for script engine to complete for deleting itself
 2018-03-21 11:19:50 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Ryan Huffman
00aa564d84 Fix crashes on exit because of ResourceManager thread destruction 2018-03-21 10:43:31 -07:00
John Conklin II
86afa211eb
Merge pull request #12674 from highfidelity/RC65.1 
Beta Release 65.1, includes up to build 7977
 2018-03-21 10:34:44 -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
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Sam Gateau
4341347148
Merge pull request #12639 from SamGondelman/aa 
Use correct platform-specific gpu library
 2018-03-20 14:47:26 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -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
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative 
Support relative paths for material images
 2018-03-20 14:24:50 -07:00
Stephen Birarda
cfdf8c2588 handle launch client option for client only 2018-03-20 14:22:37 -07:00
Stephen Birarda
45d16731c3 fix abort of setup options page for express client 2018-03-20 14:22:37 -07:00
Stephen Birarda
9a664f25dc setup custom or express label correctly in installer 2018-03-20 14:22:37 -07:00
Stephen Birarda
38606f83c8 add SERVER_ONLY handling for installer generation 2018-03-20 14:22:37 -07:00
Stephen Birarda
932c55ca08 handle client section in component-less install 2018-03-20 14:22:37 -07:00
Stephen Birarda
6ee6f88087 only add components to cmake for multi-component installer 2018-03-20 14:22:12 -07:00
Stephen Birarda
f93935f5f6 change PR build compression to bzip2 2018-03-20 14:21:52 -07:00
Stephen Birarda
c743bfcf27 templatize conditional for selection of server component 2018-03-20 14:21:52 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Bradley Austin Davis
a861be112f Fix GLES build 2018-03-20 14:15:38 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
John Conklin II
afcfbfe721
Merge pull request #12644 from Atlante45/feat/ga-installer 
Add Google Analytics to installer
 2018-03-20 12:07:29 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash 
Android - Prevent crash when setting the url property to _webSurface.
 2018-03-20 11:40:08 -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
Brad Davis
f77228bbfe Fixing missing m_pi define 2018-03-20 09:58:47 -07:00
Brad Davis
659da9b0e4 Merge remote-tracking branch 'upstream/master' into gl_common 2018-03-20 09:18:56 -07:00
Seth Alves
f61504b814 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-19 14:59:18 -07:00
Seth Alves
bc527d5ae8 try again on expandToLocalDataAbsolutePath 2018-03-19 14:59:10 -07:00
Atlante45
0117179fe4 Pull GA ID from env variables 2018-03-19 14:49:19 -07:00
Zach Fox
0b810c3aa8 Various fixes 2018-03-19 14:39:50 -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
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798 
Messages API JSDoc
 2018-03-19 13:56:57 -07:00
David Rowe
541d798a6b Update code comment 2018-03-20 09:53:57 +13:00
David Rowe
4b52c21d1c JSDoc that an entity's clientOnly property can be set at entity creation 2018-03-20 09:51:10 +13:00
Seth Alves
a623ba7499 expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url 2018-03-19 13:48:31 -07:00