Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:44:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77381 commits 25 branches 0 tags 1.1 GiB
Commit graph

28946 commits

Author SHA1 Message Date
Wayne Chen
d46074d43f
Merge branch 'ptt' into pushToTalk 2019-03-08 16:09:58 -08:00
Wayne Chen
48d1ec850c removing debug statement 2019-03-08 16:07:48 -08:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
Wayne Chen
88d8163b04 updating compile failure + icons/settings update 2019-03-08 16:07:46 -08:00
Wayne Chen
39db3979b9 changing text display 2019-03-08 16:07:09 -08:00
Wayne Chen
f4db9fefd0 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:06:46 -08:00
Wayne Chen
cb0fdd2ef2 laying groundwork for audio app + fixing deadlocks 2019-03-08 16:06:45 -08:00
r3tk0n
88a125aff0 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
a688c0a92b exposing setting pushingToTalk 2019-03-08 16:02:15 -08:00
Wayne Chen
8a5924077a changing text display 2019-03-08 16:02:15 -08:00
Wayne Chen
60b98d2c70 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Shannon Romano
c3b8f6ed93
Merge pull request #15145 from roxanneskelly/StandaloneTags 
Case 21642 - verification dialog when user hits return in goto search
 2019-03-08 15:29:34 -08:00
Howard Stearns
1d52ed1524
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox 
do not scroll inventory items underneath modal dialog
 2019-03-08 15:27:44 -08:00
Howard Stearns
fac162c2bc
Merge pull request #15144 from howard-stearns/about-blockchain 
Change "about" blockchain from Elements to EOS
 2019-03-08 15:17:31 -08:00
David Rowe
24c7c8be19 Update JSDoc per merge from master 2019-03-09 12:03:59 +13:00
luiscuenca
df32b61eaf remove unused variable 2019-03-08 16:01:18 -07:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81 
Case 21628: Fix text rendering on AMD/Mac
 2019-03-08 14:59:37 -08:00
luiscuenca
bfcb1a8391 Make methods thread safe 2019-03-08 15:57:25 -07:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers 
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
 2019-03-08 14:56:56 -08:00
Thijs Wenker
60d46998ec
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings 
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
 2019-03-08 23:51:58 +01:00
Roxanne Skelly
b3f5d76d0f CR Fix 2019-03-08 14:37:15 -08:00
Howard Stearns
8791252acd do not scroll inventory items underneath modal dialog 2019-03-08 14:27:56 -08:00
Thijs Wenker
06e5927ee1 CR fixes 2019-03-08 23:07:01 +01:00
Roxanne Skelly
88a4b5c983 Case 21642 - verification dialog when user hits return in goto search 
text entry+return should throw up verification dialog for first time to
non-optimized domain
 2019-03-08 14:01:47 -08:00
Howard Stearns
24b08bd25d Change "about" blockchain from Elements to EOS 2019-03-08 13:59:16 -08:00
luiscuenca
4858f64810 get the colliding joints 2019-03-08 14:36:47 -07:00
Roxanne Skelly
70cc6594c7 CR fixes 2019-03-08 12:43:43 -08:00
luiscuenca
cbe920774f add getFlowData jsdoc 2019-03-08 12:45:29 -07:00
luiscuenca
cb6f573b35 Merge branch 'master' into flowAPIExtra 2019-03-08 12:43:02 -07:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
luiscuenca
a977bb6dc8 remove unuse variable 2019-03-08 12:39:57 -07:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
Roxanne Skelly
750dbfae21 Stand-alone Tags: Throw up popup for first unoptimized domain 
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
 2019-03-08 10:48:42 -08:00
luiscuenca
e8da6b5a0c add getFlowData 2019-03-08 10:36:58 -07:00
Shannon Romano
ef44218fe3
Merge pull request #15128 from roxanneskelly/case21315etc 
Case 21315, Case 21326, Case 21370
 2019-03-08 08:37:23 -08:00
Thijs Wenker
f2bca5d6c6 added the multiple root joints warning 2019-03-08 07:32:41 +01:00
Thijs Wenker
c35e4d15ab - warning grammar / no more texture folder content requirement for No textures assigned warning 
- resolved partial commit issue / Fix UNIX builds by removal of unused warning
 2019-03-08 03:36:56 +01:00
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
Thijs Wenker
bcd00f98d0 - added more warnings to the avatar doctor 
- read embedded fst texture mappings
 2019-03-08 03:36:56 +01:00
David Rowe
0b7cddb886 Fill in and tidy MyAvatar JSDoc 2019-03-08 13:49:10 +13:00
SamGondelman
af03fb5f85 try to fix text rendering on amd with transparency 2019-03-07 16:23:12 -08:00
Shannon Romano
343e2648bb
Merge pull request #15131 from danteruiz/destroy-modal-dialogs 
Case 15127: Esc key doesn't consistently set my avatar to 'Away' mode
 2019-03-07 16:06:33 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Shannon Romano
76958ffda2
Merge pull request #15102 from danteruiz/keyboard-for-web-entities 
Case 21144: Can't enter text in a Web Entity with the new keyboard
 2019-03-07 15:46:31 -08:00
Shannon Romano
ab08b56bd1
Merge pull request #15085 from danteruiz/keyboard-handle-scaling 
Case 21500: Keyboard handle appears huge when scaling down avatar
 2019-03-07 15:39:43 -08:00
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370 
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
 2019-03-07 13:58:51 -08:00
Wayne Chen
472c7ffab4 removing debug statement 2019-03-07 12:54:32 -08:00
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst 
Load flow bone data from FST file
 2019-03-07 12:48:36 -08:00
Wayne Chen
b83e9f70e6 adding PushToTalk action 2019-03-07 12:36:56 -08:00
Wayne Chen
7b197c975c updating compile failure + icons/settings update 2019-03-07 11:41:19 -08:00
Wayne Chen
0cb9e7eb36 exposing setting pushingToTalk 2019-03-07 11:41:19 -08:00
Wayne Chen
9613cfb6b9 changing text display 2019-03-07 11:41:19 -08:00
Wayne Chen
066d1797cf Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-07 11:41:19 -08:00
Wayne Chen
eeb900b761 laying groundwork for audio app + fixing deadlocks 2019-03-07 11:41:19 -08:00
r3tk0n
d8478e0b17 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-07 11:41:18 -08:00
John Conklin II
abb61b7e90
Merge pull request #15124 from SamGondelman/shapes 
Case 21605: Fix shapes app and debugAvatarMixer
 2019-03-07 11:07:45 -08:00
Howard Stearns
ab8f6273ad
Merge pull request #15113 from howard-stearns/stock-to-master 
Stock to master
 2019-03-07 11:02:53 -08:00
Anthony Thibault
96a696203c
Merge pull request #15101 from amantley/bugAvatarHovers 
Fixed: Avatar hovers off ground while running
 2019-03-07 10:52:20 -08:00
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Howard Stearns
8ebab88613 Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master 2019-03-06 13:08:19 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus 
Case 21340: avatar doctor project page status
 2019-03-06 12:36:18 -08:00
Howard Stearns
ddfd437696 ensure error message when marketplace update fails 2019-03-06 11:37:17 -08:00
Howard Stearns
366dd935dd trading in has nothing to do with whether you own the new item 2019-03-06 11:36:34 -08:00
Howard Stearns
416cde4c1f fix uses of updated_item_id that got lost 2019-03-06 11:36:08 -08:00
Howard Stearns
f5afc2033f work through stocking vs update issues, and cleanup 2019-03-06 11:35:36 -08:00
Thijs Wenker
a84a43320c added spacing between lines 2019-03-06 19:15:01 +01:00
luiscuenca
dfb434ea09 Fix warning and refactoring 2019-03-06 09:25:49 -07:00
Thijs Wenker
59200103af Not for sale explanation 2019-03-06 07:06:48 +01:00
luiscuenca
76609197e2 Read flow data from the fst file 2019-03-05 18:50:53 -07:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear 
Case 11775: Don't clear my avatar entities on domain switch
 2019-03-05 15:42:51 -08:00
danteruiz
1941e53cc3 track oculus controllers while in oculus home 2019-03-05 15:32:18 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
danteruiz
e6a63a9a69 add keyboard for html content 2019-03-05 14:24:38 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create 
Case 21541: Fix mouse on create in HMD
 2019-03-05 13:07:49 -08:00
Shannon Romano
3eff5d269f
Merge pull request #15008 from ctrlaltdavid/M21128-a 
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
 2019-03-05 11:58:37 -08:00
amantley
8e9618d740 added a lower run animation to stop hovering when running 2019-03-05 11:44:53 -08:00
Wayne Chen
2020b757a3 adding mic glyph 2019-03-05 10:58:26 -08:00
Wayne Chen
f1cf11de85 moving gain slider to audio settings 2019-03-05 10:53:55 -08:00
Wayne Chen
a00d6ec9f6 removing debug statement 2019-03-04 19:42:30 -08:00
Wayne Chen
0f2792930a adding switches and buttons to testing audio 2019-03-04 19:28:12 -08:00
SamGondelman
f2c248c0a2 disable href and entity script events when in edit mode 2019-03-04 17:10:20 -08:00
Wayne Chen
a68aaaa7a4 adding timer and ui color changes 2019-03-04 16:06:50 -08:00
SamGondelman
12f5a735d9 simplifying mouse events and fix mouse on create 2019-03-04 14:50:09 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
9614216006 don't disable server echo when audio qml page is closed 2019-03-04 13:47:55 -08:00
Seth Alves
d5e8cba1ee make server-audio-loopback button work in HMDs 2019-03-04 13:47:55 -08:00
Seth Alves
6ee236e783 added a button to enable server loopback of audio 2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2 rework audioMuteOverlay.js 2019-03-04 13:47:54 -08:00
Oren Hurvitz
7780db813d Save the "Mute Microphone" setting 2019-03-04 13:47:54 -08:00
Wayne Chen
7860db68eb culling hearing oneself and testing sound 2019-03-04 13:33:16 -08:00
Shannon Romano
45099a5db6
Merge pull request #15076 from SamGondelman/laserWidth 
Case 21514: Lasers scale with avatar
 2019-03-04 11:26:08 -08:00
Seth Alves
0523a0d06d don't disable server echo when audio qml page is closed 2019-03-04 11:08:07 -08:00
Seth Alves
9ff99c7213 make server-audio-loopback button work in HMDs 2019-03-04 11:08:07 -08:00
Seth Alves
6f40079621 added a button to enable server loopback of audio 2019-03-04 11:08:07 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -08:00
Seth Alves
3f52361753 rework audioMuteOverlay.js 2019-03-04 11:08:06 -08:00
Oren Hurvitz
18325ef5e3 Save the "Mute Microphone" setting 2019-03-04 11:08:06 -08:00
danteruiz
a026933819 keyboard handle scaling 2019-03-04 10:56:14 -08:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation 
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
 2019-03-04 10:49:16 -08:00
Shannon Romano
d56b460d11
Merge pull request #15030 from wayne-chen/clockOnTablet 
Case 21456, Case 21463: Clock On Tablet (81.0/master)
 2019-03-04 10:45:34 -08:00
SamGondelman
da1ffc15e3 lasers scale with avatar 2019-03-01 15:42:45 -08:00
danteruiz
8e600adf1e making requested changes 2019-03-01 15:30:11 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo 
case 21485: removing quest-demo specific changes
 2019-03-01 15:03:44 -08:00
danteruiz
618a1d5b83 fix tablet button and gizmos rotation 2019-03-01 14:31:12 -08:00
SamGondelman
3e6061e435 try to not clear my avatar entities on domain switch 2019-03-01 13:45:00 -08:00
Shannon Romano
20d65ab183
Merge pull request #15064 from danteruiz/another-login-fix 
Case 21451: HMD Login Encouragement Screen is not Usable
 2019-03-01 12:57:17 -08:00
Shannon Romano
5db5fca81e
Merge pull request #15066 from SamGondelman/2d 
Case 19188: Potential 2D overlay + Tablet threading fixes
 2019-03-01 12:56:23 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
Shannon Romano
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload 
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
 2019-03-01 09:35:01 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities 
Case 21494: Avoid mem leaked entities
 2019-03-01 09:34:20 -08:00
Shannon Romano
00ca3bc933
Merge pull request #15058 from SamGondelman/reload 
Case 21490: Fix lasers and keyboard on reload
 2019-03-01 09:31:56 -08:00
danteruiz
7bcf727a83 review changes 2019-02-28 18:11:51 -08:00
danteruiz
9fe0309ae6 another login fix 2019-02-28 17:11:48 -08:00
SamGondelman
b26b02fed6 potential 2d overlay threading fixes 2019-02-28 17:02:08 -08:00
Andrew Meadows
7d9efe4c09 avoid mem-leak for serverless domains 2019-02-28 14:20:11 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
SamGondelman
15064f0097 fix lasers and keyboard on reload 2019-02-28 14:04:22 -08:00
SamGondelman
a8e6d01279 fix context overlay 2019-02-28 11:33:09 -08:00
amer cerkic
faedc61c37 removing quest-demo specific changes 2019-02-28 10:54:30 -08:00
amer cerkic
a425becc8a clean up of debugging 2019-02-27 15:35:33 -08:00
Shannon Romano
1a83ab2dab
Merge pull request #15038 from danteruiz/fix-login-screen 
Case 21451: HMD Login Encouragement Screen is not Usable
 2019-02-27 14:41:41 -08:00
David Rowe
d73ff2e855 Revise current MyAvatar API JSDoc 2019-02-28 10:40:10 +13:00
amer cerkic
92cfa49bfb adding and testing command line parameter passing to application 2019-02-27 11:42:22 -08:00
SamGondelman
bf9e5b9550 comment out another log 2019-02-27 10:25:34 -08:00
danteruiz
2fd94c6bbc fixing login dialog 2019-02-27 10:08:38 -08:00
Wayne Chen
028cce5394 change short username to 14 characters, displaying as normal text 2019-02-26 12:26:50 -08:00
Shannon Romano
2aa622b855
Merge pull request #15014 from sethalves/fix-grab-earthquake 
case 21411: don't allow others' grabs to move locked or ungrabbable things
 2019-02-26 09:03:44 -08:00
nimisha20
ba3895efdd
Update AccountServicesScriptingInterface.h 
Minor copy-edit
 2019-02-25 22:56:36 -08:00
nimisha20
736a050e68
Update AccountServicesScriptingInterface.h 2019-02-25 22:55:56 -08:00
nimisha20
4825ecdbf3
Update AccountServicesScriptingInterface.h 2019-02-25 22:44:16 -08:00
Wayne Chen
650b34c463 adding clock 2019-02-25 18:00:56 -08:00
Shannon Romano
7fe3bb387e
Merge pull request #15012 from SamGondelman/nametag 
Case 21397: Trying to fix overlay rotation
 2019-02-25 16:52:01 -08:00
Andrew Meadows
6e13203fec avoid nullptr deref 2019-02-25 13:52:46 -08:00
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Roxanne Skelly
292ac88c96 Update with new standalone-optimized icon 2019-02-25 11:36:45 -08:00
Seth Alves
db821487d9 don't allow others' grabs to move locked or ungrabbable things 2019-02-25 11:27:10 -08:00
Thijs Wenker
79d0a0a0a8 avatar doctor project status 2019-02-25 19:28:38 +01:00
Roxanne Skelly
2dffd14fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-25 10:20:52 -08:00
SamGondelman
8058ad884e trying to fix overlay rotation 2019-02-25 09:53:33 -08:00
nimisha20
e20f13f0ae
Update AccountServicesScriptingInterface.h 
Adding ctrlaltdavid's changes
 2019-02-25 09:28:56 -08:00
nimisha20
2bcee4e454
Update AccountServicesScriptingInterface.cpp 
Changes according to ctrlaltdavid's comments.
 2019-02-25 08:54:47 -08:00
David Rowe
4e9d162172 AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review 2019-02-24 13:23:20 +13:00
Sam Gateau
4f0911bd29
Merge pull request #15003 from SamGondelman/nametag 
Case 21397: Fix nametag rotation
 2019-02-23 09:00:12 -08:00
SamGondelman
37720e9daa fix nametag rotation 2019-02-22 16:53:03 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot 
Case 21354: Add "modelScale" property to fix pal
 2019-02-22 16:36:17 -08:00
Sam Gateau
860b3a35e4
Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations 
Quest demo with avatar ik optimizations
 2019-02-22 16:32:24 -08:00
Anthony Thibault
1213084fc6
Merge pull request #14984 from kencooke/master 
Case 21384: Avatar mouth blendshapes are not working correctly (master)
 2019-02-22 16:29:07 -08:00
Roxanne Skelly
0636579822 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-22 15:43:42 -08:00
Dante Ruiz
eedd54d0b1 Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo 2019-02-22 15:02:01 -08:00
Dante Ruiz
a87e49bb23 start in quest dev 2019-02-22 15:01:30 -08:00
Shannon Romano
a63f3e76c8
Merge pull request #14972 from SamGondelman/billboard 
Case 21341: Fix billboard mode in secondary camera
 2019-02-22 13:01:09 -08:00
amantley
87d98e5b85 These are the squashed commits for the ik optimization for the Quest 
Implmented using a new AnimSplineIK node in the anim graph

(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
 2019-02-22 11:21:36 -08:00
Sam Gateau
1d5a4116b9
Merge pull request #14986 from amerhifi/quest-demo 
case 21374 : Away mode on Quest when device is paused
 2019-02-22 09:54:57 -08:00
amer cerkic
9c833f7e64 clean up 2019-02-22 09:21:51 -08:00
amer cerkic
f04fdb2187 added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user 2019-02-22 09:11:24 -08:00
luiscuenca
3072ca43de Detailed picking if avatar is not null 2019-02-22 09:24:38 -07:00
Ken Cooke
c1786edc24 Emulate the old behavior of _lastInputLoudness 2019-02-21 18:45:17 -08:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK 
AnimSplineIK node added to inverse kinematics
 2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp 
Cpp implementation of the Flow script
 2019-02-21 17:10:05 -08:00
Sam Gateau
ddc42585d8 Cleanup syntax 2019-02-21 16:41:50 -08:00
Sam Gateau
94fc60f285 Bad idea to include global here 2019-02-21 16:34:50 -08:00
amer cerkic
9097d9c57c working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing. 2019-02-21 16:33:25 -08:00
amantley
3bf5c44f98 fixed build warnings 2019-02-21 16:24:46 -08:00
amantley
5cf8a963cd make spine2 rotation damping only happen in optimized code. the regular code is already damped 2019-02-21 15:41:16 -08:00
Sam Gateau
fe33aadd69 Assigning the default world detail and max render rate target in vr quest 2019-02-21 14:58:06 -08:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
amantley
6323f49f26 changed the define variable to HIFI_USE_OPTIMIZED_IK 2019-02-21 14:36:05 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
Roxanne Skelly
258e80237e Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-21 11:54:47 -08:00
amantley
afed0b5442 review changes 2019-02-21 11:08:29 -08:00
Shannon Romano
f9e5ee0185
Merge pull request #14970 from danteruiz/quest-no-keyboard 
Case 21335: Use old tablet keyboard for quest
 2019-02-21 10:34:53 -08:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
Angus Antley
b6bc467f4b added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel 2019-02-21 06:42:55 -08:00
amantley
f8a74efdc2 fixed build errors from jenkins 2019-02-20 17:59:45 -08:00
amantley
27bfe2f0fe changed name of pre processor variable 2019-02-20 15:14:12 -08:00
Roxanne Skelly
8c058f147e Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-20 14:24:47 -08:00
Roxanne Skelly
dca166f821 Stand-alone Optimized Tagging - Add tagging for GOTO User Stories 2019-02-20 14:23:54 -08:00
Dante Ruiz
bf8c671cd6 keyboard setting 2019-02-20 13:38:20 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake 
case 20058: Android - Handshake implementation
 2019-02-20 13:33:52 -08:00
Brad Davis
79369a0c83 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 10:40:49 -08:00
Shannon Romano
0b7bdb185e
Merge pull request #14949 from SamGondelman/wearables 
Case 21300, Case 21301: Group cull all entity descendants of avatars
 2019-02-20 10:29:40 -08:00
John Conklin II
97c7b01005
Merge pull request #14965 from danteruiz/stylus-pick-perf 
Case 21255: PickManager performance is slow when keyboard mallets are enabled
 2019-02-20 10:11:33 -08:00
Brad Davis
817c24dd0b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 09:51:03 -08:00
Brad Davis
122a246d2d Fix typo 2019-02-19 17:30:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal 
Case 21259: Pal textures don't change
 2019-02-19 17:14:15 -08:00
Brad Davis
518e480a8b Fix plugin activation 2019-02-19 17:00:50 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
luiscuenca
04e57d0dd1 No Rig pointer on Flow class, solve network animations and fixed bug 2019-02-19 17:45:46 -07:00
danteruiz
6bdf51a460 limit number of include items for mallets 2019-02-19 16:25:38 -08:00
danteruiz
d1c46e1cdc fixing tablet pointer issues 2019-02-19 14:48:17 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf 
Case 21271: Remove unnessary picks for quest
 2019-02-19 14:20:56 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Roxanne Skelly
d957b38f10 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-19 12:34:10 -08:00
SamGondelman
2986ca20c5 Merge remote-tracking branch 'upstream/master' into pal 2019-02-19 11:31:40 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick 
Case 21291, Case 21292, Case 21293: Working on overlay bugs
 2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity 
Case 20920: Move Material Entity logic to render thread
 2019-02-19 10:59:51 -08:00
John Conklin II
0f8c36156b
Merge pull request #14952 from SamGondelman/textColor 
Case 21305: Fix text overlay color property
 2019-02-19 10:58:32 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory 
Case 20657: artist stocking inventory
 2019-02-19 10:46:01 -08:00
danteruiz
4bbae1230d making requested chantges 2019-02-19 10:07:36 -08:00
SamGondelman
927e824610 fix missing color for text overlays 2019-02-18 16:14:07 -08:00
David Rowe
f58a5db0b0 Reorganize JSDoc inheritance for MyAvatar and Avatar 2019-02-19 09:47:51 +13:00
Angus Antley
748368bfda mid tweak on the wrist and position coeffs 2019-02-17 23:32:52 -08:00
David Rowe
50a1e07ed2 Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc 2019-02-18 18:32:49 +13:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
85421cd6ee speed up stylus picks 2019-02-16 21:16:46 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
amantley
d78f253d24 code to generate pole vector from theta 2019-02-15 17:43:53 -08:00
Howard Stearns
e9b323a807 fix HFC symbol location at checkout, and the display of unavailable items 2019-02-15 16:56:31 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
SamGondelman
0f33d696d2 trying to fix pal colors 2019-02-15 16:12:36 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor 
Case 21012: Avatar Doctor
 2019-02-15 15:43:18 -08:00
Howard Stearns
f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 15:15:13 -08:00
amantley
36093926d0 added fake android defines for running the new ik on pc 2019-02-15 15:00:39 -08:00
Thijs Wenker
e900d3784b fixes 2019-02-15 23:58:42 +01:00
SamGondelman
3df231f1e0 it's working! 2019-02-15 14:43:22 -08:00
John Conklin II
09d8221582
Merge pull request #14834 from gcalero/connection_failure_dialog 
Case 20936: Set message dialog text width so wrap mode takes effect
 2019-02-15 14:16:02 -08:00
Brad Davis
578bc4fc89 Suppress logspam with missing Controller in QML 2019-02-15 14:15:24 -08:00
ingerjm0
c8791841de
Merge pull request #14918 from ctrlaltdavid/M21128 
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
 2019-02-15 14:15:13 -08:00
Brad Davis
78be935e1a Consolidating differences from master 2019-02-15 14:12:37 -08:00
Brad Davis
4409e59682 Add per-android-app preprocessor macros 2019-02-15 14:11:26 -08:00
Roxanne Skelly
a82385200e
Merge pull request #14906 from roxanneskelly/QmlMarketplace 
Qml marketplace - multiple improvements/bugfixes
 2019-02-15 14:04:47 -08:00
John Conklin II
b9356e22d8
Merge pull request #14927 from huffman/fix/hide-asset-browser 
Case 16349: Fix asset browser being hidden in incorrect way on server switch
 2019-02-15 13:32:27 -08:00
SamGondelman
c92b82e744 merge with master 2019-02-15 12:43:30 -08:00
Roxanne Skelly
2c4f485079 QmlMarketplace invert arrow direction on sort. 2019-02-15 12:31:01 -08:00
Thijs Wenker
74ce98a075 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor 2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16 Better scale and texture checks 2019-02-15 20:55:27 +01:00
SamGondelman
87ab255115 finish moving materials to rendering 2019-02-15 11:49:20 -08:00
Brad Davis
a5f84ab51a Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 11:37:13 -08:00
Roxanne Skelly
fb524f8900 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-15 11:35:06 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
Howard Stearns
490ef3542e update for marketplace-in-qml, and make specific to username 2019-02-15 10:58:09 -08:00
amantley
0fcaa695ba Merge remote-tracking branch 'upstream/master' into animArmIK 2019-02-15 10:35:33 -08:00
amantley
d6dfaacf6f adding ifdef for android os 2019-02-15 10:35:25 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Howard Stearns
8a6f2b221b Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 09:47:18 -08:00