NissimHadar
|
3f37024c55
|
Merge branch 'master' of github.com:highfidelity/hifi into 21691-improveNitpickWebPage
|
2019-03-21 08:35:32 -07:00 |
|
Howard Stearns
|
5888adfd90
|
update terms of service links
|
2019-03-20 17:08:42 -07:00 |
|
David Back
|
0883e5118d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster
|
2019-03-20 16:36:07 -07:00 |
|
David Back
|
f42f6096c7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterOldUnityVersionsFixMaster
|
2019-03-20 16:26:35 -07:00 |
|
NissimHadar
|
b12a268464
|
Fixed copy-paste-drink too much error
|
2019-03-20 16:25:59 -07:00 |
|
Thijs Wenker
|
e767254710
|
Merge pull request #15194 from dback2/avatarExporter0.3.5ToMaster
Case 21732: Avatar Exporter 0.3.5 to master
|
2019-03-21 00:02:24 +01:00 |
|
Ken Cooke
|
3186a94682
|
Add Users.setInjectorGain() and Users.getInjectorGain() to the scripting interface
|
2019-03-20 15:48:05 -07:00 |
|
Simon Walton
|
8947d4d133
|
When adding new Node clear any dangling Connection objects to its address
|
2019-03-20 15:45:06 -07:00 |
|
Roxanne Skelly
|
3775633cc3
|
Case 20407 - Pay-In API doesn't display error when no username specified
|
2019-03-20 15:29:13 -07:00 |
|
Shannon Romano
|
e256c34823
|
Merge pull request #15191 from roxanneskelly/Case21467
Case 21728 - tab in marketplace search bar causes an update of search results
|
2019-03-20 14:22:10 -07:00 |
|
Shannon Romano
|
a6d4f98ee7
|
Merge pull request #15204 from roxanneskelly/Case21025
Case 21025 conditionalizing TabletWebView features
|
2019-03-20 14:21:37 -07:00 |
|
Shannon Romano
|
560459f491
|
Merge pull request #14916 from SimonWalton-HiFi/dissectors-add-audiosolorequest
Dissectors - Add AudioSoloRequest, BulkAvatarTraitsAck
|
2019-03-20 12:46:02 -07:00 |
|
Howard Stearns
|
3085ea212d
|
Merge pull request #15186 from howard-stearns/make-placename-consistent-with-hostname-after-domain-reset
make placename consistent with hostname after domain reset
|
2019-03-20 12:18:32 -07:00 |
|
Thijs Wenker
|
20c3a36308
|
Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed
Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]
|
2019-03-20 19:43:37 +01:00 |
|
Andrew Meadows
|
9d11e44b4b
|
update AvatarEntity trait when parentID changes
|
2019-03-20 11:37:16 -07:00 |
|
Roxanne Skelly
|
7fc2a52022
|
Merge pull request #15226 from roxanneskelly/Case21392
Case 21392 - Excise unneeded code from marketplacesInject.js
|
2019-03-20 10:16:24 -07:00 |
|
Shannon Romano
|
4ac25121e0
|
Merge pull request #15190 from roxanneskelly/Case20393
Case20393 - Add item counts to interface categories
|
2019-03-19 17:53:30 -07:00 |
|
Roxanne Skelly
|
27fa0dc4c6
|
CR fixes
|
2019-03-19 17:24:19 -07:00 |
|
Shannon Romano
|
e847c35b28
|
Merge pull request #15223 from roxanneskelly/Case21807
Case 21807 - updatable items not showing up as updatable after clicking 'show updates' button. (master)
|
2019-03-19 17:19:22 -07:00 |
|
Roxanne Skelly
|
ab61f65ea2
|
CR fix
|
2019-03-19 17:08:04 -07:00 |
|
Roxanne Skelly
|
640b05304a
|
Case 21392 - Excise unneeded code from marketplacesInject.js
|
2019-03-19 16:24:07 -07:00 |
|
Thijs Wenker
|
19c51b25d1
|
don't ignore updates that originate from entityPropertiesTool itself
|
2019-03-20 00:18:21 +01:00 |
|
Simon Walton
|
775eddc265
|
Agent requires the ModelCache singleton for zone entities w/ meshes
|
2019-03-19 16:16:53 -07:00 |
|
Howard Stearns
|
44f897fbd2
|
Merge pull request #15216 from howard-stearns/allow-base-url-to-be-specified-in-fst
allow baseURL to be specified in fst
|
2019-03-19 13:56:27 -07:00 |
|
Roxanne Skelly
|
94739aa7c7
|
Case 21769 - updatable items not showing up as updatable
after clicking 'show updates' button.
|
2019-03-19 13:44:16 -07:00 |
|
NissimHadar
|
51ab8880e9
|
Corrected labels.
|
2019-03-19 13:25:40 -07:00 |
|
Sam Gateau
|
d88bee89e4
|
Merge pull request #15176 from sabrina-shanman/hfm_oven_wip
(case 21205) Incorporate HFM in Oven + Add FST baking/output + More Oven Improvements
|
2019-03-19 13:03:49 -07:00 |
|
Howard Stearns
|
61fb65b5a4
|
don't set _url, so that cache_clearing works
|
2019-03-19 12:41:58 -07:00 |
|
Roxanne Skelly
|
80a1eaa3fd
|
Merge pull request #15215 from roxanneskelly/Case21790
Stand-alone Tagging: tagged places not coming first in GOTO list
|
2019-03-19 11:25:43 -07:00 |
|
NissimHadar
|
718eed8d5b
|
Corrected typo.
|
2019-03-19 09:58:44 -07:00 |
|
Brad Davis
|
ad2c4718a3
|
Fix loading relative files
|
2019-03-19 09:32:44 -07:00 |
|
howard-stearns
|
0e4d3b2aeb
|
allow baseURL to be specified in fst
|
2019-03-18 17:40:54 -07:00 |
|
Roxanne Skelly
|
b6e583087e
|
Stand-alone Tagging: tagged places not coming first in GOTO list
|
2019-03-18 17:40:01 -07:00 |
|
sabrina-shanman
|
fa6a94f16a
|
Fix not mapping identical URLs in DomainBaker
|
2019-03-18 17:21:05 -07:00 |
|
sabrina-shanman
|
b0b4307f27
|
Fix unsupported model types preventing DomainBaker from finishing
|
2019-03-18 17:02:49 -07:00 |
|
sabrina-shanman
|
e6487332e8
|
Attempt to fix linker error with Android and draco in BuildDracoMeshTask.cpp
|
2019-03-18 17:02:44 -07:00 |
|
sabrina-shanman
|
e4cafced2a
|
Re-name GRAP_KEY to GRAB_KEY in DomainBaker.cpp
|
2019-03-18 16:49:09 -07:00 |
|
sabrina-shanman
|
64fbf51ac2
|
Warn if baked mesh is empty for OBJBaker
|
2019-03-18 16:49:09 -07:00 |
|
sabrina-shanman
|
266f3a8ad8
|
Warn if handleFinishedTextureBaker doesn't recognize the sender
|
2019-03-18 16:49:09 -07:00 |
|
sabrina-shanman
|
cf40ed953b
|
Do not create temporary directory in ModelBaker and copy model directly to the original output folder
|
2019-03-18 16:49:09 -07:00 |
|
sabrina-shanman
|
c29b3a8c35
|
Bypass signals in JSBaker/MaterialBaker when resource is already loaded
|
2019-03-18 16:49:09 -07:00 |
|
sabrina-shanman
|
bc3b35aad3
|
Do not consolidate source images by file for now, since they may have the same filename but different paths
|
2019-03-18 16:49:00 -07:00 |
|
sabrina-shanman
|
0990b56952
|
Better avoid overwriting textures in ModelBaker::compressTexture
|
2019-03-18 16:48:47 -07:00 |
|
SamGondelman
|
7a5bbb8f6f
|
fix laser ghosting
|
2019-03-18 14:53:11 -07:00 |
|
Roxanne Skelly
|
fe28eaca7c
|
fix typo
|
2019-03-18 11:23:48 -07:00 |
|
milad
|
6ed4937dc0
|
Updated engine code to not emit if dominant hand isn't actually changed
|
2019-03-18 10:12:32 -07:00 |
|
Wayne Chen
|
db22fa9eec
|
show up audio screen using Settings > Audio
|
2019-03-18 09:23:17 -07:00 |
|
danteruiz
|
2ab8eb98e8
|
better implementation
|
2019-03-17 14:00:41 -07:00 |
|
danteruiz
|
5f3e31b119
|
add ui to kick api
|
2019-03-15 18:15:18 -07:00 |
|
Thijs Wenker
|
714115adef
|
- Video, and new Docs url in QML
|
2019-03-16 02:09:01 +01:00 |
|