Seth Alves
|
dfbd6bcd8d
|
Merge pull request #11933 from druiz17/fix-far-to-equip
fix far grab to equip transition
|
2017-12-08 07:04:54 -08:00 |
|
Seth Alves
|
a6a45bc359
|
Merge pull request #11936 from ElderOrb/FB10108
10108 marketplace category cannot scroll
|
2017-12-08 07:02:15 -08:00 |
|
Seth Alves
|
eda63e5758
|
Merge pull request #11919 from ElderOrb/FB9706
9706 Editing Attachments Results In Attachments Window Scrolling To Top
|
2017-12-08 07:01:00 -08:00 |
|
MandatoryMania
|
f1808ee126
|
Merge pull request #11943 from MandatoryMania/returnToMarketplace
return to main mktplace page from rez page
|
2017-12-07 19:14:37 -08:00 |
|
Howard Stearns
|
d9ee42d379
|
Merge pull request #11949 from davidkelly/dk/fixForGnomesAndMore
Fix certificate hash
|
2017-12-07 18:55:59 -08:00 |
|
David Kelly
|
42b509639b
|
Fix certificate hash
|
2017-12-07 17:22:00 -08:00 |
|
Andrew Meadows
|
ed231fa4a1
|
Merge pull request #11894 from hyperlogic/bug-fix/flying
Improvements to HMD flying
|
2017-12-07 16:31:33 -08:00 |
|
Andrew Meadows
|
4691a98509
|
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
domain uses min/max avatar height instead of min/max scale
|
2017-12-07 16:29:15 -08:00 |
|
Sam Gondelman
|
e7d7e9abb8
|
Merge pull request #11947 from ctrlaltdavid/21634
Move mouse and hover slots out of Overlays API
|
2017-12-07 14:47:01 -08:00 |
|
Zach Fox
|
4b3c61178c
|
Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys
Don't send commerce requests to backend if cached public keys is empty
|
2017-12-07 14:31:09 -08:00 |
|
Sam Gondelman
|
b05e1f8a32
|
Merge pull request #11847 from SamGondelman/overlayFlash
Cleanup Web3DOverlay and tablet home button
|
2017-12-07 14:06:56 -08:00 |
|
David Rowe
|
fd38b89f35
|
Move mouse and hover slots out of Overlays API
|
2017-12-08 10:58:52 +13:00 |
|
Dante Ruiz
|
4110295677
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-far-to-equip
|
2017-12-07 13:42:26 -08:00 |
|
H Q
|
72ed3b077d
|
Addressed PR change requests
|
2017-12-07 11:28:40 -08:00 |
|
Andrew Meadows
|
813c4fa38a
|
Merge pull request #11915 from druiz17/fix-collision-mask-for-children
If hold actions are added to entity update the collision mask for the children aswell
|
2017-12-07 11:16:50 -08:00 |
|
Anthony J. Thibault
|
47b52238d9
|
code review feedback
|
2017-12-07 10:49:23 -08:00 |
|
Anthony J. Thibault
|
68ad27a38d
|
Merge branch 'master' into bug-fix/flying
|
2017-12-07 10:28:13 -08:00 |
|
Anthony J. Thibault
|
b5ffda6911
|
const fix
|
2017-12-07 10:09:09 -08:00 |
|
Anthony J. Thibault
|
095bedcd3f
|
code review feedback
|
2017-12-07 10:08:18 -08:00 |
|
Anthony J. Thibault
|
fbcecbfc89
|
Merge branch 'master' into feature/domain-limited-height
|
2017-12-07 10:01:33 -08:00 |
|
Zach Fox
|
21077da41a
|
Don't send requests to backend if cached public keys is empty
|
2017-12-07 09:48:06 -08:00 |
|
Sam Gondelman
|
99c52f8602
|
coding standards
|
2017-12-07 09:38:14 -08:00 |
|
Brad Hefta-Gaub
|
4f8a2ea4be
|
Merge pull request #11934 from ctrlaltdavid/21630
Fix cloned 3D overlays' dimensions
|
2017-12-07 09:24:01 -08:00 |
|
Brad Hefta-Gaub
|
a0457d2b5e
|
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
Use PrioritySortUtil for avatar updates from avatar-mixer
|
2017-12-07 09:22:52 -08:00 |
|
Brad Hefta-Gaub
|
88ed15aaaa
|
Merge pull request #11942 from ctrlaltdavid/21633
Fix image overlay's subImage property's width and height support
|
2017-12-07 09:19:43 -08:00 |
|
Brad Hefta-Gaub
|
b91909011a
|
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049
[Case 7049]: Remove unused fields and checkboxes from Edit.js
|
2017-12-07 09:18:26 -08:00 |
|
Brad Hefta-Gaub
|
ac3bd5042f
|
Merge pull request #11890 from dback2/mirrorissues3
Secondary camera frame buffer / texture fixes
|
2017-12-07 09:17:27 -08:00 |
|
Bradley Austin Davis
|
2bd24ee7a2
|
Merge pull request #11940 from birarda/bug/grab-latest-vcredist
grab latest VC redistributables from MS during INSTALL
|
2017-12-06 17:32:10 -08:00 |
|
Bradley Austin Davis
|
3e6bea14e6
|
Merge pull request #11922 from jherico/opt/scene
Scene threading optimizations
|
2017-12-06 17:23:58 -08:00 |
|
John Conklin II
|
fffcf56904
|
Merge pull request #11892 from SamGondelman/snapshot
Expose Window.getDeviceSize()
|
2017-12-06 16:44:08 -08:00 |
|
H Q
|
ed76ca8018
|
return to main mktplace page from rez page
|
2017-12-06 15:37:19 -08:00 |
|
David Rowe
|
d61f0584c3
|
Fix diectory.js script's icon URL
|
2017-12-07 12:26:29 +13:00 |
|
David Rowe
|
efd72be96f
|
Fix image overlay's subImage property's width and height support
|
2017-12-07 12:05:46 +13:00 |
|
Bradley Austin Davis
|
2a91e98813
|
Fix iterator names
|
2017-12-06 14:26:07 -08:00 |
|
Brad Davis
|
e626ca3ccd
|
Working on scene threading optimizations
|
2017-12-06 14:26:07 -08:00 |
|
Dante Ruiz
|
32fca16c85
|
fix radius equiping
|
2017-12-06 14:16:32 -08:00 |
|
Zach Fox
|
f88a72894d
|
Merge pull request #11937 from zfox23/commerce_dataTracking1
Commerce Data Tracking: Iteration One
|
2017-12-06 14:07:04 -08:00 |
|
Zach Fox
|
5f3b148baa
|
Fix marketplace icon incorrectly appearing active
|
2017-12-06 13:01:23 -08:00 |
|
Stephen Birarda
|
99b5b8942a
|
add file download command to install step
|
2017-12-06 12:15:42 -08:00 |
|
Stephen Birarda
|
008b4285f5
|
don't use cmake sys library install, grab vcredist as external
|
2017-12-06 11:35:14 -08:00 |
|
Stephen Birarda
|
c329a58c14
|
ignore vcredist when performing fixup_bundle
|
2017-12-06 11:26:34 -08:00 |
|
Dante Ruiz
|
0f3a70553c
|
fix dynamic entities that are parented to your avatar
|
2017-12-06 11:18:15 -08:00 |
|
Zach Fox
|
3183a1a8b9
|
Add setupAttemptID to every step (thanks Dave)
|
2017-12-05 16:48:30 -08:00 |
|
David Rowe
|
cafebf6a7e
|
Fix Unix build warnings and tidy initializers
|
2017-12-06 13:38:42 +13:00 |
|
Dante Ruiz
|
36aa0ae476
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
|
2017-12-05 15:48:45 -08:00 |
|
Dante Ruiz
|
8af1d8d8d0
|
dont run code if not nesscassry
|
2017-12-05 15:48:09 -08:00 |
|
Alexander Ivash
|
c007c6d00f
|
10108 marketplace category cannot scroll
|
2017-12-06 02:47:19 +03:00 |
|
David Rowe
|
e074bd85f9
|
Fix shape of cloned shape overlay
|
2017-12-06 12:29:09 +13:00 |
|
David Rowe
|
2752dc7cac
|
Fix dimensions of cloned cube, sphere, shape, and model overlays
|
2017-12-06 12:28:55 +13:00 |
|
Zach Fox
|
902064ed37
|
Cleanup debug stuff
|
2017-12-05 15:26:55 -08:00 |
|