Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Howard Stearns
|
6f011b70ac
|
Merge pull request #13358 from howard-stearns/drill-down-to-place-and-stack-goto-cards
MS15788: drillDownToPlace and isStacked based on server data.
|
2018-06-12 16:18:54 -07:00 |
|
Zach Fox
|
ffb9a47be0
|
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-12 15:10:22 -07:00 |
|
Anthony Thibault
|
027c4f6b9e
|
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68
Large avatars should instantly shrink when entering small height domains
|
2018-06-12 14:57:07 -07:00 |
|
Anthony Thibault
|
717093abf7
|
Merge pull request #13171 from luiscuenca/handTouchToDefault
Enable Avatar Hand Touch Script by Default
|
2018-06-12 14:54:26 -07:00 |
|
John Conklin II
|
8816aa4376
|
Merge pull request #13223 from highfidelity/RC68
Beta Release 68 - branched at Developer Release 8318
|
2018-06-12 14:04:19 -07:00 |
|
howard-stearns
|
05d3f92867
|
drillDownToPlace and iStacked based on server data.
|
2018-06-12 13:18:44 -07:00 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Zach Fox
|
cf9cf45d02
|
Merge pull request #13348 from zfox23/MS14129_buyButtonStuck
Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state
|
2018-06-12 11:02:52 -07:00 |
|
Luis Cuenca
|
9126a6f66d
|
hide debug lines
|
2018-06-12 10:12:28 -07:00 |
|
John Conklin II
|
ae795115f2
|
Merge pull request #13352 from AndrewMeadows/RC68-without-PR13162
Rc68 without pr13162
|
2018-06-12 09:40:07 -07:00 |
|
Zach Fox
|
860f9db939
|
Remove logging
|
2018-06-12 09:25:09 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
Zach Fox
|
14034f29a1
|
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-11 17:10:09 -07:00 |
|
Sam Gateau
|
f769b63c3d
|
Merge pull request #13308 from jherico/fix/13677
Fix for black text rendering white in web elements
|
2018-06-11 16:17:31 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
Zach Fox
|
a90283e54f
|
Merge pull request #13328 from zfox23/MS15673_bubbleResizeExperiment
MS15673: Do some experiments on bubble size
|
2018-06-11 15:30:34 -07:00 |
|
Stephen Birarda
|
1b42ddd898
|
Merge pull request #13252 from birarda/bug/sandbox-backup-instructions
remove confusing sandbox content update/backup system
|
2018-06-11 14:04:07 -07:00 |
|
Stephen Birarda
|
7509e4237f
|
Merge pull request #13253 from Atlante45/fix/sandbox-logs
Move Sandbox logs to AppDataLocal
|
2018-06-11 13:46:41 -07:00 |
|
Zach Fox
|
7fbc7bf1a5
|
Merge pull request #13347 from zfox23/MS15721_deleteApp
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-11 13:28:05 -07:00 |
|
Zach Fox
|
688d82b286
|
Go back to 60%
|
2018-06-11 13:23:41 -07:00 |
|
Zach Fox
|
dbd10cc2f0
|
Merge branch 'master' of github.com:highfidelity/hifi into MS15673_bubbleResizeExperiment
|
2018-06-11 13:20:34 -07:00 |
|
John Conklin II
|
9db71fb40d
|
Merge pull request #13322 from dback2/fixEquipMessage
Fix Hifi-Grab-Hand message for equipping
|
2018-06-11 13:16:39 -07:00 |
|
Sam Gateau
|
82eec46402
|
Merge pull request #13346 from jherico/fix/particle_shader
Fix particle entity shader
|
2018-06-11 12:10:47 -07:00 |
|
Stephen Birarda
|
b41c80f31e
|
Merge pull request #13221 from huffman/feat/oven-cli-texture-options
Add more texture options to Oven CLI
|
2018-06-11 12:01:56 -07:00 |
|
Zach Fox
|
a5ef3fa729
|
Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state
|
2018-06-11 12:00:51 -07:00 |
|
Zach Fox
|
15129e37db
|
Merge pull request #13341 from zfox23/MS13761_hideOverlayFix
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-11 11:44:26 -07:00 |
|
John Conklin II
|
6794fedf5b
|
Merge pull request #13337 from ctrlaltdavid/21887
Don't save user location if not connected to domain
|
2018-06-11 11:09:57 -07:00 |
|
Anthony J. Thibault
|
f773aef053
|
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
|
2018-06-11 11:06:21 -07:00 |
|
Clement
|
ffac96d0a0
|
Migrate old logs
|
2018-06-11 11:00:08 -07:00 |
|
Clement
|
75bb6e5211
|
Store sandbox log in appdata local
|
2018-06-11 11:00:08 -07:00 |
|
Zach Fox
|
56bd7e3d37
|
Remove dead function declaration from header
|
2018-06-11 10:58:01 -07:00 |
|
Stephen Birarda
|
0fd0a64e7f
|
Merge pull request #13118 from huffman/feat/010-templates
Add fbx + ktx templates
|
2018-06-11 10:52:32 -07:00 |
|
Stephen Birarda
|
be64f4bcbf
|
Merge pull request #12917 from kitely/cmake-fixes
CMake fixes
|
2018-06-11 10:51:49 -07:00 |
|
Stephen Birarda
|
743cb7c7e8
|
Merge pull request #13241 from Atlante45/fix/corrupted-backup
Don't mark backups from domains with no asset server corrupted
|
2018-06-11 10:50:16 -07:00 |
|
Stephen Birarda
|
10e34000aa
|
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains
Domain-unreachable message remaining on slow connects
|
2018-06-11 10:46:55 -07:00 |
|
Zach Fox
|
c26b03f480
|
Cleanup
|
2018-06-11 10:40:13 -07:00 |
|
John Conklin II
|
d5b8570ef6
|
Merge pull request #13343 from ctrlaltdavid/21888
Fix tablet attaching to hand while far-grabbing an entity
|
2018-06-11 10:26:37 -07:00 |
|
Zach Fox
|
c7c06590ac
|
Merge branch 'master' of github.com:highfidelity/hifi into MS13761_hideOverlayFix
|
2018-06-11 10:16:35 -07:00 |
|
Howard Stearns
|
5ce122f148
|
Merge pull request #13307 from howard-stearns/infinite-scroll
Infinite scroll
|
2018-06-11 10:03:52 -07:00 |
|
Anthony J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -07:00 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Sam Gondelman
|
9c66ee412a
|
Merge pull request #13325 from Cristo86/patch-1
Use third person camera mode when switching to My View from Top View mode.
|
2018-06-11 09:36:29 -07:00 |
|
Sam Gondelman
|
535dc92213
|
Merge pull request #13334 from SamGondelman/tablet
Fix tablet not disappearing
|
2018-06-11 09:34:57 -07:00 |
|
Brad Davis
|
380137a660
|
Fix particle entity shader
|
2018-06-10 12:15:00 -07:00 |
|
howard-stearns
|
020d622302
|
don't depend on matching handlers with overlapping requests
|
2018-06-09 17:34:49 -07:00 |
|
howard-stearns
|
421edbfa1e
|
PSFListModel isa ListModel instead of hasa
|
2018-06-09 16:03:45 -07:00 |
|
howard-stearns
|
d2cf042a88
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-09 14:09:42 -07:00 |
|
SamGondelman
|
2dae613612
|
remove conserveResources
|
2018-06-08 17:58:06 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|