Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 05:49:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 25 branches 0 tags 1.1 GiB
Commit graph

3790 commits

Author SHA1 Message Date
Andrew Meadows
a1c540fc85 instantiate trace_workload logging category 2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc add 'workload' logging profile 2018-02-13 08:57:20 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow 
Shadow performance / acnee improvements
 2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs 
Misc bug fixes
 2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests 
Fix shared unit tests
 2018-02-09 17:18:35 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
Bradley Austin Davis
dbc4b1533d Fixing build warnings in minipromises 2018-02-09 10:12:32 -08:00
RebeccaStankus
14839bc5f4 Some improvements to the log window 
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
 2018-02-08 11:26:02 -08:00
Andrew Meadows
572edab79f remove dupe const 2018-02-07 16:48:31 -08:00
Seth Alves
b6ac348428 get children of animated entity joints to follow along, again 2018-02-07 16:30:07 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
Olivier Prat
234cb1e3e6 Added anti frustum test to remove lower cascade objects from higher shadow cascades 2018-02-02 12:15:43 +01:00
Olivier Prat
3804917cf4 Orthographic octree selection seems to be working 2018-02-02 09:40:57 +01:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Atlante45
cb6bebd824 Fix Mac dev builds 2018-01-29 19:47:36 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Atlante45
061f9ea359 Don't run settings preroutine when not initialized 2018-01-29 12:09:16 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Seth Alves
d73538f233 oops 2018-01-26 12:08:19 -08:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
dbe9fd290e comment out code that would set annotations after StartHandler is called 2018-01-26 09:23:29 -08:00
Atlante45
df62ba88cb Fix rebase error 2018-01-26 09:22:37 -08:00
Seth Alves
c02ab28c60 fix clang build 2018-01-26 09:22:28 -08:00
Atlante45
39f26e35f0 backtrace for rc-63 2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
Anthony J. Thibault
58d3d8ef3d Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.

(cherry picked from commit a252e90f96)
 2018-01-24 21:14:29 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
 2018-01-24 18:58:08 -08:00
Brad Davis
5049bac6ff Add helper function for QFileSelector 2018-01-23 12:25:22 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
humbletim
3a735c1fc7 CR feedback and code cleanup 2018-01-23 03:12:26 -05:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
humbletim
31cdd5cca2 QueuedConnection per CR feedback 2018-01-18 22:20:28 -05:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00
Bradley Austin Davis
6200d31c93 Fixing OSX resources URL 2018-01-17 14:46:27 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:11:33 -05:00
SamGondelman
134a026d8a merge from master 2018-01-17 13:36:07 -08:00
humbletim
744da48551 add apache 2.0 headers 2018-01-17 14:00:50 -05:00
Bradley Austin Davis
503fed19a7 Trying to fix mac resource loading 2018-01-17 10:36:34 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
SamGondelman
241849139f wip 2018-01-15 10:21:16 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
bee869d88e Merge remote-tracking branch 'upstream/master' into android 2018-01-14 13:53:47 -08:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Brad Davis
001edcd71b Allow creation of empty files with storage API 2018-01-11 08:06:52 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c Switching to binary resources 2018-01-10 13:39:56 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Anthony J. Thibault
fbea22e0f0 Renamed imag component to dual, using the correct nomenclature 
Also removed incomplete test from unit tests.
 2018-01-08 18:21:23 -08:00
Brad Davis
a2c2e7d9ff Fixes to load cubemap 2018-01-08 14:43:54 -08:00
Anthony J. Thibault
d08f94a74d Code review feedback 
* Removed AnimPose::fuzzyEqual
* Fixed DualQuaternion ctor
 2018-01-08 13:36:23 -08:00
Anthony J. Thibault
59b843781e Merge branch 'master' into feature/dual-quat 2018-01-08 13:18:42 -08:00
Gabriel Calero
7fbd23f36b Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr 2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c Resolving comments in PR 2018-01-08 17:36:08 -03:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Nissim Hadar
8e793e790a Deleted unused include file. 2018-01-07 14:11:26 -08:00
humbletim
fc41bcca5a removing unnecessary qWarning() debug output 2018-01-05 18:41:51 -05:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes 
Poly obj import fixes
 2018-01-05 13:33:29 -08:00
David Back
7558b00467 better fix for model scale floor, remove abs 2018-01-04 17:49:39 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Anthony J. Thibault
bcd813ac62 Optimizations and cleanup 2018-01-04 16:15:44 -08:00
Anthony J. Thibault
e86fd4f992 Removed SKIN_COMP define, re-enabled cauterization 2018-01-04 16:15:42 -08:00
Anthony J. Thibault
5bb0b06061 WIP: Dual Quaternion compensation for spinning the right way. 2018-01-04 16:15:39 -08:00
Anthony J. Thibault
8bdddf7211 Full Dual Quaternion support 2018-01-04 16:15:38 -08:00
Anthony J. Thibault
565875e823 WIP first attempt at dual quat skinning 2018-01-04 16:09:02 -08:00
Gabriel Calero
32494a8e24 Set QMLEngine base path for android 2018-01-03 22:13:31 -03:00
Gabriel Calero
fc62b2d34a Fix ktx_cache path for android. Load the least js scripts for android 2018-01-03 16:42:18 -03:00
Gabriel Calero
78f2a8c566 Copy scripts from android assets at startup 2018-01-03 16:40:14 -03:00
Gabriel Calero
468fc89c3e Use forward pipeline for android 2018-01-03 16:38:23 -03:00
RebeccaStankus
89138c9bd8 More filter choices, search will clear 2018-01-03 11:35:46 -08:00
humbletim
e941036337 renames per CR feedback / code cleanup 2018-01-02 15:28:01 -05:00
RebeccaStankus
efdba3b6e6 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2 2018-01-02 08:59:42 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
David Back
24981a560f fix scaling threshold 2017-12-28 11:56:39 -08:00
RebeccaStankus
296f0a323a saving for Wednesday 2017-12-26 15:56:05 -08:00
Stephen Birarda
e3cbfd92a0 Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back 2017-12-22 15:48:04 -08:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
Stephen Birarda
05b45f2e7e adjust example and add clarifying comments to PrioritySortUtil 2017-12-21 15:40:08 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
humbletim
7e1be2b17c shared promises library 2017-12-21 11:35:14 -05:00
Brad Davis
9f7b6f543d Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js 
Cleanup names of debug stats and trace contexts.
 2017-12-18 10:02:42 -08:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm 
Cascaded Shadow Maps and bug fix
 2017-12-14 00:32:43 +07:00
Andrew Meadows
87fa919ac8 save files to Documents by default 2017-12-12 14:11:25 -08:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602 
JSDoc updates
 2017-12-12 12:18:02 -08:00
David Rowe
58fa8b9fbf Miscellaneous fixes 2017-12-12 10:49:05 +13:00
Seth Alves
2cd64ccd2c merge from upstream 2017-12-11 10:14:30 -08:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01:00
Sam Gateau
429d54d65d Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-10 09:53:22 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process 
Move asset server baking to a separate process
 2017-12-09 20:48:14 -08:00
Ryan Huffman
e3d00c4aa5 Remove unnecessary logging from PathUtils 2017-12-08 17:48:10 -08:00
Ryan Huffman
982607eedf Remove unused variable from PathUtils 2017-12-08 15:40:33 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
Sam Gateau
d07cde3ecb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 19:20:25 -08:00
Seth Alves
40412b80c6 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 17:03:04 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Ryan Huffman
2eecb41337 Update metatype registration in assetBakeTask 2017-12-06 13:59:46 -08:00
Ryan Huffman
6b098bfc6a Fix aborted baking in oven cli 2017-12-06 13:51:31 -08:00
Ryan Huffman
cb9a30413d Rename removeTemporaryDis to removeTemporaryApplicationDirs 2017-12-06 12:50:20 -08:00
Ryan Huffman
f20aa2e680 Fix asset server baking not working on *nix 2017-12-06 11:49:34 -08:00
Ryan Huffman
de7e3e60cd Add temp dir removal to asset server 2017-12-06 11:49:34 -08:00
Olivier Prat
c9c93370da Fixed weird bug with objects suddenly poping out of the shadow map. Was due to objects with own pipeline corrupting the render state. Don't know why though 2017-12-06 15:26:44 +01:00
Olivier Prat
c0ca7a129d Fixed issue with far distance of cascades being underestimated, especially first cascade 2017-12-05 17:33:11 +01:00
Olivier Prat
0b6dcb2717 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-05 09:18:26 +01:00
samcake
9fceaad38b Merging with master 2017-12-04 14:20:10 -08:00
Seth Alves
b590cd5b89 avatar-entities which are children of an avatar will scale with the avatar 2017-12-02 09:31:43 -08:00
Andrew Meadows
05fbf8e511 workaround for zero-size objects in priority formula 2017-11-30 11:04:51 -08:00
David Rowe
4269cc4004 Camera API JSDoc fixes 2017-11-30 09:28:45 +13:00
Andrew Meadows
e068eb879c use PrioritySortUtil for outgoing avatar updates 2017-11-28 09:11:14 -08:00
Andrew Meadows
d65101c4e9 sort and throttle avatar updates in interface 2017-11-28 09:07:17 -08:00
David Rowe
cd2922a560 Merge branch '21602' into 21624 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2017-11-28 17:04:59 +13:00
David Rowe
92493f14d7 Miscellaneous JSDoc fixes 2017-11-28 16:30:09 +13:00
David Rowe
425e2eb82c Add missing parameter to Camera.newMode() JSDoc 2017-11-25 18:24:58 +13:00
David Rowe
16dd9e0063 Move Camera mode JSDoc to be a typedef 2017-11-25 18:24:38 +13:00
David Rowe
9983e1fd1c Polish Paths JSDoc 2017-11-25 18:06:27 +13:00
David Rowe
167bc21784 Fix up PickRay and StylusTip JSDoc 2017-11-25 17:23:53 +13:00
David Rowe
de49fefc61 Merge branch 'master' into 21602 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2017-11-25 17:06:36 +13:00
David Rowe
73f5841c9f Add PointerEvent and KeyboardModifiers API types JSDoc 2017-11-25 16:18:57 +13:00
David Rowe
06012d9dfc Add Color and Rect API types JSDoc 2017-11-25 16:18:40 +13:00
samcake
84ff40c717 Merging with master 2017-11-21 14:12:47 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
samcake
a74372b233 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-20 09:26:29 -08:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
33d35bbe14
Merge pull request #11770 from AndrewMeadows/sort-and-throttle 
sort and throttle UpdateRenderables work... when necessary
 2017-11-19 11:09:08 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
SamGondelman
61c7ccde6e cleanup 2017-11-17 10:45:39 -08:00
Olivier Prat
d98dfff0a8 Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage) 2017-11-17 19:25:21 +01:00
SamGondelman
ac7242102c Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-16 09:47:29 -08:00
SamGondelman
e3aa79990b merge with master 2017-11-16 09:45:32 -08:00
Sam Gateau
6889c9d6d1 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 18:49:30 -08:00
samcake
771c64fc97 Working on the selection highlight js interface 2017-11-15 18:21:07 -08:00
SamGondelman
3274c41aeb Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-15 17:45:45 -08:00
David Rowe
6f82049021 Merge branch 'master' into 21602 2017-11-16 13:41:29 +13:00
David Rowe
a29a3ff88d Paths API JSDoc improvements 2017-11-16 12:58:03 +13:00
Ryan Huffman
60a222e4b4
Merge pull request #11810 from Atlante45/fix/stuck-acs 
Fix stuck ACs
 2017-11-15 14:59:51 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00
David Rowe
41e929c8a2 Add missing types to typedefs 2017-11-16 10:58:03 +13:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Atlante45
d8b1cb10df CR 2017-11-15 11:20:30 -08:00
Olivier Prat
e4818f1b4f Merged request changes from shadow 2017-11-15 17:51:06 +01:00
Olivier Prat
f47a3e7d2c Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake 2017-11-15 09:42:57 +01:00
Andrew Meadows
500f381827 collect hard-coded time budgets in one spot 2017-11-14 15:57:17 -08:00
Andrew Meadows
ffe16a754e another pass through the crucible 2017-11-14 15:57:17 -08:00
Andrew Meadows
f67114a0a8 PrioritySortUtil::Prioritizer doesn't need to be a template 2017-11-14 15:57:17 -08:00
Andrew Meadows
55cc945c78 organize PrioritySortUtil differently 2017-11-14 15:57:17 -08:00
Andrew Meadows
99b4283cbc fix typo in 'out-of-view' check 2017-11-14 15:57:17 -08:00
Andrew Meadows
d7b84f8a86 fix typo in comment 2017-11-14 15:57:17 -08:00
Andrew Meadows
8707c76a6a templatize the ViewFrustum-relative sort algorithm 2017-11-14 15:57:17 -08:00
Atlante45
b31118fe00 CR 2017-11-14 11:41:43 -08:00
Atlante45
6b5b905b2a Exit right away if the parent process died 2017-11-14 11:41:43 -08:00
Atlante45
462ec30cac Utilise Windows Job Object so child dies w/ parent 2017-11-14 11:41:43 -08:00
SamGondelman
60db24f2d3 merge with master 2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
David Rowe
fb550d59f0 Better place for ViewFrustum JSDoc 2017-11-14 11:34:15 +13:00
SamGondelman
2c0272f304 (mostly?) fix touch events 2017-11-13 12:58:31 -08:00
David Rowe
4a84116877 Merge branch 'master' into 21602 2017-11-14 08:27:13 +13:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -08:00
Olivier Prat
dd6b7b04c2 Merged with master 2017-11-13 14:33:59 +01:00
Olivier Prat
fa58cf2e60 Merged with master 2017-11-13 14:07:48 +01:00
David Rowe
9c5149733d Paths JSDoc 2017-11-13 12:41:28 +13:00
David Rowe
2119e01ac3 Tidying 2017-11-13 11:59:21 +13:00
David Rowe
dba16c265c PickRay JSDoc 2017-11-12 13:50:07 +13:00
David Rowe
e4daaa8d67 ViewFrustum JSDoc 2017-11-12 12:50:39 +13:00
David Rowe
9d9f684af5 Tidying 2017-11-12 11:44:51 +13:00
David Rowe
39ccd7d656 Update JSDoc for Camera API 2017-11-12 11:04:35 +13:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline 
Multiple Outline Groups
 2017-11-10 15:45:03 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Andrew Meadows
469b68011c
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero 
div by zero fixes, detected by address sanitizer
 2017-11-10 13:47:40 -08:00
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key 
cleanup ShapeInfo hash generation
 2017-11-10 11:31:46 -08:00
Anthony J. Thibault
4169e11e77 Merge branch 'master' into bug-fix/div-by-zero 2017-11-10 10:15:26 -08:00
Olivier Prat
8b6a2eeb24 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-10 10:19:32 +01:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
SamGondelman
f970eb2302 merge with pointers branch 2017-11-06 14:49:50 -08:00
Brad Davis
544c54b8ee Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-06 10:07:22 -08:00
Olivier Prat
09ee69db30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-06 09:47:48 +01:00
SamGondelman
55ac585cd9 Merge remote-tracking branch 'upstream/master' into ui 2017-11-03 17:32:13 -07:00