Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 07:46:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 24 branches 28 tags 1.2 GiB
Commit graph

4523 commits

Author SHA1 Message Date
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Seth Alves
73e6be9c37 allow drawing DebugDraw spheres with a specific size 2019-09-17 09:43:19 -07:00
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
Anthony Thibault
b46378e0b6 Compile error fix 2019-05-10 15:51:42 -07:00
Anthony Thibault
fe17550a80 Code review feedback 
In DependencyManager::set<>() destroy the clear the previous before allocating the new instance.
 2019-05-10 15:41:52 -07:00
Anthony Thibault
442a679108 Make DepenencyManager thread-safe again 
Before this PR, there were no locks around the two internal QHash data structures.
Races are rare, due to the fact that the DependencyManager is initialized on the main thread on startup and the fact that a static QWeakPointer was used as an internal cache.
However, there have been reported crashes where the render thread uses DependencyManager::isSet() perhaps while the main thread is adding a late dependency.
DependencyManager::isSet() did not use the static QWeakPointer cache and was more prone to race conditions.

To avoid this and perhaps other data races, mutexes now guard both of the internal QHash data structures.
Also, as an optimization, the most frequent call to DependencyManager::isSet was removed (Profile.cpp).
 2019-05-10 14:12:10 -07:00
amerhifi
edb3206a24 adding macos platform. Misisng display and cpu info 2019-05-10 09:55:26 -07:00
amerhifi
0d97543ece code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform 2019-05-09 12:04:41 -07:00
David Rowe
c3730e41f7 Typos 2019-05-09 08:33:37 +12:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
7fb7e503f9 reduce footprint of ShapeManager::_shapeMap 2019-05-06 17:35:57 -07:00
David Rowe
9c12a39368 Merge branch 'master' into M22147 2019-05-06 11:28:22 +12:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068 
Case 22068: Clipboard JSDoc
 2019-05-02 11:15:25 -07:00
David Rowe
d8f6e923c7 Paths JSDoc update 2019-05-01 08:18:17 +12:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux 
Avatar network bandwidth optimization
 2019-04-26 10:16:30 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
David Rowe
73fd61dcf0 Picks, PickType, RayPick JSDoc update 2019-04-25 13:19:07 +12:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master 
Case 22333: Master: Fix asset server auto-baking
 2019-04-24 16:30:14 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
sabrina-shanman
05a2b11c54 Fix mat4FromVariant 2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check 
Better head vs camera checks for avatar head cauterization
 2019-04-16 15:07:46 -07:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
r3tk0n
a40fdf3f77 Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix 2019-04-15 09:47:26 -07:00
r3tk0n
87deb348a8 Adjust run speed constants. 2019-04-12 14:07:06 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989 
Case 21989: AvatarList and AvatarManager JSDoc
 2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052 
Case 22052: Camera JSDoc
 2019-04-12 12:26:39 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
David Rowe
617617736e Merge branch 'master' into M22052 2019-04-11 10:24:27 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing 
Case 21930: Don't change OpenGL context state every frame
 2019-04-10 09:42:09 -07:00
David Rowe
d587f1227d Add ResourceRequestObserver JSDoc 2019-04-10 12:09:48 +12:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization 
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
 2019-04-09 12:57:03 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Olivier Prat
08aa133472 Fixed other compilation errors / warnings 2019-04-05 11:32:00 +02:00
Olivier Prat
89ca7ac415 Fixed compilation errors 2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco 
Case 21777: Locomotion Project
 2019-04-04 16:18:32 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Olivier Prat
b71a8f7902 Switched to split sum model for ambient (as Unreal) 2019-04-04 16:10:33 +02:00
Olivier Prat
acded5488e Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-04 08:58:49 +02:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Olivier Prat
20f53f5de3 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-01 10:04:41 +02:00
SamGondelman
33b3e2afac try to fix build errors? 2019-03-29 10:57:01 -07:00
Olivier Prat
4a2323f3c2 Just need to write correct textureLod equivalent on CPU cube map 2019-03-27 17:43:26 +01:00
Brad Davis
36cecef166 Support explicit timestamps in tracing, conditional event output based on duration 2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -07:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
839a03ebe6 Miscellaneous JSDoc fixes noticed in passing 2019-03-26 09:41:07 +13:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
7a8dfe0aaf Fix run speeds. 2019-03-21 15:06:21 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
r3tk0n
cbd841a14d Update gearing system. 2019-03-11 16:22:48 -07:00
David Rowe
24286273b4 Miscellaneous JSDoc fixes 2019-03-09 19:22:07 +13: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
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13: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
8be93fd16c
Merge pull request #14891 from kencooke/glm-pack-normals-speedup 
Case 21114: SIMD optimized blendshape packing
 2019-03-07 15:28:40 -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
Dante Ruiz
d33400f6ad fix GCC compiler warning 2019-02-28 15:25:15 -08:00
David Rowe
aa53ab7492 Distinguish between Mat4 type and Mat4 API in JSDoc 2019-02-27 09:54:11 +13:00
David Rowe
e79594ef53 Fill in and tidy Avatar JSDoc 2019-02-27 09:53:11 +13:00
r3tk0n
5d3a778b0b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation 2019-02-25 13:10:47 -08:00
Roxanne Skelly
2dffd14fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-25 10:20:52 -08:00
Shannon Romano
dc6bdfae8a
Merge pull request #14995 from SamGondelman/parentCrash 
Case 21391: Fix parent loop crash
 2019-02-25 10:01:37 -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 Gondelman
30b6b7f21b
let's try that again 2019-02-22 16:30:36 -08:00
Roxanne Skelly
0636579822 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-22 15:43:42 -08:00
SamGondelman
081e62a647 fix parent loop crash 2019-02-22 14:26:15 -08:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
amantley
50bc8d3646 added protected function to cubic hermite spline 2019-02-21 13:32:28 -08:00
amantley
de10aebbb5 removed white space 2019-02-21 11:44:18 -08:00
amantley
64ec28ef44 added back missing unity meta files 2019-02-21 11:37:14 -08:00
Roxanne Skelly
8c058f147e Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-20 14:24:47 -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
r3tk0n
7092513b7d Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 17:42:58 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00