Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 13:57:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 74 branches 59 tags 1.2 GiB
Commit graph

23484 commits

Author SHA1 Message Date
Dante Ruiz
4cf40554c0 don't call setQmlTabletRoot twice 2018-01-08 16:06:31 -08:00
Seth Alves
8ed72dd276 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:53:21 -08:00
David Rowe
8016ae1bf3 Fix typo 2018-01-09 12:47:12 +13:00
David Rowe
ceb2d38103 Deprecate Overlays.getOverlayObject() 2018-01-09 12:45:12 +13:00
Seth Alves
e0bbf9ee41 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:28:02 -08:00
Seth Alves
ad389e5072 make avatar walk-speed adjustable from js. add a tablet button to control walking vs running 2018-01-08 15:27:41 -08:00
vladest
891663bae9 Page indicator visible only when pages more than one 2018-01-08 23:07:09 +01:00
Zach Fox
611f25d542 Improve scrolling thru My Purchases 2018-01-08 13:17:04 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch 
Touch feeling for near grab
 2018-01-08 12:50:30 -08:00
Seth Alves
1c94c9c11d Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 12:27:42 -08:00
Seth Alves
f1c03b2d40 adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run 2018-01-08 12:27:35 -08:00
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646 
Window JSDoc
 2018-01-08 11:53:34 -08:00
Zach Fox
2231bf2bdd Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-08 11:45:20 -08:00
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -08:00
Anthony J. Thibault
61edd83987 Improve stability for HMD third person avatars 
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.

To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
 2018-01-08 11:26:29 -08:00
David Rowe
7a971b2d26 Fix typo 2018-01-09 08:17:15 +13:00
Zach Fox
99510f522d
Merge pull request #12095 from ElderOrb/FB10621 
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
 2018-01-08 10:05:53 -08:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit 
Bug fix for sit script.
 2018-01-08 09:59:17 -08:00
Seth Alves
f6fed444b0 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 07:49:09 -08:00
luiscuenca
50f89182d7 Add Utils.jsc 2018-01-07 18:29:13 -07:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
Cain Kilgore
47038e4349 WL 21664 - Window.innerHeight should not include the menu bar 2018-01-07 08:31:36 +00:00
Seth Alves
fdead46642 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-06 08:07:28 -08:00
David Rowe
673bc7de38 Update Window JSDoc 2018-01-06 16:05:55 +13:00
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter 
Added exponential smoothing filter for vive pucks.
 2018-01-05 16:50:55 -08:00
Anthony J. Thibault
243dcb88ee Bug fix for sit script. 2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection 
Fix bugs related to inspecting entities with hand controllers
 2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661 
Laser auto-on with tablet and Web overlays
 2018-01-05 14:08:01 -08:00
samcake
5a5d475c6c Reinstall the packing of the qrc in the executable in DEV_build 2018-01-05 14:03:52 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting 
WL#21654: Make the Asset Browser Sort Case Insensitive
 2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00
Seth Alves
3cd0ec3336 default run speed is faster, advanced movement on by default 2018-01-05 13:20:41 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix 
Update model render items on texture load and fix no haze issue
 2018-01-05 12:26:56 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:54:59 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed 
Delete web3d overlay "resolution" property JSDoc
 2018-01-05 10:38:07 -08:00
vladest
02972c92f0 Merge branch 'master' into tablet_pagination_magnify 2018-01-05 19:12:13 +01:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008 
11008 GoTo app does not focus on address bar when opened
 2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs 
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
 2018-01-05 09:07:54 -08:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering 
Log filtering
 2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix 
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
 2018-01-05 08:15:48 -08:00
Alexander Ivash
437b78dce5 FB10621 "HIFI-Commerce Login" page title change to "Log in to continue" 2018-01-05 13:35:19 +03:00
David Rowe
5463f1ae6b Merge branch 'master' into 21646 2018-01-05 16:58:58 +13:00
David Rowe
d6a0457ee5 Delete web3d overlay "resolution" property JSDoc 2018-01-05 16:48:37 +13:00
Lexx
85b54f82d8
revert sorting change mistake 2018-01-05 01:58:23 +00:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor 
defang accidental disable of MyAvatar's default motor
 2018-01-04 17:44:22 -08:00
Zach Fox
0388c183ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-04 16:42:12 -08:00
SamGondelman
eb0d09360a Merge remote-tracking branch 'upstream/master' into overlayFix 2018-01-04 15:47:20 -08:00
Zach Fox
ea29d8bde0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection 2018-01-04 15:41:27 -08:00
Zach Fox
4612ef3d7c Use atYBeginning 2018-01-04 15:41:01 -08:00
Anthony J. Thibault
eff77b995e Merge branch 'master' into feature/exp-smoothing-input-filter 2018-01-04 15:24:33 -08:00
Zach Fox
4232bc0200 Bump per_page to 100 2018-01-04 14:42:05 -08:00
Dante Ruiz
b526842a46 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-04 14:23:10 -08:00
vladest
67ca76baa1 Magninfication 2018-01-04 23:11:42 +01:00
Zach Fox
14447c26a0 Prevent visual data loss 2018-01-04 13:47:31 -08:00
Anthony J. Thibault
9beb3ac5b6 Merge branch 'master' into feature/exp-smoothing-input-filter 2018-01-04 13:45:27 -08:00
David Back
81f3590954 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-04 13:17:07 -08:00
SamGondelman
6a19b0e0b6 update render items on texture load 2018-01-04 13:10:46 -08:00
RebeccaStankus
9ba324b85f "Clear Filter" button instead of "Show All" 2018-01-04 12:51:11 -08:00
RebeccaStankus
3e8063f80a Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 12:48:09 -08:00
Alexander Ivash
7ab7a46530 11008 GoTo app does not focus on address bar when opened 2018-01-04 23:38:10 +03:00
Zach Fox
10d494b51d Pagination for Recent Activity 2018-01-04 12:32:30 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener 
Remove legacy jurisdiction code
 2018-01-04 11:52:38 -08:00
RebeccaStankus
f52a6d8eae Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 10:49:32 -08:00
luiscuenca
ef0164c272 Fix tabs 2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0 Fix default hand poses 2018-01-04 11:37:37 -07:00
David Rowe
7236ac17e2 Merge branch 'master' into 21661 2018-01-04 15:21:00 +13:00
David Rowe
138092ac37 Remove "Prefer Avatar Finger Over Stylus" setting 2018-01-04 15:12:34 +13:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate 
Tablet home paginate
 2018-01-03 18:12:32 -08:00
Ryan Downe Karpf
5a589350fe
Merge pull request #12077 from ctrlaltdavid/remove-filed 
Remove erroneous "filed" Overlay property
 2018-01-03 18:10:37 -08:00
Zach Fox
ff4f582c7d Thanks Howard 2018-01-03 17:23:35 -08:00
David Back
6c8987d75f Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-03 14:44:52 -08:00
RebeccaStankus
9471dbeba9 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 11:39:38 -08:00
RebeccaStankus
89138c9bd8 More filter choices, search will clear 2018-01-03 11:35:46 -08:00
Zach Fox
6f077f3a92 Fix Security Pic Change dialog after QML security changes 2018-01-03 11:28:39 -08:00
Zach Fox
681b5173cd
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore 
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
 2018-01-03 09:34:14 -08:00
RebeccaStankus
9edb85efdc Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 09:25:38 -08:00
Dante Ruiz
674e8e1ac2 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-03 08:47:40 -08:00
David Rowe
901af8896f Add "Prefer Stylus Over Laser" setting 2018-01-03 17:54:43 +13:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
milad
63801ce802 add .jsc, remove duplicate qmlc, and remote Utils.jsc 2018-01-02 17:15:23 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
RebeccaStankus
dd48972e44 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-02 14:06:41 -08:00
RebeccaStankus
0b452a23dc forgot to add hifi.entities to filter selections 2018-01-02 14:04:30 -08:00
RebeccaStankus
bf59697aa5 better dropdown 2018-01-02 13:56:49 -08:00
Dante Ruiz
6fa3446c57 joints are being relayed to children 2018-01-02 13:54:13 -08:00
David Rowe
7013f64714 Remove erroneous "filed" Overlay property 2018-01-03 10:37:37 +13:00
RebeccaStankus
d08e97f9cc more filter options 2018-01-02 13:28:39 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
RebeccaStankus
fe69498976 initial changes...ready for feedback 2018-01-02 13:04:52 -08:00
vladest
a84e585679 Merge 2018-01-02 21:49:00 +01:00
RebeccaStankus
0117750757 PR for Feedback 2018-01-02 12:28:31 -08:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api 
Google Poly API
 2018-01-02 10:28:17 -08:00
RebeccaStankus
fe82d33b76 couple small changes 2018-01-01 15:29:49 -08:00
Triplelexx
78a0175413 fix assetbrowser sorting case sensitivity 2017-12-29 23:16:12 +00:00
luiscuenca
49bd62ca29 Touch feeling for near grab 2017-12-29 14:04:36 -07:00
Atlante45
aec5ab5921 CR 2017-12-29 12:46:52 -08:00
Atlante45
06e2f394f9 Update Octree server stats to handle single server 2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
RebeccaStankus
06def41764 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2 2017-12-29 10:03:29 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
vladest
afc3082593 Cleanup. Errors checks 2017-12-28 13:16:51 +01:00
vladest
35fee739c5 Use buttons index 2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez
84933131c4 changed api key variable name 2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez
a428eb5b75 added const to several parameters 2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez
01c1032540 fixed constant names, added another URL check 2017-12-27 10:51:58 -08:00
RebeccaStankus
296f0a323a saving for Wednesday 2017-12-26 15:56:05 -08:00
Elisa Lupin-Jimenez
03f06aadf4 keyword filters case insensitive now 2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez
e1b344e36d handles empty json object return 2017-12-26 10:50:10 -08:00
Elisa Lupin-Jimenez
3e10d3b436 Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-26 10:18:51 -08:00
vladest
ffcccacfa5 Selection consistency #2 2017-12-25 23:46:06 +01:00
vladest
cb7472c270 Selection consistency #1 2017-12-25 20:14:31 +01:00
vladest
9fa78bae0d Merge branch 'master' into tablet_home_paginate 2017-12-23 17:46:51 +01:00
vladest
a497047666 Refactored using new GridView approach 2017-12-23 17:44:26 +01:00
David Back
ab5b238aea Merge branch 'mergeAccountGlobalServices' of https://github.com/dback2/hifi into mergeAccountGlobalServices 2017-12-22 17:00:17 -08:00
David Back
c620f3274c merge 2017-12-22 16:28:29 -08:00
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back 
Merge stable back into master after RC61.1
 2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0 Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back 2017-12-22 15:48:04 -08:00
Seth Alves
96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 15:13:02 -08:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3 
Commerce Data Tracking: Iteration 3 (Purchases)
 2017-12-22 14:31:03 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3 
Remove _model from ModelMeshPartPayload
 2017-12-22 13:50:06 -08:00
RebeccaStankus
720f186bd7 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter 2017-12-22 13:47:42 -08:00
Howard Stearns
fd545c3928
Merge pull request #12048 from zfox23/commerce_CheckoutLayoutRevisions 
Commerce: Checkout Layout Revisions
 2017-12-22 09:59:49 -08:00
Howard Stearns
5767f5937e
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1 
Commerce: Fix some rezzing errors; Fix ECDSA errors
 2017-12-22 09:56:22 -08:00
RebeccaStankus
1d4dedc1a1 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter 2017-12-22 07:52:31 -08:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1 
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
 2017-12-21 17:46:32 -08:00
Zach Fox
ef71470d85 Small change 2017-12-21 17:03:04 -08:00
Zach Fox
07a1cf434a IT'S WORKING!!! 2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce Progress? 2017-12-21 16:32:20 -08:00
Zach Fox
2acea75db3 Commerce: Checkout Layout Revisions 2017-12-21 16:09:46 -08:00
Zach Fox
618e5c9032 Commerce Data Tracking: Iteration 3 (Purchases) 2017-12-21 15:46:01 -08:00
Stephen Birarda
7bf0cc2f63 cleanup other ref returns of shared pointers from sortables 2017-12-21 15:39:14 -08:00
luiscuenca
38bfddf786 Added filter for QT autogenerated functions and integrated it to Developers menu 2017-12-21 16:26:06 -07:00
Zach Fox
73eb258e79 IT'S WORKING!!! 2017-12-21 15:17:52 -08:00
Zach Fox
e963673409 Progress? 2017-12-21 14:08:18 -08:00
vladest
7985c39f2a Adopt path to certain Tablet dialogs to new loading subsystem and path resolver 2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict 
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
 2017-12-21 20:03:38 +00:00
luiscuenca
54297e00a8 button size fix 2017-12-21 12:48:21 -07:00
luiscuenca
d93828f2f0 Fix an improve currentAPI.js 2017-12-21 11:50:02 -07:00
vladest
2bca0939b3 Preliminary proxy model 2017-12-21 19:32:13 +01:00
vladest
d6e1a3ea41 Merge conflicts solved 2017-12-21 09:02:04 +01:00
unknown
be736373f2 fix if else convention 2017-12-20 17:52:27 -08:00
Andrew Meadows
c1906215ba add comments 2017-12-20 17:41:08 -08:00
Andrew Meadows
721e9d426a restore signals on LOD change 2017-12-20 17:41:08 -08:00
Andrew Meadows
5c11ae3469 bump desktop min FPS from 20 to 30 msec 2017-12-20 17:41:08 -08:00
Andrew Meadows
4fb9680f3b also consider GPU render time for LOD adjust 2017-12-20 17:41:08 -08:00
Andrew Meadows
9c4a0c8c70 tweak LOD adjustment logging 2017-12-20 17:41:08 -08:00
Andrew Meadows
8e0d367a2d use full 'present' time for FPS calculation 
also, refactor LOD adjust logic
 2017-12-20 17:41:08 -08:00
Andrew Meadows
7a9d566e02 remove unnecessary whitespace 2017-12-20 17:41:08 -08:00
unknown
dbbc87d72e merge 2017-12-20 17:40:11 -08:00
RebeccaStankus
95d94e1c8f UI Done 2017-12-20 16:52:56 -08:00
vladest
79f9b54f6a Store button list in the resources section of fake item instead of C++ space 2017-12-20 22:59:07 +01:00
Zach Fox
e02e6790fe Fix error state for Commerce passphrase TextInputs 2017-12-20 13:46:02 -08:00
Elisa Lupin-Jimenez
7de2918b9b added newline to header 2017-12-20 12:44:47 -08:00
SamGondelman
bd06dc6443 cleaning up modelmeshpartpayload 2017-12-20 11:00:14 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel 
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
 2017-12-20 09:18:10 -08:00
Andrew Meadows
02e3b22621 remove hot-key for disable of scripted motor 2017-12-20 08:43:56 -08:00
Andrew Meadows
6ad3a0598c remove crufty comment 2017-12-20 08:42:42 -08:00
Andrew Meadows
f82de05f9c defang accidental disable of MyAvatar's default motor 2017-12-20 08:42:42 -08:00
Zach Fox
a72ed27a25 CR feedback 2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -08:00
Elisa Lupin-Jimenez
ca062f9232 changed qtglobal include 2017-12-19 15:41:42 -08:00
Elisa Lupin-Jimenez
14935e5924 added const to valid inputs 2017-12-19 15:11:24 -08:00
Elisa Lupin-Jimenez
1b6c85edb0 cleaned up code 2017-12-19 13:22:31 -08:00
David Rowe
e6c40f4aae Window JSDoc 2017-12-20 10:16:09 +13:00
vladest
012f65a87f Merge branch 'master' into tablet_home_paginate 2017-12-19 21:40:47 +01:00
Elisa Lupin-Jimenez
34d8fe307d fixed getAssetList() 2017-12-19 11:25:15 -08:00
howard-stearns
bb499000a6 trailing semicolon 2017-12-19 10:51:32 -08:00
howard-stearns
16a58ddf5a Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser 2017-12-19 10:48:34 -08:00
Elisa Lupin-Jimenez
8a9e5bc39d Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-19 10:41:39 -08:00
Zach Fox
18d5be147c Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-19 09:48:15 -08:00
Elisa Lupin-Jimenez
1ee8445f43 added gltf import feature, getAssetList() not working 2017-12-18 17:47:21 -08:00
Anthony Thibault
7ea1f3b911
Merge pull request #12013 from sethalves/delete-expired-av-ents 
when an avatar-entity's lifetime expires, remove it from avatarEntityData
 2017-12-18 17:35:42 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2 
Commerce: Add Passphrase Auth Status data tracking
 2017-12-18 16:26:59 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning 
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
 2017-12-18 15:20:23 -08:00
Seth Alves
ddbb7a4416 when an avatar-entity's lifetime expires, remove it from avatarEntityData 2017-12-18 14:26:25 -08:00
Elisa Lupin-Jimenez
e7fad05867 enabled fbx, obj, and blocks model url retrieval 2017-12-18 14:20:51 -08:00
Zach Fox
afd3cf7045 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-18 14:08:09 -08:00
Zach Fox
affd67d7d4
Merge pull request #12007 from zfox23/commerce_moreSecurityImages 
Commerce: More security images!
 2017-12-18 12:06:43 -08:00
Zach Fox
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -08:00
Brad Davis
9f7b6f543d Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js 
Cleanup names of debug stats and trace contexts.
 2017-12-18 10:02:42 -08:00
Elisa Lupin-Jimenez
0e57ed5c12 Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-18 10:00:18 -08:00
vladest
38453afb3b Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope 2017-12-18 14:56:33 +01:00
Brad Davis
c6bc6f6ef2 Merge remote-tracking branch 'upstream/master' into android_nov 2017-12-16 16:20:16 -08:00
vladest
62a762b879 Merge branch 'master' into tablet_home_paginate 2017-12-16 20:32:21 +01:00
vladest
cdb9d72387 Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons 2017-12-16 20:27:19 +01:00
howard-stearns
d730b7b87b consistent goToUser behavior in PAL, and be able to go to flying user. 2017-12-15 17:00:54 -08:00
Zach Fox
89795272c7 More security images! 2017-12-15 16:26:13 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258 
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
 2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub
c68bec175a
Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches 
More stable hips IK
 2017-12-15 15:32:24 -08:00
Brad Hefta-Gaub
45df668679
Merge pull request #11966 from SamGondelman/hysteresis 
Update stylus touch hysteresis values
 2017-12-15 15:22:41 -08:00
Alexander Ivash
a4696cc2b3 8992 Login window is small in tablet 2017-12-14 16:57:17 -08:00
Alexander Ivash
32acc8ad47 8992 Login window is small in tablet 2017-12-14 23:53:33 +00:00
Zach Fox
af346f2ced Protocol change 2017-12-14 10:09:10 -08:00
SamGondelman
4fbf5db697 Merge remote-tracking branch 'upstream/master' into hysteresis 2017-12-14 09:55:46 -08:00
Elisa Lupin-Jimenez
264f362994 resolved merge conflict again 2017-12-13 17:54:30 -08:00
Elisa Lupin-Jimenez
e49181c3a2 added getAssetList() and getFBX() 2017-12-13 17:45:57 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl 
allow custom metaverse URL to be used with env var
 2017-12-13 17:29:45 -08:00
Elisa Lupin-Jimenez
f7be67b5b2 removed key 2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
392f290dd6 can fetch poly asset list synchronously 2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
dc999401d5 Created poly scripting interface template 2017-12-13 16:19:36 -08:00
Seth Alves
aa0d581236 Merge branch 'FB10334' of https://github.com/elderorb/hifi into pr-11960-for-rc-61 2017-12-13 15:29:27 -08:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Zach Fox
f0507e1608
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1 
Set Wallet Status to 'Ready' after correctly authenticating wallet
 2017-12-13 13:19:54 -08:00
Zach Fox
efd5c0ccb7 Add comment as per CR 2017-12-13 11:53:26 -08:00
Anthony J. Thibault
c4a7f4843a Much more stable hips IK target. 
Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system.
Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.
 2017-12-13 11:12:32 -08:00
Sam Gateau
4e68663cfc
Merge pull request #11970 from SamGondelman/circleFix 
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
 2017-12-14 00:30:18 +07:00
Seth Alves
d3e24d3629
Merge pull request #11960 from ElderOrb/FB10334 
10334 Unable to type in Go To app search bar after UI reappears from …
 2017-12-13 09:06:53 -08:00
vladest
99a6b12828 Merge branch 'master' into tablet_home_paginate 2017-12-13 16:02:29 +01:00
Brad Davis
6cff86b0f3 Fix polyvox archive, correct build errors, add additional libraries 2017-12-12 18:29:36 -08:00
luiscuenca
a1f1e7b587 Fix web entities accessing the webcam RC61 2017-12-12 18:20:29 -07:00
MiladNazeri
8a28d04322
Merge pull request #11885 from ctrlaltdavid/21624 
Overlays JSDoc
 2017-12-12 17:04:46 -08:00
Seth Alves
4956978c76
Merge pull request #11973 from luiscuenca/webPrivacyFix 
Fix web entities accessing the webcam
 2017-12-12 17:01:38 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
luiscuenca
2d21f4d364 Fix web entities accessing the webcam 2017-12-12 16:00:17 -07:00
David Rowe
92be33da31 Web3d overlay's "resolution" property has been removed 2017-12-13 11:40:44 +13:00
Andrew Meadows
87fa919ac8 save files to Documents by default 2017-12-12 14:11:25 -08:00
David Rowe
650e7e1922 Document that getProperty() only works for 3D overlays 2017-12-13 10:34:33 +13:00
SamGondelman
16f545a9e8 fix circle3d overlays 2017-12-12 13:25:47 -08:00
Zach Fox
623e6395be Set Wallet Status to 'Ready' after correctly authenticating wallet 2017-12-12 13:01:14 -08:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602 
JSDoc updates
 2017-12-12 12:18:02 -08:00
Seth Alves
7d2d8e7c05 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-12 09:25:44 -08:00
vladest
e052784431 Code style 2017-12-12 14:12:03 +01:00
SamGondelman
ce96fa7078 change hysteresis values based on testing 2017-12-11 17:32:58 -08:00
Zach Fox
2225352b1e Fix wallet setup 2017-12-11 17:15:15 -08:00
SamGondelman
fba06a74aa fix laser and stylus deadspot 2017-12-11 15:51:22 -08:00
Bradley Austin Davis
9df9cf7a47 Adding more libs, ifdefs for android incompatible code 2017-12-11 13:18:23 -08:00
Howard Stearns
8e36228c12
Merge pull request #11948 from MandatoryMania/noFundsSymbol 
Provides a nice alert in case of insufficient funds to make a purchase
 2017-12-11 11:45:27 -08:00
Andrew Meadows
74a1f5de96 remove bullet stats when physics stats disabled 2017-12-11 11:31:00 -08:00
Andrew Meadows
406bf7898d cleanup prof stats and trace context names 2017-12-11 11:31:00 -08:00
Andrew Meadows
2538204b1e expose physics simulation stats to Test JS API 2017-12-11 11:31:00 -08:00
Seth Alves
2cd64ccd2c merge from upstream 2017-12-11 10:14:30 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light 
Exposing multi highlight and selection feature to js api
 2017-12-12 01:09:15 +07:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Zach Fox
006ea3342c
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint 
Remove useless Wallet.buy() scripting endpoint
 2017-12-11 09:33:18 -08:00
vladest
e797f5cda0 Merge branch 'master' into tablet_home_paginate 2017-12-11 17:53:21 +01:00
vladest
cc78fc1f53 Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections 2017-12-11 17:50:16 +01:00
Sam Gateau
d1cd9f5c6b adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays 2017-12-11 02:21:09 -08:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Sam Gateau
bb888f2d4c Replace the name opacity for alpha 2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-10 09:53:22 -08:00
Alexander Ivash
cb471582e5 10334 Unable to type in Go To app search bar after UI reappears from moving Avatar 2017-12-10 01:34:03 +03:00
Zach Fox
8485503063
Merge pull request #11958 from humbletim/fix-pal-connections 
Fix for Connections UI lockup
 2017-12-08 18:34:25 -08:00
Zach Fox
6f5028080b Remove useless Wallet.buy() scripting endpoint 2017-12-08 18:23:23 -08:00