Commit graph

66718 commits

Author SHA1 Message Date
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
John Conklin II
ef133806be
Merge pull request #12813 from ctrlaltdavid/21826
Fix Controller.getActions(), .getHardware(), and .getStandard()
2018-04-12 10:42:25 -07:00
John Conklin II
b0a88617a0
Merge pull request #12807 from ElderOrb/FB13962
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
2018-04-12 10:37:05 -07:00
John Conklin II
67b1313fb6
Merge pull request #12669 from ElderOrb/FB13143
Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser
2018-04-12 10:34:58 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage
Bugfix for #12759 Overlays.editOverlay not applying subImage property
2018-04-12 10:34:17 -07:00
John Conklin II
7bcaa12c50
Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix
Typo corrected: getAnimatationRoles to getAnimationRoles
2018-04-12 10:32:09 -07:00
Simon Walton
5c141aa5e9 Add --disableWatchdog command-line option
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
2018-04-12 09:28:28 -07:00
Dante Ruiz
74f7a33a74 undo some changes 2018-04-12 09:24:32 -07:00
Dante Ruiz
5fdcd12375 add baking of skyboxes 2018-04-12 09:20:46 -07:00
Seth Alves
32e7e5087e
Merge pull request #12668 from alexiamandeville/marketplace-update
Updating repo script to match marketplace script
2018-04-12 09:20:03 -07:00
Simon Walton
888fca2127 Qualify getName in task template to satisfy gcc 2018-04-11 18:31:09 -07:00
Simon Walton
adcf991125 Improvements to profiling data capture
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
2018-04-11 17:36:32 -07:00
NissimHadar
c458b587ac Completed creation of testsOutline.md. 2018-04-11 16:50:27 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert
Fix asserts on domain switch
2018-04-11 16:02:45 -07:00
David Rowe
c2f0f7ef5f Doc review 2018-04-12 10:54:35 +12:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue
Hack: Adding more budget options for memory texture
2018-04-11 15:46:08 -07:00
Stephen Birarda
2759f3a51c
Merge pull request #12869 from highfidelity/RC66
RC66 merge back to master
2018-04-11 15:11:34 -07:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
Dante Ruiz
cdc248129c fix grab.js 2018-04-11 14:25:06 -07:00
SamGondelman
3270409b7b possible fix for missing alpha on server restart 2018-04-11 14:06:30 -07:00
David Rowe
b82f2510f2 Fix location.protocol value for serverless domains 2018-04-12 08:55:47 +12:00
Stephen Birarda
16f6ac5295 use serverless content with baked skybox and help textures 2018-04-11 13:53:13 -07:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813
Fix Window API position and size reporting
2018-04-11 13:48:21 -07:00
Dante Ruiz
9b97e408f5 update branch with rc66 2018-04-11 13:48:17 -07:00
John Conklin II
005b55f997
Merge pull request #12853 from birarda/new-serverless-tutorial
RC66: fix unreadable baked textures in serverless tutorial
2018-04-11 13:44:21 -07:00
John Conklin II
42a3834e1a
Merge pull request #12772 from howard-stearns/commerce-workaround-for-broken-qt5.10
Commerce workaround for broken qt5.10
2018-04-11 13:08:42 -07:00
SamGondelman
e0b2c076ef cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822
Fix text sizing per text3d overlay lineHeight property
2018-04-11 12:16:51 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
2018-04-11 12:08:35 -07:00
John Conklin II
19bf793910
Merge pull request #12761 from ctrlaltdavid/21821
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
2018-04-11 12:07:32 -07:00
John Conklin II
2f4bc5bd04
Merge pull request #12701 from misslivirose/fix-edit-grid-color
Fix for grid color changes not applying
2018-04-11 12:06:09 -07:00
John Conklin II
b2bc2b6e43
Merge pull request #12852 from birarda/client-only-installer-name
RC66: remove the installer information file during uninstall
2018-04-11 12:02:46 -07:00
John Conklin II
28168e6e45
Merge pull request #12699 from misslivirose/fix/save-settings-for-editing
Fix for edit preferences not persisting
2018-04-11 11:59:58 -07:00
Seth Alves
625905007f use new filename for new blob 2018-04-11 11:49:53 -07:00
MiladNazeri
9f7a765ec3
Merge pull request #12729 from ctrlaltdavid/21814
Settings API JSDoc
2018-04-11 11:48:15 -07:00
Seth Alves
366498c6d3 switch to backtrace's newer crashpad blob 2018-04-11 11:44:49 -07:00
Ken Cooke
537e54e9d4 Optimize the mixing loops 2018-04-11 10:54:31 -07:00
Dante Ruiz
67ec766af2 saving work. 2018-04-11 10:24:01 -07:00
Ken Cooke
48ddfb09c2 Support per-avatar gain adjustment on stereo input streams 2018-04-11 10:08:33 -07:00
Zach Fox
539fd42324 Reduce logging from some Commerce/Discovery features 2018-04-11 09:41:47 -07:00
Zach Fox
a411760f0c Finally fix the grey security pic bug! 2018-04-11 09:41:47 -07:00
Zach Fox
0870a083e3 Prevent the Bubble icon from ever blinking as per 14026 2018-04-11 09:41:47 -07:00
Zach Fox
feec52b4bb Cleanup 'Private' HMD Preview State Machine Logic 2018-04-11 09:41:47 -07:00
Zach Fox
dc3e1751cb Commerce: Gifts 2018-04-11 09:41:47 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError
Commerce: Fix Certificate Info error
2018-04-11 09:38:43 -07:00
Sam Gateau
167db14bdb restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off 2018-04-11 00:00:11 -07:00
NissimHadar
60f4c6788f Added creation of tests outline .MD file. 2018-04-10 23:04:56 -07:00
NissimHadar
8e063a600b Added recursive creation of MD files. 2018-04-10 20:16:36 -07:00
Stephen Birarda
7ec65e8c0c fix unreadable baked textures in serverless tutorial 2018-04-10 17:02:37 -07:00