John Conklin II
|
9ccdf74235
|
Merge pull request #14179 from roxanneskelly/sysTraySubmenus
Sys tray submenus
|
2018-10-18 17:56:48 -07:00 |
|
John Conklin II
|
86cc612d73
|
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
make room for keyboard and help in SendAsset
|
2018-10-18 17:53:52 -07:00 |
|
John Conklin II
|
b2e84a8f3b
|
Merge pull request #14191 from howard-stearns/new-rez-images
new images for My Purchases rez tutorial
|
2018-10-18 17:50:30 -07:00 |
|
John Conklin II
|
5095a4e0eb
|
Merge pull request #14196 from sethalves/interstitial-domain-full
go to error-room when failing to connect to a full domain
|
2018-10-18 17:49:35 -07:00 |
|
John Conklin II
|
18df79a8a6
|
Merge pull request #14211 from amantley/crazylegs
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
|
2018-10-18 17:48:26 -07:00 |
|
John Conklin II
|
addae51976
|
Merge pull request #14215 from ctrlaltdavid/M19308
Hide mini tablet immediately upon near grabbing an entity
|
2018-10-18 17:47:17 -07:00 |
|
John Conklin II
|
3916b8e9d2
|
Merge pull request #14224 from roxanneskelly/Case19395Master
Fix for Case 19395
|
2018-10-18 17:24:40 -07:00 |
|
John Conklin II
|
1f06c87580
|
Merge pull request #14096 from Zvork/mipgen
Added generateTextureMipsWithPipeline function in gpu::Batch
|
2018-10-18 16:06:28 -07:00 |
|
John Conklin II
|
40a48777dc
|
Merge pull request #14231 from ctrlaltdavid/M16205a
Fix lasers going through tablet to drawInFrontOverlays
|
2018-10-18 15:36:29 -07:00 |
|
John Conklin II
|
0e6f4f3a60
|
Merge pull request #14142 from ctrlaltdavid/M16440
Fix audio overlay not working while in edit apps
|
2018-10-18 15:32:41 -07:00 |
|
David Rowe
|
490c085eb8
|
Merge branch 'master' into M16440
# Conflicts:
# scripts/system/controllers/controllerModules/hudOverlayPointer.js
# scripts/system/controllers/controllerModules/inVREditMode.js
|
2018-10-19 09:06:33 +13:00 |
|
David Rowe
|
9b4c5e1685
|
Fix OSX/Linux warnings
|
2018-10-19 08:20:21 +13:00 |
|
John Conklin II
|
1cc2569bd8
|
Merge pull request #13596 from SamGondelman/scriptvec3
Replace vec2, vec3, and xColor properties with JS prototypes
|
2018-10-18 09:47:56 -07:00 |
|
David Rowe
|
e339f966d9
|
Remove reference to a function no longer in the API
Noticed in passing.
|
2018-10-18 17:11:48 +13:00 |
|
David Rowe
|
1610d79023
|
Remove now redundant mouse pointer code that tried to do the same thing
|
2018-10-18 17:11:26 +13:00 |
|
David Rowe
|
c41ce5d484
|
Make tablet have priority over drawInFront overlays rendered behind it
|
2018-10-18 17:10:48 +13:00 |
|
John Conklin II
|
8e5bc1678f
|
Merge pull request #14219 from SamGondelman/materialCull
QueryAACube fixes and materials expand to include their parent
|
2018-10-17 15:15:23 -07:00 |
|
Roxanne Skelly
|
d4bc192be2
|
Fix for Case 19395
High Fidelity Console in client only install downloads default content assets for non-existent sandbox.
|
2018-10-17 14:09:55 -07:00 |
|
Sam Gondelman
|
3f117cd3e0
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:57:21 -07:00 |
|
Brad Hefta-Gaub
|
0e0542ec6e
|
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
|
2018-10-17 13:29:20 -07:00 |
|
Sam Gondelman
|
e3543cf098
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:10:29 -07:00 |
|
John Conklin II
|
7b226aa559
|
Merge pull request #14124 from SamGondelman/particle
Don't render particles without textures
|
2018-10-17 11:17:23 -07:00 |
|
John Conklin II
|
72c9f697ab
|
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
|
2018-10-17 11:16:28 -07:00 |
|
John Conklin II
|
e59e3720fe
|
Merge pull request #14139 from SamGondelman/animation
Fix various ResourceCache bugs
|
2018-10-17 11:13:35 -07:00 |
|
John Conklin II
|
eb088772d0
|
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
Fix "Good" collision not honoring mesh groups in OBJ files
|
2018-10-17 11:12:21 -07:00 |
|
Thijs Wenker
|
4ef2ad041b
|
Merge pull request #14136 from thoys/feat/create/exportSelection
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
|
2018-10-17 19:50:37 +02:00 |
|
John Conklin II
|
9f0b4fb437
|
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
|
2018-10-17 09:50:00 -07:00 |
|
Sam Gondelman
|
cba4a4139a
|
fix compile error
|
2018-10-16 18:25:17 -07:00 |
|
Anthony Thibault
|
cd3bb1fad2
|
Merge pull request #14165 from luiscuenca/fixSmallStep
Increase velocity increments when the avatar is really small.
|
2018-10-16 16:31:13 -07:00 |
|
Anthony Thibault
|
7f102727f2
|
Merge pull request #14166 from luiscuenca/fixJumpWhenSmall
Allow avatar to fly when its scale is very small
|
2018-10-16 16:28:00 -07:00 |
|
SamGondelman
|
49b496046b
|
queryAACube fixes
|
2018-10-16 14:35:39 -07:00 |
|
SamGondelman
|
ded8d4b547
|
variant conversions
|
2018-10-16 11:55:28 -07:00 |
|
John Conklin II
|
b5f6d9d3d8
|
Merge pull request #14205 from howard-stearns/tablet-login-change
new treatment for hmd/tablet login
|
2018-10-16 11:31:45 -07:00 |
|
Olivier Prat
|
6abffceb43
|
Mip generation texture slot is higher and doesn't interfere anymore
|
2018-10-16 09:39:32 +02:00 |
|
David Rowe
|
c9919ff69d
|
Hide mini tablet immediately upon near grabbing an entity
|
2018-10-16 08:22:30 +13:00 |
|
Thijs Wenker
|
f1885159d2
|
style fixes
|
2018-10-15 21:17:41 +02:00 |
|
Sam Gondelman
|
121fc7205c
|
Delete Default-Sky-9-cubemap.texmeta
|
2018-10-14 22:36:22 -07:00 |
|
amantley
|
05d3becd40
|
changed cg hips computation so that it is not computed when hmdleanrecenter is turned off
|
2018-10-12 17:03:34 -07:00 |
|
Howard Stearns
|
a92aa1f9da
|
new treatment for hmd/tablet login
|
2018-10-12 14:17:23 -07:00 |
|
Seth Alves
|
47d3c9ba27
|
go to error-room when failing to connect to a full domain
|
2018-10-12 11:28:54 -07:00 |
|
Howard Stearns
|
6c6d29152f
|
new images for My Purchases rez tutorial
|
2018-10-11 12:36:43 -07:00 |
|
Stephen Birarda
|
b31af8c9c6
|
Merge pull request #14052 from birarda/macos-10.14
updates for deprecating cmake policies and MacOS 10.14 build
|
2018-10-11 11:31:43 -07:00 |
|
Roxanne Skelly
|
6b05f7b030
|
Clicking on a user in the goto menu was taking one to the wrong user
|
2018-10-10 17:16:56 -07:00 |
|
Roxanne Skelly
|
af055bb45c
|
more bug fixes and cleanup of some console logging
|
2018-10-10 16:50:07 -07:00 |
|
Roxanne Skelly
|
f6a8383d53
|
Bugfixes
|
2018-10-10 15:49:22 -07:00 |
|
Howard Stearns
|
30971cd766
|
make room for keyboard and help in SendAsset
|
2018-10-10 15:43:20 -07:00 |
|
SamGondelman
|
9788aa307e
|
remove width/height/depth
|
2018-10-10 12:38:07 -07:00 |
|
Roxanne Skelly
|
0302fee23d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySubmenus
|
2018-10-10 11:48:30 -07:00 |
|
Roxanne Skelly
|
b052a12d16
|
Remove unnecessary logging.
|
2018-10-10 11:48:12 -07:00 |
|
SamGondelman
|
c10bb7d525
|
pointers
|
2018-10-08 18:05:09 -07:00 |
|