David Rowe
6c81f597af
Display vertical scrollbar in Settings dialogs that scroll
2020-01-22 20:55:50 +13:00
Kasen IO
bd066adbf6
Whitelist toggle not working c++ side.
2020-01-20 16:03:48 -05:00
David Rowe
0666c3bbb1
Document that MyAvatar goto methods have safe landing
2020-01-20 21:31:50 +13:00
David Rowe
b816d7053a
Update models used in JSDoc examples
2020-01-20 21:07:33 +13:00
David Rowe
eae3336f57
Fix up docs links
2020-01-20 15:06:32 +13:00
David Rowe
1a4266a64a
Review JSDoc updates from recent commits
2020-01-20 14:33:06 +13:00
Dale Glass
68d10a2fe1
Make default copy constructors explicit
...
Recent versions of gcc generate a warning without this
2020-01-19 00:20:49 +01:00
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes."
2020-01-16 18:51:49 -06:00
NexPro
9af7c39513
Updated broken urls
2020-01-15 23:08:27 +00:00
NexPro
e15c135dc5
Merge remote-tracking branch 'remotes/origin/kasen/core' into kasen/core
2020-01-15 18:34:09 +00:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
...
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
653b333060
Merge pull request #85 from kasenvr/fix/obsolete-apps
...
Removed obsolete default scripts + more branding changes.
2020-01-14 12:33:30 -06:00
David Rowe
ec1e6bc7d3
Merge branch 'DOC-55-C' into api-docs
2020-01-14 18:04:32 +13:00
NexPro
203c371a01
Re-branding of help dialogs and tablet login
2020-01-14 00:33:29 +00:00
kasenvr
1133f51971
Merge pull request #70 from Nex-Pro/kasen/core
...
Rebranding of login dialogs etc. QML
2020-01-13 09:42:09 -05:00
Kasen IO
336b5e275b
Removed obsolete default scripts + more branding changes.
2020-01-12 23:13:01 -05:00
96dc01fcc6
Made requested changes to About dialog.
...
Removed dash from "open source"
Fixed missing and unecessary periods.
2020-01-12 12:47:17 -06:00
HifiExperiments
bc640b0f9f
Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion
2020-01-11 22:29:38 -08:00
HifiExperiments
bc319cb340
zone occlusion
2020-01-11 22:29:07 -08:00
074e9f711a
Update Help menu links for Project Athena.
...
Changes links in the help menu to point to Project Athena sites. Removed menu option for Online Forums, cuz I don't think we have one yet.
2020-01-10 16:20:00 -06:00
00855cba3d
Redo the About menu dialog
...
Change project name, remove references to EOS blockchain, add Project Athena copyright, add attribution to Opus.
2020-01-10 16:09:20 -06:00
NexPro
80e4e47cd8
updated TOS link. Changed incorrect filename in comment.
2020-01-09 10:20:28 +00:00
NexPro
769d2050c7
Additional re-branding of QML dialogs
2020-01-08 17:41:58 +00:00
NexPro
3944d6e47c
added banner svg
2020-01-08 16:24:49 +00:00
NexPro
2a8b92e683
Updated interface login page
2020-01-08 16:21:25 +00:00
kasenvr
19bca588ca
Merge pull request #58 from ctrlaltdavid/fix/avatar-packager-update
...
Update Avatar Packager
2020-01-07 22:43:34 -05:00
kasenvr
be08a949c2
Merge pull request #67 from FluffyJenkins/feature/fixedClaraRubbish
...
Fixed clara rubbish
2020-01-07 21:44:23 -05:00
Fluffy Jenkins
e488a66840
changed quote types
2020-01-07 20:59:00 +00:00
Fluffy Jenkins
ead359ce67
Fixed clara rubbish
2020-01-07 05:14:38 +00:00
kasenvr
0bdfdfff4a
Merge pull request #43 from ctrlaltdavid/fix/re-enable-jsdoc
...
Re-enable JSDoc building
2020-01-06 18:37:58 -05:00
David Rowe
1d9aec6fec
Improve order of dialog contents
2020-01-05 18:24:56 +13:00
David Rowe
977d498004
Add an "Open Project Folder" button
2020-01-05 17:53:36 +13:00
David Rowe
30c63fc305
Remove "Upload" button and associated items
2020-01-05 17:11:23 +13:00
David Rowe
cd6669ec8b
Comment out the "Video" button
2020-01-05 17:00:40 +13:00
David Rowe
d79c87b2d4
Change Avatar Package docs links
2020-01-05 16:59:51 +13:00
David Rowe
934311b54a
Change default Avatar Packager project directory
2020-01-05 16:15:04 +13:00
David Rowe
7364ac5521
Fix scaled avatar walk speed
2020-01-04 11:43:28 +13:00
kasenvr
1d14bed3ce
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
...
QML Whitelisting
2019-12-30 19:51:51 -05:00
Kasen IO
0b66627eff
The command line no longer launches with interface.
2019-12-29 23:48:32 -05:00
kasenvr
9dc7f54bfd
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
...
Feature/quality of life k2
2019-12-29 18:28:58 -05:00
David Rowe
a7d2412f11
Re-enable JSDoc building
2019-12-29 16:00:47 +13:00
Kasen IO
7489505f99
Updated whitelist info and name to include QML.
2019-12-26 22:27:58 -05:00
Nex-Pro
4856dd07fc
Update interface window title
...
Change window title from "High Fidelity" to "Project Athena"
2019-12-25 00:20:36 +00:00
David Rowe
00bd81b8c3
using MyAvatar.getTargetAvatar or AvatarList.getAvatar.
2019-12-24 09:52:19 +13:00
David Rowe
2dd981493e
Update classes' JSDoc per @hideconstructor
2019-12-23 14:13:48 +13:00
Kasen IO
c34cd996df
change Metaverse API from setting
2019-12-20 11:39:05 +01:00
David Rowe
a04e57d82d
Miscellaneous JSDoc fixes noticed in passing
2019-12-19 11:38:17 +13:00
David Rowe
e13b237e96
Add missing Controller.Hardware.Application camera properties' JSDoc
2019-12-19 11:23:36 +13:00
David Rowe
c52fa7a376
Fix up InteractiveWindow JSDoc per recent changes
2019-12-19 10:30:40 +13:00
Fluffy Jenkins
0f3e8d2101
Made requested changes
2019-12-18 20:08:20 +00:00
David Rowe
ccc4be5312
Revise extended avatar blend shapes JSDoc
2019-12-18 12:54:56 +13:00
David Rowe
a6b4bc5872
Revise recent Picks.PICK_BYPASS_IGNORE JSDoc
2019-12-18 12:30:50 +13:00
David Rowe
9d67b4aff2
Fix up MyAvatar JSDoc on sitting property and methods
2019-12-18 10:02:03 +13:00
David Rowe
427aa851b3
Fix up links to avatar standards guide
2019-12-18 09:51:34 +13:00
David Rowe
13a8ede1ac
Fix up MyAvatar reaction methods' JSDoc
2019-12-18 09:19:26 +13:00
David Rowe
28f5046ab2
Fix MyAvatar.gotoLocation()'s "withSafeLanding" parameter JSDoc
2019-12-18 08:31:57 +13:00
David Rowe
34958ddb71
Address some JSDoc issues identified by makitsune
2019-12-18 08:01:20 +13:00
David Rowe
c86ef990db
Fix up JSDoc for Window.minimizedChanged signal
2019-12-18 07:27:53 +13:00
Kasen IO
d4c3504c8d
Updated about dialog (old logo still there), application name, and readme.md
2019-12-14 23:12:54 -05:00
David Rowe
e6e240edb5
Polishing
2019-12-15 14:23:33 +13:00
David Rowe
93bcb43186
Stats API updates to match
2019-12-15 14:14:43 +13:00
David Rowe
70572c6b83
Performance API JSDoc
2019-12-15 14:14:30 +13:00
David Rowe
f1c23b8072
LODManager API JSDoc
2019-12-15 14:14:09 +13:00
Fluffy Jenkins
82dc6d197a
New feature
2019-12-14 03:02:13 +00:00
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442
...
DEV-2442: Fix main gamepad (XBox controller) controls
2019-12-13 13:36:20 -08:00
Brad Hefta-Gaub
e7bb57622a
Merge pull request #16557 from ctrlaltdavid/DEV-2810
...
DEV-2810: Rename Stats.audioAudioInboundPPS to Stats.audioInboundPPS
2019-12-13 13:34:34 -08:00
Brad Hefta-Gaub
1609e59c42
Merge pull request #16546 from HifiExperiments/cullFace
...
Material Entities can specify face culling method, support GLTF doubleSided property
2019-12-13 13:16:01 -08:00
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh
...
Procedural vertex shaders
2019-12-13 13:00:01 -08:00
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943
...
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
2019-12-13 10:53:24 -08:00
Brad Hefta-Gaub
80572e7d02
Merge pull request #16570 from ctrlaltdavid/DOC-241
...
DOC-241: ContextOverlay JSDoc
2019-12-13 10:49:14 -08:00
Brad Hefta-Gaub
3eb533538d
Merge pull request #16573 from ctrlaltdavid/DOC-244
...
DOC-244: OverlayWindow and OverlayWebWindow JSDoc
2019-12-13 10:43:31 -08:00
Brad Hefta-Gaub
42b69332f7
Merge pull request #16564 from ctrlaltdavid/DOC-239
...
DOC-239: Rates JSDoc
2019-12-13 10:36:39 -08:00
HifiExperiments
0bd5e15b47
fix non-procedural material entity crash
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
HifiExperiments
e0a29d9367
material entities support cullFaceMode and support gltf doubleSided
2019-12-12 23:01:57 -05:00
HifiExperiments
6e961b9f2f
procedural vertex shaders
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -05:00
David Rowe
57016ded11
Fix up some corresponding InteractiveWindow JSDoc
2019-12-13 10:13:22 +13:00
kasenvr
ca3af76081
Merge pull request #11 from MarcusLlewellyn/fixes/kasen-icon
...
Replace the interface icons with Kasen logo icon.
2019-12-11 10:45:55 -05:00
e098dbda7f
Change interface icons to Kasen logo.
...
We probably don't want to continue with High Fidelity's "voxel" icon for the interface. This changes them to the Kasen logo.
Tested on:
Windows 10 Pro 1909 build 18363.476
CMake 3.16.0
Microsoft Visual Studio Community 2019 Version 16.4.0
2019-12-11 09:21:43 -06:00
HifiExperiments
5fc55d1763
Merge branch 'master' into cullFace
2019-12-11 00:49:58 -08:00
HifiExperiments
2eb0ec18fc
fix non-procedural material entity crash
2019-12-11 00:42:59 -08:00
kasenvr
b470a765aa
Merge pull request #9 from kasenvr/feature/quality-of-life-k2
...
Feature/quality of life k2
2019-12-10 21:10:06 -05:00
David Rowe
92349706a9
Update WalletScriptingInteface JSDoc with links to ContextOverlay
2019-12-11 15:05:34 +13:00
David Rowe
febbd3a802
ContextOverlay JSDoc
2019-12-11 15:05:20 +13:00
David Rowe
4c1f7466d4
Typo
2019-12-11 09:31:29 +13:00
Seth Alves
f97c3217a5
allow Linux interface to connect to domain when DISABLE_QML is true
2019-12-10 09:52:12 -08:00
Kasen IO
297e039de5
Added a confirmation message + instructions to the QML.
2019-12-09 19:57:57 -05:00
David Rowe
73ad5d1d31
Fix some JSDoc typos noticed in passing
2019-12-10 13:34:32 +13:00
David Rowe
6750d02228
Rates JSDoc
2019-12-10 13:33:40 +13:00
jennaingersoll
6f44373141
Merge pull request #16556 from ctrlaltdavid/DOC-235
...
DOC-235: DriveKeys JSDoc
2019-12-09 15:58:31 -08:00
jennaingersoll
af120b9511
Merge pull request #16560 from ctrlaltdavid/DOC-237
...
DOC-237: DialogsManager JSDoc
2019-12-09 15:52:29 -08:00
jennaingersoll
369cacd068
Merge pull request #16558 from ctrlaltdavid/DOC-236
...
DOC-236: Account and GlobalServices JSDoc
2019-12-09 15:51:17 -08:00
Kasen IO
68443f878b
Update Application.cpp
...
updated application name.
2019-12-09 18:06:33 -05:00
Kasen IO
5fe27cdfc9
Added github link to about
2019-12-08 23:50:09 -05:00
Kasen IO
fe66dc82f3
scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly.
2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f
Cleaned out extra commented code.
2019-12-08 21:12:20 -05:00
David Rowe
31bae651c6
DialogsManager JSDoc
2019-12-08 15:51:08 +13:00
Kasen IO
2e36c40912
added QML + C++ system for whitelists
2019-12-07 21:37:23 -05:00
David Rowe
6060dad638
Resurrect gamepad Y teleport button
2019-12-08 12:38:48 +13:00
David Rowe
96e21343bf
Selfie view menu option isn't present in HMD mode
2019-12-08 12:38:48 +13:00
David Rowe
aabf27955b
Fix camera view cycling getting stuck in non-existent fullscreen mirror
2019-12-08 12:38:48 +13:00
David Rowe
fbc62df5d8
Account and GlobalServices JSDoc
2019-12-07 19:37:43 +13:00
David Rowe
957c056764
Fix JSDoc typo noticed in passing
2019-12-07 08:29:52 +13:00
David Rowe
dd64ecbdf2
Use the new property
2019-12-07 08:29:21 +13:00
David Rowe
078c30b696
Add Stats.audioInboundPPS property and signal
...
And deprecate misnamed originals.
2019-12-07 08:28:53 +13:00
Zach Fox
2b7d66c710
Slight optimization; comments
2019-12-06 10:32:45 -08:00
David Rowe
afdbbb95b1
DriveKey type and update MyAvatar JSDoc
2019-12-06 21:27:34 +13:00
David Rowe
3eadec3eaa
DriveKeys JSDoc
2019-12-06 21:26:59 +13:00
Zach Fox
04fe2988f5
Working
2019-12-05 18:50:31 -08:00
Zach Fox
c96c684400
Initial path to fixing screenshare auth race condition
2019-12-05 15:47:43 -08:00
Shannon Romano
f01a39adf5
Merge pull request #16553 from MiladNazeri/macScreenshareFix
...
Dev-2812: Broadcasting from MacOs won't work
2019-12-04 16:42:50 -08:00
milad
63e6875e27
added flag for windows and apple only on dependency
2019-12-04 11:28:32 -08:00
Kasen IO
6976939ff4
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-04 13:42:20 -05:00
Kasen IO
245224f0e9
Updated readme.md again + updated application title again.
2019-12-04 13:39:22 -05:00
milad
f71cf1fb74
fixed type
2019-12-04 10:06:57 -08:00
milad
83285aa414
fixed mac resource path location
2019-12-04 09:56:54 -08:00
Kasen IO
2cf453432e
Updated readme.md + updated application title.
2019-12-04 11:50:01 -05:00
milad
f350701eac
fixed resouce path and removed unused include
2019-12-04 08:44:56 -08:00
milad
8b45710aea
Got the F out of there
2019-12-03 14:36:13 -08:00
milad
fee4c826cc
Merging Dantes fix
2019-12-03 14:19:33 -08:00
dante ruiz
aeab06de53
fixing screenshare cmake issue for mac
2019-12-03 14:03:52 -08:00
miladi
60d074932c
experimenting with mac .app cmake build
2019-12-03 11:01:06 -08:00
jennaingersoll
cc0c829ff7
Merge pull request #16539 from ctrlaltdavid/DOC-227
...
DOC-227: Stats JSDoc
2019-12-02 12:19:42 -08:00
milad
2da99625fa
trying to add to resources
2019-12-02 11:43:25 -08:00
Kasen IO
165eb16f93
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 20:04:32 -05:00
Kasen IO
872a0b4496
Updated application version to 86.
2019-12-01 20:04:00 -05:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
David Rowe
91581ef3c5
Update JSDoc
2019-12-01 21:59:47 +13:00
David Rowe
200ff2499e
Include localVelocity etc. to match Entity.getEntityProperties()
2019-12-01 21:24:40 +13:00
David Rowe
c7f82a8264
Add new MyAvatar.getAvatarEntityData() implementation for API
2019-11-28 17:10:19 +13:00
David Rowe
9144e78cb9
Rename current getAvatarEntityData() method and use internally
2019-11-28 16:30:26 +13:00
David Rowe
3ebceff428
Doc review
2019-11-28 12:42:35 +13:00
Zach Fox
8be866ebbb
DEV-2840: Fix z-fighting issues in Smartboard and enable quicker positional iteration in the future
2019-11-26 18:10:21 -05:00
HifiExperiments
69714a89ca
material entities support cullFaceMode and support gltf doubleSided
2019-11-26 14:48:48 -08:00
Zach
7b49542a4d
Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode
2019-11-26 14:16:09 -05:00
David Rowe
46c389f064
Tidying
2019-11-26 15:19:54 +13:00
David Rowe
d797e33123
Stats JSDoc
2019-11-26 13:39:00 +13:00
milad
8b6df032e4
forgot a slash
2019-11-25 14:40:38 -08:00
milad
a38e0007f8
trying to go back several directories for the mac build
2019-11-25 13:32:48 -08:00
Zach Fox
5787b2f737
Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs
2019-11-25 13:16:17 -05:00
Shannon Romano
85cea1fcb6
Merge pull request #16533 from ctrlaltdavid/DEV-2800
...
DEV-2800: Fix crash in Stats.forceUpdateStats() at start-up
2019-11-25 09:04:30 -08:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
...
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
David Rowe
b458a746b7
Fix crash in Stats.forceUpdateStats() at start-up
2019-11-23 15:23:57 +13:00
Anthony J. Thibault
98c951702d
Added DEFAULT_GAZE_DISTANCE constant
2019-11-22 09:29:21 -08:00
Anthony J. Thibault
404d1a3c93
Fix several bugs for eye tracking from input plugins to function
2019-11-21 17:57:44 -08:00
Zach
e7091245b3
Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode
2019-11-21 15:38:28 -08:00
DouglasWilcox
b8d7f50eaf
Put away animation into resource and update script to use local resource path.
2019-11-21 14:50:05 -08:00
Anthony J. Thibault
9d6ce44131
Head is now computed in proper sensor space
...
Eye tracking now works.
2019-11-20 15:30:16 -08:00
Shannon Romano
37a46d91fa
Merge pull request #16513 from DouglasWilcox/Fix_seated_rotation_edge_case_bounce
...
Edge case fix for seated rotation - it would bounce forward if you let go of Q/E at exact right time.
2019-11-20 09:27:36 -08:00
DouglasWilcox
19aacde3a2
Fix case where Avatar could get stuck facing camera if rotating camera quickly and avatar faced backward.
2019-11-19 14:32:51 -08:00
Brad Hefta-Gaub
3b9c997317
Merge pull request #16505 from luiscuenca/zoomAndOrbitCamUsingTouchPad
...
Touchpad improvements: pinch to zoom camera, two finger swipe to look around, bug fixes
2019-11-19 13:30:45 -08:00
Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -08:00
milad
8676eaf0a0
removed additional signal
2019-11-19 13:04:27 -08:00
DouglasWilcox
8ccdfaf220
Clamp rotation velocity if hit trigger angle, but only bounce forward if cameraYaw is true.
2019-11-19 12:05:25 -08:00
Brad Hefta-Gaub
63b21af562
Merge pull request #16506 from ctrlaltdavid/DEV-2764
...
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
2019-11-19 12:05:10 -08:00
Brad Hefta-Gaub
69af66195c
Merge pull request #15334 from SaracenOne/screen_name_at_signup_push
...
case 22189: Add display name field to the log in screen.
2019-11-19 12:02:31 -08:00
jennaingersoll
451ffcd1e0
Merge pull request #16492 from jennaingersoll/jsdoc-revisions
...
DOC-208: Revisions to JSDoc added by developers since July 2019
2019-11-19 11:01:18 -08:00
Zach Fox
f07f81e976
Merge pull request #16510 from MiladNazeri/dev-2791/update-hardcoded-screen-values
...
dev-2791/update-hardcoded-screen-values
2019-11-19 10:46:36 -08:00
Brad Hefta-Gaub
0f428f0afb
Merge pull request #16498 from DouglasWilcox/improve_seated_rotation
...
Improve seated rotation
2019-11-19 10:22:08 -08:00
milad
0d713fcc8d
new values for position and dimensions
2019-11-19 10:12:17 -08:00
ingerjm0
d2118f0aac
DOC-208 revisions
2019-11-18 20:05:08 -08:00
Sabrina Shanman
359248829c
Merge pull request #16197 from highfidelity/instancing
...
(DEV-430) Instancing: Introduce hfm::Shape to enable Instancing support
2019-11-18 16:40:10 -08:00
Zach Fox
73590d2570
Fix DEV-2789: Implement retry timer when retrieving screen share info
2019-11-18 15:13:51 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master
...
Merge master into instancing
2019-11-18 13:54:33 -08:00
David Rowe
60d2845953
Remove further related dead code
2019-11-19 10:31:54 +13:00
David Rowe
748999b8d6
Remove reference to BodyMart in Avatar app
2019-11-19 09:59:59 +13:00
David Rowe
a912e97f1e
Remove reference to AvatarIsland in Avatar app
2019-11-19 09:53:58 +13:00
Sam Gateau
048626ba9a
Merge pull request #15278 from kitely/clear-more-disk-caches
...
case 21983: Clear more disk caches
2019-11-18 11:11:26 -08:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection
...
Add tools for debugging entity workload proxies
2019-11-18 11:02:00 -08:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom
2019-11-18 11:33:31 -07:00
DouglasWilcox
ddbb8d70ed
Speed up acceleration and blends slightly per Joshua, add kicks to turn anim.
2019-11-15 17:04:51 -08:00
Zach Fox
b64ce343bd
Merge pull request #16429 from MiladNazeri/screenshareElectronApp
...
Screenshare in Interface!
2019-11-15 15:32:51 -08:00
HifiExperiments
b73a608094
procedural vertex shaders
2019-11-15 00:22:40 -08:00
Brad Hefta-Gaub
f88f5ddded
Merge pull request #16496 from highfidelity/fix-realtime-unfocused
...
DEV-2760 - Fix Realtime Unfocused to be 60hz
2019-11-14 17:37:19 -08:00
DouglasWilcox
d9065affad
comment explaining seatedrot deceleration section, and transition-> turn works
2019-11-14 17:18:43 -08:00
DouglasWilcox
fb289704e2
iterate the turns, and make turning accessible from fidgets
2019-11-14 16:07:51 -08:00
milad
1035467c27
newline add
2019-11-14 16:06:28 -08:00
Zach Fox
5229b0c0f3
Various cleanup and CR
2019-11-14 15:45:52 -08:00
Zach Fox
e21ee20ff8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-14 15:18:07 -08:00
milad
65089494a8
updated cmake
2019-11-14 15:09:23 -08:00
DouglasWilcox
37010648be
Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.
2019-11-14 13:12:01 -08:00
milad
a4ad78c337
comment updates and extra includes removed
2019-11-14 11:28:37 -08:00
Brad Hefta-Gaub
56b1be4958
Fix Realtime Unfocused to be 60hz
2019-11-14 10:21:55 -08:00
Andrew Meadows
7692e858a1
use EntityItemID rather than QUuid
2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a
use std::vector<> instead of QVector<>
2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b
revert the revert of PR-16307
2019-11-14 09:59:43 -08:00
DouglasWilcox
11e1c4e6fe
linear acceleration experiment
2019-11-14 09:23:16 -08:00
Zach Fox
b4135e2655
We are so close...
2019-11-13 17:35:57 -08:00
Anthony Thibault
929e829801
Revert "Speculative fix for infinite loop in SafeLanding"
...
This reverts commit 52acfc9333
2019-11-13 17:17:37 -08:00
Anthony Thibault
487515d956
Revert "bug fix from code review comment"
...
This reverts commit e81b21ac59
2019-11-13 17:17:17 -08:00
Zach Fox
8255210c6a
Add new screenshare error signals
2019-11-13 15:43:41 -08:00
ingerjm0
ed9db81bed
Fix for displaying moved properties' documentation in docs
2019-11-13 14:58:32 -08:00
Shannon Romano
e1fc666b0f
Merge pull request #16479 from hyperlogic/bug-fix/safe-landing-deadlock
...
Speculative fix for infinite loop in SafeLanding
2019-11-13 14:47:41 -08:00
Zach Fox
50a1ebaa4d
Call stopScreenshare when screenshare app closed
2019-11-13 14:24:01 -08:00
DouglasWilcox
b8e85aedc7
Merge branch 'master' into improve_seated_rotation
2019-11-13 13:11:30 -08:00
milad
c6c9059a29
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-13 13:06:12 -08:00
Zach Fox
61f0896e30
Fix small bugs with the HTTP request to screenshare endpoint
2019-11-13 12:35:01 -08:00
Anthony J. Thibault
e81b21ac59
bug fix from code review comment
2019-11-13 10:40:00 -08:00
milad
abf592f533
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-13 10:14:14 -08:00
DouglasWilcox
a3de25618a
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
...
(cherry picked from commit f9f28fc286
2019-11-13 09:52:56 -08:00
Anthony J. Thibault
b92badbe76
Updated avatar-animation-optimized-ik.json from latest avatar-animation.json
2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1
Merge branch 'master' into bug-fix/android-t-pose
2019-11-13 08:21:19 -08:00
Zach Fox
b0c578aa7f
Improved HTTP request to proper endpoint - won't work until PR16459 is merged
2019-11-12 17:06:35 -08:00
Andrew Meadows
1c399f5e9b
add doc about PICK_BYPASS_IGNORE Pick FilterFlag
2019-11-12 16:58:09 -08:00
milad
ea8e285793
Zach's ss cpp cleanup changes
2019-11-12 16:02:52 -08:00
Anthony J. Thibault
365b132c30
Bugfix for t-pose avatar when moving
...
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose. This PR updates and renames the
android/optimized ik animation graph to the latest.
2019-11-12 15:33:41 -08:00
ingerjm0
dda69bf91a
JSDoc revisions for PR16245
2019-11-12 14:47:09 -08:00
ingerjm0
ce174696c0
JSDoc revisions for PR 16144
2019-11-12 14:38:51 -08:00
ingerjm0
11cb6ac6e0
JSDoc updates for PR15974
2019-11-12 14:18:12 -08:00
ingerjm0
a61857b6d8
JSDoc revisions for PR16025
2019-11-12 14:17:23 -08:00
DouglasWilcox
f9f28fc286
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
2019-11-12 14:15:19 -08:00
milad
49f972714c
more cleanup
2019-11-12 13:12:10 -08:00
DouglasWilcox
9d86e49a0b
Pretty good exponential acceleration, need to simplify
2019-11-12 11:59:39 -08:00
milad
0f605ffc43
clean up code
2019-11-12 11:37:07 -08:00
DouglasWilcox
995f5f92cd
Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula
2019-11-12 11:11:19 -08:00
Andrew Meadows
cf08a4162a
add workload job to help debug entity proxies
2019-11-12 10:35:16 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master
...
Merge master into instancing
2019-11-12 10:07:28 -08:00
milad
7cce153b6d
working flow. Needs clean up and final ui tweaks
2019-11-11 20:13:23 -08:00
Kalila R
a7b2c3a32c
Updated application name and version.
2019-11-11 20:22:19 -05:00
milad
ae35ec0975
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-11 16:42:55 -08:00
DouglasWilcox
64634f51b1
Merge branch 'master' into improve_seated_rotation
2019-11-11 11:31:56 -08:00
DouglasWilcox
c36c4a17b1
first pass hookup of seated rotation with acceleration and animation response
2019-11-11 11:31:34 -08:00
Shannon Romano
75ba65c2c9
Merge pull request #16467 from DouglasWilcox/rand_settles_and_by_momentum
...
Different settle transition depending on momentum
2019-11-11 10:48:57 -08:00
milad
c7b8d97639
updated api to try and communicate over EB, but still not working
2019-11-11 09:56:46 -08:00
Anthony J. Thibault
52acfc9333
Speculative fix for infinite loop in SafeLanding
...
This PR containts two fixes.
1) Tightening up the locks in the SafeLanding class to prevent race conditions.
By inspection there are cases where variables are read and modified outside of locks.
2) A check to help prevent an infinite loop in the _sequenceNumber std::distance calculation.
This is the main issue, in some cases backtrace is reporting the main thread as deadlocked.
The stacktrace points to an issue with the std::distance() calculation.
If the EntityQueryInitialResultsComplete is delayed signficantly, there could be a rare
case where the _sequenceNumber map grows large enough for the wraparound less then operator
will no longer function correctly. This will cause the std::distance calculation to never complete.
I've added a guard to prevent this from happening and some logs to help diagnose this issue in the future.
2019-11-08 14:22:04 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
milad
b206c102e8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-08 12:19:06 -08:00
dooglifeSF
02045a9fdf
add random versions of full sized settle
2019-11-08 11:57:06 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
...
Merge master into instancing
2019-11-08 10:10:50 -08:00
Nex-Pro
fea65133b4
Update WindowScriptingInterface.h
...
replace "model" with "modal"
2019-11-08 12:51:00 +00:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
milad
dd1795e9b6
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-07 09:33:47 -08:00
Shannon Romano
4484ef095c
Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety
...
Reduce fidgety motions in seated fidgets
2019-11-07 09:09:05 -08:00
milad
4b06e429d2
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-06 17:43:38 -08:00
Zach Fox
c8464786e7
Steps closer...
2019-11-06 17:16:21 -08:00
milad
fa8d5e57d1
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-06 15:48:24 -08:00
Zach Fox
a41ae3daa9
Move the local web entity logic to c++ - might not be working
2019-11-06 15:45:48 -08:00
Shannon Romano
10a1ee24e8
Merge pull request #16462 from zfox23/removeHomeIcon
...
DEV-2701: Remove the home icon from the profile app
2019-11-06 15:34:18 -08:00
Zach Fox
40814f9086
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-06 14:46:14 -08:00
milad
894b4127b4
modifying screenshare API for viewer
2019-11-06 14:35:20 -08:00
dooglifeSF
15b935b491
remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone
2019-11-06 13:08:42 -08:00
Anthony Thibault
8f0ca7b6db
Merge pull request #16447 from luiscuenca/hideNeckSecondPass
...
DEV-2461: Head woes in 1st person part 2
2019-11-06 12:11:59 -08:00
Clément Brisset
96f53dbbf3
Merge pull request #16448 from matt-hifi/deep-codesign
...
"deep" codesign Interface on macOS
2019-11-06 12:08:29 -08:00
Zach Fox
ca8a61f085
DEV-2701: Remove the home icon from the profile app
2019-11-06 11:11:57 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
...
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Matt Hardcastle
8dc91d640b
Remove this and connection from lambda expression
...
Clang in Xcode 11 is more aggressive about its warnings. This resolves
one of the issue Clang noticed in order to support building w/Xcode 11.
I first attempted to remove `this` completes, but VS complained that
`QObject::disconnect` was being called without `this`. This change
satisfies both Clang and VS.
A second attempt added this back and then called `disconnect` directly.
This also generated a Clang warning.
This version resolves the issue by removing the error handler. This also
resolves a memory leak caused by the error handler.
2019-11-06 09:13:40 -08:00
milad
56838de22d
fixed conflicts
2019-11-05 17:32:46 -08:00
milad
c6f7c058bc
merging master
2019-11-05 17:30:09 -08:00
sabrina-shanman
921eed1ec1
Remove CollisionPick::computeShapeInfo
2019-11-05 10:57:54 -08:00
sabrina-shanman
7b14c00540
Merge branch 'master' into instancing
2019-11-05 10:22:24 -08:00
