Commit graph

4418 commits

Author SHA1 Message Date
Seth Alves
64e4ff88e6 findClosestApproachOfLines will find where two lines get the closest to each other 2019-09-17 09:43:18 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash
BUGZ-1264: Support platform independent sleep/wake notifications
2019-08-26 16:20:50 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Simon Walton
d9558e35c3 Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak 2019-08-23 13:19:31 -07:00
Simon Walton
6a9e299981 Prefer non-link-local interface addresses; don't change port on initial address change from TCP probe 2019-08-22 17:34:41 -07:00
Andrew Meadows
54c69001b9 clarify safeLanding retry rate 2019-08-20 17:33:29 -07:00
Clement
97038a7196 Fix tracing warning spam 2019-08-09 17:20:41 -07:00
Simon Walton
4de720a456 Enable the event-queue hack on Linux in addition to Windows 2019-08-09 11:12:33 -07:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug
(BUGZ-1059) Improve debug API for picks/pointers
2019-08-07 12:01:26 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84
DOC-84: Update JSDoc with glTF
2019-08-06 13:22:04 -07:00
Shannon Romano
f02b76fed0
Merge pull request #16011 from ctrlaltdavid/DOC-60
Case 22106: DebugDraw JSDoc
2019-08-06 10:47:43 -07:00
sabrina-shanman
715f6a4473 Mark BaseNestableTransformNode::toVariantMap with override 2019-08-05 12:02:24 -07:00
sabrina-shanman
0bd00c3554 Fix not being able to use both QVector<unsigned int> and QVector<glm::uint32> in scripting 2019-08-05 10:31:13 -07:00
sabrina-shanman
27cf080ad6 Simplify getting nestable pointer in BaseNestableTransformNode::toVariantMap 2019-08-05 09:52:01 -07:00
Anthony J. Thibault
704a2d2ac9 Merge branch 'master' into feature/reaction-fixes 2019-08-05 09:43:32 -07:00
sabrina-shanman
f188a3589e Fix function signature for BaseNestableTransformNode::toVariantMap 2019-08-05 09:35:47 -07:00
sabrina-shanman
20fa78e51d Fix some dates and no newline at EOF 2019-08-02 16:13:07 -07:00
sabrina-shanman
f7c324c017 Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility 2019-08-02 16:10:39 -07:00
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text
Supporting text effects + fonts on Text Entities
2019-08-02 14:25:28 -07:00
David Rowe
53e8f7c5df DebugDraw JSDoc 2019-07-31 10:46:35 +12:00
Seth Alves
27b574cf14 disable webrtc for android 2019-07-30 14:09:34 -07:00
Seth Alves
c1cadf670e update webrtc library, enable for android 2019-07-30 14:09:31 -07:00
Seth Alves
32d5ab7b1f Make WebRTC library available 2019-07-30 14:09:30 -07:00
HifiExperiments
078ca7edea supporting text effects + fonts on text entities 2019-07-30 09:59:45 -07:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12:00
Anthony J. Thibault
2f949a4d4d Disable head ik while reacting
Also, split getReactions() API into two calls

* getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction().
* getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().
2019-07-26 15:26:43 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
Clement
7f9ad4ac25 Don't store unused cpuident data arrays 2019-07-23 14:23:12 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
Anthony Thibault
ecae92724e Added reaction api 2019-07-17 14:28:39 -07:00
kasenvr
e9e9607a3b modkit core changes initial commit
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
2019-07-14 21:35:13 -04:00
David Rowe
a45d8924fa Miscellaneous minor JSDoc fixes noticed in passing 2019-07-11 16:31:09 +12:00
Andrew Meadows
4bbfd7cad1 more correct bounding sphere around avatar for SafeLanding query 2019-07-01 15:53:42 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79
DOC-79: Entities JSDoc Update
2019-06-25 14:18:13 -07:00
Andrew Meadows
adce2a6fd0
Merge pull request #15838 from kencooke/render-blendshape-optim-avx2
Fix Mac crash caused by PR#15825
2019-06-25 13:54:39 -07:00
Ken Cooke
b079e3283e BUGFIX: use unaligned loads 2019-06-25 11:48:41 -07:00
Bradley Austin Davis
ca797e30e4
Merge pull request #15825 from kencooke/render-blendshape-optim-avx2
Blendshape CPU optimization
2019-06-25 09:41:13 -07:00
SamGondelman
c605c2917f trying to fix entity tree renderer performance 2019-06-24 14:32:56 -07:00
Ken Cooke
541d45012a Move BlendshapePacking_avx2.cpp to shared 2019-06-24 12:54:58 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
Sam Gateau
53094ef70c One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls 2019-06-19 16:52:33 -07:00
Seth Alves
0a2f37f9a0 Q_OBJECT and template classes don't mix 2019-06-18 15:36:32 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
David Rowe
b16086de74 Revise JSDoc for key Entities methods plus entity properties 2019-06-15 10:44:56 +12:00
Sam Gateau
5004070af9 Grab the name of the renderer no matter what 2019-06-12 17:14:44 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
David Rowe
42cb3d9828 Polish Vec3 API JSDoc 2019-06-06 10:26:43 +12:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Seth Alves
02ff4ea2f5 add some comments to help future devs 2019-06-04 15:45:33 -07:00
Seth Alves
8a9f3b9508 fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
50e99cc1fd fix uninitialized read 2019-06-04 13:00:26 -07:00
SamGondelman
f4a7b27042 cleaning up name lookups 2019-05-31 12:04:54 -07:00
Sam Gateau
3af8f37df5 THe real correct pltform agnostic cpuidex was in cpudetect... 2019-05-28 13:52:32 -07:00
Sam Gateau
a168109588 trying to clean up the asm for linux and macos 2019-05-28 12:27:26 -07:00
Sam Gateau
2d1b06a1ba adding string.h (instead of stdio.h) for memset and memcpy on linux 2019-05-28 01:00:51 -07:00
Sam Gateau
e3fe20ae6a adding stdio.h for memset and memcpy on linux 2019-05-28 00:53:03 -07:00
Sam Gateau
6f74098032 Fixing the getCPUIDEX 2019-05-28 00:26:30 -07:00
Sam Gateau
99f8b61727 Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:14:50 -07:00
Sam Gateau
42d1b340cd Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:00:45 -07:00
Gayathri
009068222f
Merge pull request #15595 from amerhifi/feature/platform
BUGZ-296: Linux platform implementation
2019-05-21 16:01:33 -07:00
amerhifi
4f547040c0 removing include 2019-05-21 09:01:40 -07:00
amerhifi
5f81224976 did not work on linux, backing out change 2019-05-21 08:59:04 -07:00
amerhifi
47a612b195 testing gpu ident changes 2019-05-21 07:46:02 -07:00
David Rowe
5227b35c6b Revise changes 2019-05-21 10:32:12 +12:00
David Rowe
ca7ddece8b Add missing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0a0a25139c Deprecate items that shouldn't be in the Script API 2019-05-21 10:32:12 +12:00
David Rowe
0e478de1a2 Stub out missing Script JSDoc 2019-05-21 10:32:12 +12:00
amerhifi
c1c2efc71d getting gpu name via profiler parsing 2019-05-16 15:47:03 -07:00
amerhifi
9e00920884 adding computer model to platform for macos 2019-05-16 14:30:11 -07:00
Brad Hefta-Gaub
4e8d3470d6
Merge pull request #15512 from amerhifi/feature/platform
case lily-29:  Feature/platform. Creating a single point api to get system info
2019-05-15 14:04:43 -07:00
jennaingersoll
559a39be56
Merge pull request #15513 from ctrlaltdavid/M22147
Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc
2019-05-15 12:17:12 -07:00
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
amerhifi
fe6b2fceed addressing comment in pr. removing extra space added in previous checkin 2019-05-14 09:39:44 -07:00
amerhifi
2a6dc53395 Merge branch 'master' into feature/platform 2019-05-14 06:18:37 -07:00
amerhifi
dc139dc04d added missing eof 2019-05-13 17:47:12 -07:00
Seth Alves
d630f90f4d
Merge pull request #15548 from SamGondelman/tests
BUGZ-173: Fix deadlock on startup
2019-05-13 17:32:32 -07:00
amerhifi
804d171102 fixed a bunch of pr comments 2019-05-13 16:38:11 -07:00
Roxanne Skelly
4ad3163ca5 Disable event queue debugging for non-windows platforms. 2019-05-13 16:37:45 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246
Case 22246: Picks, PickType, RayPick JSDoc update
2019-05-13 16:16:17 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
David Rowe
70ec84177a Doc review 2019-05-14 10:32:28 +12:00
Ryan Huffman
2e2d0add93 BUGZ-89: Suppress getTransform spam 2019-05-13 14:50:46 -07:00
SamGondelman
652ac17dac fix deadlock on startup 2019-05-13 14:17:55 -07:00
amerhifi
71d534c97d merged master and resolved application conflict 2019-05-13 12:09:50 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch
Case 22379: Run-time switch for deferred/forward rendering
2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
Shannon Romano
99239f6415
Merge pull request #15542 from hyperlogic/bug-fix/dependency-manager-thread-safety
Make DependencyManager thread-safe
2019-05-13 07:43:55 -07:00
amerhifi
9899b8c858 Merge branch 'master' into feature/platform 2019-05-13 06:52:13 -07:00
amerhifi
13c9bb078c cleaned up pointers from the platform. Relized that having to manage them outisde of the platform will cause other issues. 2019-05-13 06:50:08 -07:00