Commit graph

77306 commits

Author SHA1 Message Date
Thijs Wenker
c257f2fb07
Merge pull request #15245 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussedVR
Case 21877: [CreateApp] give onWebEventReceived the correct context in VR [RC82]
2019-03-22 00:51:21 +01:00
David Rowe
ba0923a3ad Fix signal summary text 2019-03-22 12:20:22 +13:00
David Rowe
025326b85f Remove custom @signal tag 2019-03-22 12:20:10 +13:00
David Rowe
4c7d5c7da7 Detect signal functions based on their return type 2019-03-22 12:19:20 +13:00
Thijs Wenker
5e35db1f76
Merge pull request #15199 from dback2/avatarExporterOldUnityVersionsFixMaster
Case 21751: Avatar Exporter v0.3.6 - fix 2017.4 Unity versions
2019-03-22 00:04:15 +01:00
Thijs Wenker
9a14cfc7df make sure that onWebEventReceived has the correct context in VR 2019-03-21 23:46:33 +01:00
Andrew Meadows
206792f851 don't queue AvatarEntity messages when not in domain 2019-03-21 15:00:11 -07:00
NissimHadar
b0e2b5fde1 Remove unneeded variable. 2019-03-21 14:47:48 -07:00
Shannon Romano
33e73953eb
Merge pull request #15163 from danteruiz/fix-laser-scaling
Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching
2019-03-21 13:13:18 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui
Case 21771: Possible Entity Scipt Ban Incident
2019-03-21 13:10:54 -07:00
NissimHadar
e913ea7859 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-21 12:48:47 -07:00
NissimHadar
1f0fe7d683 Merge branch 'master' of github.com:highfidelity/hifi into 21691-improveNitpickWebPage 2019-03-21 12:47:34 -07:00
NissimHadar
f7ad5a4d3c
Merge pull request #15160 from NissimHadar/21675-removeGetOperatingSystemTypeFromTestClass
Case 21675: removed redundant method.
2019-03-21 12:28:37 -07:00
SamGondelman
4fd2c4449d new procedural uniforms for time 2019-03-21 12:15:03 -07:00
Roxanne Skelly
87d75ec75c Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
Ken Cooke
7311c3ac06 Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-21 11:51:49 -07:00
Sabrina Shanman
2fd2d2cc5d
Merge pull request #15154 from SamGondelman/parentCollider
Case 8064: Child of animated model brings collider with it
2019-03-21 11:26:50 -07:00
Robin Wilson
c777f94231 remove AvatarBookmarks.deleteBookmark function 2019-03-21 11:12:30 -07:00
NissimHadar
f38be1307c
Merge pull request #15219 from NissimHadar/21794-correctErrorInMakefile
Case 21794: Corrected typo.
2019-03-21 11:02:18 -07:00
NissimHadar
661d8a0b69
Merge pull request #15140 from NissimHadar/21616-addPerTileThreshold
Case 21616: Add per tile threshold
2019-03-21 10:56:53 -07:00
Howard Stearns
d0c9ad0a07
Merge pull request #15225 from SimonWalton-HiFi/agent-uses-modelcache
Agent requires the ModelCache singleton for zone entities with meshes
2019-03-21 10:08:00 -07:00
John Conklin II
4483e3c069
Merge pull request #15168 from danteruiz/fix-notifications-scaling
Case 21501: Notification bar text fails to render when avatar is scaled very small
2019-03-21 09:47:55 -07:00
Sam Gondelman
61b7b8b669
reduce lambda copies 2019-03-21 08:36:32 -07:00
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