Ken Cooke
|
ee6e9ee81e
|
Remove dead code left over from Gverb
|
2018-04-13 10:36:13 -07:00 |
|
Ken Cooke
|
a5feb07bdf
|
Merge pull request #12863 from kencooke/audio-gainadj-stereo
Support per-avatar gain adjustment on stereo input streams
|
2018-04-13 06:52:54 -07:00 |
|
Seth Alves
|
3830f65df5
|
Merge pull request #12875 from druiz17/update-baking-tools
Update baking script to include skyboxes.
|
2018-04-12 19:46:46 -07:00 |
|
John Conklin II
|
98f6899c3d
|
Merge pull request #12839 from SamGondelman/matMigrate
Migrate materials from userData to materialData
|
2018-04-12 18:24:33 -07:00 |
|
John Conklin II
|
fc487ea322
|
Merge pull request #12831 from ctrlaltdavid/21829
Model overlay fixes
|
2018-04-12 17:04:55 -07:00 |
|
John Conklin II
|
ec10fcb7b7
|
Merge pull request #12868 from SamGondelman/missingAlpha
Fix for missing alpha on server restart
|
2018-04-12 16:42:34 -07:00 |
|
John Conklin II
|
5322195eee
|
Merge pull request #12867 from ctrlaltdavid/21836-a
Fix location.protocol value for serverless domains
|
2018-04-12 16:28:31 -07:00 |
|
John Conklin II
|
3d90f93cf1
|
Merge pull request #12812 from SamGondelman/compression
Support ETC2/EAC compressed textures
|
2018-04-12 16:04:08 -07:00 |
|
John Conklin II
|
67a8e6c82e
|
Merge pull request #12824 from SamGondelman/matFix
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
|
2018-04-12 15:30:11 -07:00 |
|
John Conklin II
|
9123c05eb3
|
Merge pull request #12859 from samcake/one
Fix a bug when switching shadow on/off in front of mirror
|
2018-04-12 15:25:05 -07:00 |
|
John Conklin II
|
40ae2913eb
|
Merge pull request #12847 from SamGondelman/clientMat
Fix client-only materials on non-avatars
|
2018-04-12 14:53:34 -07:00 |
|
Stephen Birarda
|
e2e0a50dd2
|
Merge pull request #12879 from highfidelity/RC66
RC66 merge back to master
|
2018-04-12 14:12:59 -07:00 |
|
Ken Cooke
|
2593d224c5
|
CR feedback
|
2018-04-12 13:24:31 -07:00 |
|
John Conklin II
|
1834325970
|
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
set lastEditedBy in local tree whenever a script adds or edits an entity
|
2018-04-12 13:02:05 -07:00 |
|
John Conklin II
|
9ccf23ec94
|
Merge pull request #12866 from birarda/serverless-baked-skybox
RC66: use serverless content with baked skybox and help textures
|
2018-04-12 12:54:37 -07:00 |
|
John Conklin II
|
e47dca77ec
|
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
entity-server will expire stale simulation ownership
|
2018-04-12 12:04:52 -07:00 |
|
Sam Gateau
|
77a27b2be7
|
Merge pull request #12835 from NissimHadar/speedUp1
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
|
2018-04-12 11:48:09 -07:00 |
|
Sam Gateau
|
0857bf06b6
|
Merge pull request #12857 from NissimHadar/addMDtoAutoTester
Added recursive creation of MD files.
|
2018-04-12 11:45:18 -07:00 |
|
Seth Alves
|
46a741be7b
|
Merge pull request #12068 from vladest/move_to_qqc2
Move to qqc2
|
2018-04-12 11:26:55 -07:00 |
|
Sam Gateau
|
20ae247185
|
Merge pull request #12784 from Zvork/zeye
Potential bug correction when constructing eye position from Z-buffer depths in shaders
|
2018-04-12 11:10:09 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
MiladNazeri
|
9f7a765ec3
|
Merge pull request #12729 from ctrlaltdavid/21814
Settings API JSDoc
|
2018-04-11 11:48:15 -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 |
|
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 |
|