howard-stearns
115bc27557
back to stable, rather than staging
2017-11-29 13:39:58 -08:00
David Rowe
4269cc4004
Camera API JSDoc fixes
2017-11-30 09:28:45 +13:00
amantley
233d693d76
removed debug print statements and fixed negative FPS handling
2017-11-29 10:51:04 -08:00
howard-stearns
fb038c17ee
for now, point this PR at staging so that it can be tested as built by
...
jenkins
2017-11-29 09:54:34 -08:00
Brad Davis
101d6763cc
PR feedback
2017-11-29 09:11:52 -08:00
amantley
778d98f56b
made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function
2017-11-28 18:42:03 -08:00
Anthony J. Thibault
0ec72f2559
warning fix
2017-11-28 17:45:13 -08:00
howard-stearns
281b4cfd88
Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA
2017-11-28 16:59:44 -08:00
Bradley Austin Davis
e4220aa44e
Fixing warnings in android build
2017-11-28 14:32:30 -08:00
amantley
101e67498a
cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property
2017-11-28 14:11:56 -08:00
David Back
7101719295
newline
2017-11-28 13:01:47 -08:00
David Back
5cceceb868
secondary cam texture fixes
2017-11-28 13:00:41 -08:00
amantley
1eacf7cbda
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
This is to update the branch with the master branch
2017-11-28 11:41:29 -08:00
Bradley Austin Davis
d6072f2bf2
Add bullet and draco to precompiled libraries
2017-11-28 11:32:34 -08:00
Brad Davis
d769acd345
Updating Android toolchain
2017-11-28 11:32:32 -08:00
Andrew Meadows
e212ac67c1
enable custom avatar sort tuning
2017-11-28 11:30:06 -08:00
amantley
d607ca0914
initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server
2017-11-28 11:04:48 -08:00
Andrew Meadows
deccc54965
remove cruft
2017-11-28 09:14:05 -08: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
07a7cb412a
Merge branch '21602' into 21603
2017-11-28 16:43:12 +13:00
David Rowe
92493f14d7
Miscellaneous JSDoc fixes
2017-11-28 16:30:09 +13:00
Stephen Birarda
8978254037
kick logged in by fingerprint/ip if enabled in DS settings
2017-11-27 18:23:14 -08:00
SamGondelman
d4a4c8902a
fix reticle depth at different scales and x button click on mouse press
2017-11-27 17:46:19 -08:00
Brad Hefta-Gaub
6d6ac0a5a9
Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash
...
avoid a crash during domain change while wearing something
2017-11-27 13:01:48 -08:00
howard-stearns
1575119327
PR feedback
2017-11-27 10:46:57 -08:00
howard-stearns
2e919682a0
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-27 10:02:53 -08:00
luiscuenca
027d2d323c
Measure tool and corrections
2017-11-26 22:28:34 -07: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
David Rowe
91671722a5
Add Shape API types JSDoc
2017-11-25 16:09:54 +13:00
Sam Gateau
9a31a3dc95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-22 23:29:55 -08:00
amantley
522dc3dfb1
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating Character entity fixes branch with the changes in the origin
master
2017-11-22 17:55:39 -08:00
amantley
2e75016021
changes to modelEntity.cpp
2017-11-22 17:53:21 -08:00
amantley
fdf5139a74
everything now works with an atomic start time property. but now I will get rid of this and use current frame instead
2017-11-22 17:52:13 -08:00
howard-stearns
a6b437a79f
get rid of "error" warning because the key wasn't broken into 64 char
...
lines
2017-11-22 16:55:57 -08:00
Seth Alves
9ccc416e80
avoid a crash during domain change
2017-11-22 16:34:56 -08:00
howard-stearns
abf41300dd
refactor
2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6
fix up dynamic ownership challenge
2017-11-22 15:58:30 -08:00
Anthony J. Thibault
b3896f664d
Made increaseScale and decreaseScale more responsive at limits
2017-11-22 14:45:52 -08:00
samcake
1514cdfb2f
extend the set of interface for multi highlight
2017-11-21 17:59:45 -08:00
amantley
1e5d099b06
changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp
2017-11-21 17:36:01 -08:00
howard-stearns
16d6d8a361
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08: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
Brad Hefta-Gaub
817afcd083
Merge pull request #11741 from ZappoMan/entityItemCleanup
...
Entity item cleanup
2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub
5914f27027
Merge pull request #11706 from luiscuenca/webAudioDev_fresh
...
QML & Web generated audio now follow the client audio device selection
2017-11-21 11:29:48 -08:00
ZappoMan
3a967ca895
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub
5dadec0b93
Merge pull request #11845 from thoys/feat/parentJointName
...
Import JSON parentJointName value
2017-11-21 07:58:13 -08:00
ZappoMan
b44ced4c21
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-20 17:19:18 -08:00
Thijs Wenker
627fee80ec
added support for exporting parentJointName
2017-11-21 01:49:56 +01:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez
3211aa7d13
Merge pull request #11849 from elisa-lj11/blocks
...
Zip file structures replicated in asset server
2017-11-20 16:13:51 -08:00
Bradley Austin Davis
7a5dc9e00b
remove test code disabling the script cache
2017-11-20 15:57:44 -08:00
Thijs Wenker
c3754d6369
smart pointer
2017-11-20 23:24:03 +01:00
amantley
5a1d04ee06
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating the branch with the current master
2017-11-20 10:22:46 -08:00
Elisa Lupin-Jimenez
b6e75d1222
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
3aa7cb440d
file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url
2017-11-20 10:01:33 -08:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
Thijs Wenker
e94199acad
Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName
2017-11-20 18:29:54 +01:00
Thijs Wenker
84ec9890ca
reverted special property case, parentJointName is now only parsed from the JSON import
2017-11-20 18:29:33 +01:00
samcake
a74372b233
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-20 09:26:29 -08:00
amantley
befa0f8ab5
now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp
2017-11-20 09:11:15 -08:00
Seth Alves
df07b66872
Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes
2017-11-20 07:47:19 -08:00
ZappoMan
3b77f14f69
fix build error
2017-11-19 15:12:23 -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
6429b61463
Merge pull request #11850 from druiz17/tablet-initial-page
...
Fix tablet not loading webpage when tablet root not initialized
2017-11-19 11:12:50 -08:00
David Rowe
27e3e0bf0b
Merge branch 'master' into 21602
2017-11-20 08:12:19 +13: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
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
...
Make add entity atomic
2017-11-18 14:27:12 -08:00
Sam Gateau
44f63ef802
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-18 08:23:59 -08:00
amantley
013d16cee9
this is the change to add a property for the currentframeplaying
2017-11-17 18:37:54 -08:00
samcake
e0740b323d
keep debuging the seelction highlight
2017-11-17 18:11:18 -08:00
Brad Hefta-Gaub
74bafcbb10
Merge pull request #11795 from huffman/fix/ds-punchlist
...
Punchlist fixes for DS
2017-11-17 17:04:27 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
ZappoMan
66454e7288
fix unix warnings
2017-11-17 16:33:43 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Dante Ruiz
427f676859
minimize diff
2017-11-17 16:06:34 -08:00
Dante Ruiz
ab9432c1cd
load webpage if tablet root is not initialized
2017-11-17 16:02:53 -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
Zach Fox
f47f259816
Turn Commerce on by default
2017-11-17 15:12:49 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1
...
glTF import DEMO
2017-11-17 14:52:51 -08:00
ZappoMan
71a46a3374
cleanup
2017-11-17 13:03:04 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id
...
Reset EntityTreeSendThread known state if client disconnects from Entity Server
2017-11-17 12:56:25 -08:00
Brad Hefta-Gaub
f5bb29f767
Merge pull request #11842 from birarda/networking-api-info
...
clarify the send packet list APIs
2017-11-17 12:30:09 -08:00
Thijs Wenker
3c37bf8acd
parentJointName property experiment
2017-11-17 20:33:06 +01:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a
...
Particles emitter fixes
2017-11-17 11:31:12 -08:00
H Q
28eedd1a94
Small style mod
2017-11-17 11:30:21 -08:00
Stephen Birarda
16d93ee168
clarify signatures in LNL to send packet lists
2017-11-17 11:17:11 -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
Stephen Birarda
dd27e3db31
add diff traversal reset when resetting state
2017-11-17 09:44:35 -08:00
ZappoMan
cd0fa989e1
debugging
2017-11-17 08:55:55 -08:00
samcake
45f14d0cd3
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-17 08:50:44 -08:00
H Q
21a28827c9
Remaining coding style changes, other small fixes
2017-11-17 07:59:52 -08:00
Olivier Prat
b246c479e3
Much better cascade blend
2017-11-17 11:25:15 +01:00
amantley
20fd893b47
Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp
2017-11-16 18:38:28 -08:00
amantley
ded81fcab0
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
Updating the branch to the latest code
2017-11-16 13:53:17 -08:00
ZappoMan
e438ac54d5
make adds go over NLPacketList as reliable
2017-11-16 13:16:23 -08:00
amantley
881b22ab15
added update function to modelEntityItem.cpp
2017-11-16 12:41:56 -08:00
H Q
14890495a2
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
...
Syncing
2017-11-16 12:38:45 -08:00
H Q
27350ddbfc
Coding style corrections
2017-11-16 12:35:00 -08:00
samcake
bafa82f6c5
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-16 12:12:04 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -08:00
Clément Brisset
2b39cb4500
Merge pull request #11832 from highfidelity/RC59
...
Merge RC59 into master
2017-11-16 11:19:54 -08:00
ZappoMan
4c4f23e312
Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic
2017-11-16 10:09:46 -08: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
Olivier Prat
917ce7165c
Working shadow cascade debugging view in Luci app
2017-11-16 15:36:48 +01:00
Olivier Prat
f8c241c429
Merged disappearing shadow bug fix from pcf branch
2017-11-16 12:19:19 +01:00
Olivier Prat
d2c28c3c21
Fixed disappearing shadow bug each time a domain was automatically reloaded
2017-11-16 10:49:59 +01:00
Olivier Prat
e574be7855
Fixed potential mismatch between push/popViewFrustum in shadow task
2017-11-16 10:00:32 +01:00
Seth Alves
93fd2a6a6b
clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared
2017-11-15 20:10:05 -08:00
David Rowe
d3c33b1aaf
Quat API JSDoc
2017-11-16 16:20:54 +13: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
amantley
cc43d8115c
In response to bug in the original PR, in RenderModelEntityItem.cpp I made a change in the handling of the boundary cases for the first and last frame properties. Also deleted some extraneous comments.
2017-11-15 17:42:33 -08:00
David Rowe
6f82049021
Merge branch 'master' into 21602
2017-11-16 13:41:29 +13:00
John Conklin II
0306c22394
Merge pull request #11823 from luiscuenca/case9267
...
Fix not restoring animations after changing view modes
2017-11-15 16:38:35 -08:00
David Rowe
a35316913e
Uuid API JSDoc fixes
2017-11-16 12:58:33 +13:00
David Rowe
a29a3ff88d
Paths API JSDoc improvements
2017-11-16 12:58:03 +13:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom
...
Bloom
2017-11-15 15:11:31 -08: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
David Kelly
009e6b252a
Merge pull request #11814 from AndrewMeadows/fix-cylinders
...
fix cylinder collision shape
2017-11-15 15:24:29 -07: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
luiscuenca
bf0d55aa98
9267 Fix not restoring animations after changing view modes
2017-11-15 15:04:24 -07:00
David Rowe
41e929c8a2
Add missing types to typedefs
2017-11-16 10:58:03 +13:00
samcake
932089115e
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-15 12:51:01 -08:00
Brad Davis
0ad3999741
Fixing misname
2017-11-15 12:24:00 -08:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Anthony J. Thibault
b49891c0f8
Bug fix for MyAvatar.getEyeHeight()
2017-11-15 11:27:42 -08:00
Atlante45
d8b1cb10df
CR
2017-11-15 11:20:30 -08:00
Atlante45
e68ce97697
Remove the number of socket change tracking
2017-11-15 11:19:54 -08:00
Sam Gateau
2c51e516eb
Merge pull request #11744 from Zvork/shadow
...
Shadow caster culling fix
2017-11-15 09:49:39 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
...
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
samcake
78ac609752
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-15 09:12:18 -08:00
Andrew Meadows
d538a9aaa8
fix typo making cylinders collide as sphere
2017-11-15 09:04:04 -08:00
Olivier Prat
e4818f1b4f
Merged request changes from shadow
2017-11-15 17:51:06 +01:00
Olivier Prat
14275b1cf3
Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded
2017-11-15 15:42:04 +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
Olivier Prat
bf46ccefaf
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-15 08:59:36 +01:00
amantley
1a435b10c1
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
This merge is to update the character entity fixes branch with the
upstream master code
2017-11-14 17:16:34 -08:00
Andrew Meadows
2f5b7f32c6
only add valid renderables to _renderablesToUpdate
2017-11-14 17:08:12 -08: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
111480f630
fix bad conflict resolution
2017-11-14 15:57:17 -08:00
Andrew Meadows
e93c10b5ee
remove cruft
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
Andrew Meadows
f47185b2f6
remove tabs from indentation
2017-11-14 15:57:17 -08:00
Andrew Meadows
c6bccb3de3
avoid adding null renderables to list
2017-11-14 15:57:17 -08:00
Andrew Meadows
809ff7928e
sort and throttle UpdateRenderables
2017-11-14 15:57:17 -08:00
Andrew Meadows
5050a554a2
remove warning about signed/unsigned comparison
2017-11-14 15:57:17 -08:00
H Q
0db9e876d6
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
2017-11-14 15:40:44 -08:00
H Q
44f2c92d30
Final ECSDA and nonce modifications for this dev cycle
2017-11-14 15:40:29 -08:00
Stephen Birarda
05a38a78c5
don't send octree data without first query
2017-11-14 14:08:27 -08:00
Olivier Prat
5102c8e1b1
Merged with master
2017-11-14 21:56:00 +01:00
Olivier Prat
c5bd86a4bf
Disabled bloom by default
2017-11-14 21:54:40 +01:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
...
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -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
David Back
4b8021bc4a
Merge pull request #11802 from dback2/mirrorfanciness2
...
prevent rendering HUD elements in secondary camera
2017-11-14 10:49:18 -08:00
Olivier Prat
2a19247530
Switched back to 3 cascades
2017-11-14 19:09:35 +01:00
Olivier Prat
d14ebdc0e1
Adjusted cascade partitions
2017-11-14 18:53:50 +01:00
Olivier Prat
74b0b52edb
Working CSM with smooth blend between cascades. Switched to 4 1024 cascades
2017-11-14 16:57:22 +01:00
Olivier Prat
010104d42a
Switched off noise and switched back to screen space dither
2017-11-14 10:11:39 +01:00
Sam Gateau
02c60c425e
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-13 18:40:51 -08:00
samcake
fd46aa15ff
adding occluded/visisble to highlight outline
2017-11-13 17:23:21 -08:00
Brad Davis
d71fd151c5
Fixing button model exposure
2017-11-13 16:45:27 -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
Brad Davis
8f85c7650b
Make sure loaded components get the right parent context
2017-11-13 14:16:04 -08:00
SamGondelman
2c0272f304
(mostly?) fix touch events
2017-11-13 12:58:31 -08:00
amantley
842cddde88
Deleted new members of RenderableModelEntity.h that were not necessary
...
to implement the loop,hold,play properties for an entity animationq
2017-11-13 12:00:32 -08:00
samcake
ad9bdc884e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-13 11:52:32 -08:00
amantley
8c70e41fe4
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating the character_entity_fixes branch
2017-11-13 11:30:56 -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
Seth Alves
9df11fb11a
Merge pull request #11787 from elisa-lj11/musvis
...
Second fix to null file path return (specific to music visualizer)
2017-11-13 09:44:47 -08:00
Olivier Prat
ac0e816f8c
Cascade selection working on shadow but not in Luci debug mode
2017-11-13 18:42:34 +01:00
Sam Gateau
4b14a7a820
Merge pull request #11799 from NissimHadar/hazeUIFix
...
Removed Keylight attenuation from .js (as well as .html).
2017-11-13 09:18:29 -08:00
amantley
d592520b7a
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
This is to synch the character entity fixes branch with the master
2017-11-13 08:48:26 -08:00
Olivier Prat
28d46dc4a5
First alpha version of cascade selection code in shader
2017-11-13 15:56:11 +01:00
Olivier Prat
7515c341ad
Merged with PCF fix with dithered filtering
2017-11-13 14:47:35 +01: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
Olivier Prat
6611b28e2d
Switched to world space dithering for more visual stability
2017-11-13 13:54:51 +01:00
Olivier Prat
dd0eaafc0d
Screen space dithering for PCF with some noise added
2017-11-13 12:33:46 +01:00
Olivier Prat
70847a9513
Wrong texture map assigned to cascade slots
2017-11-13 08:49:45 +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
bde3dbc2fd
Uuid JSDoc
2017-11-13 11:25:11 +13:00
Ryan Downe Karpf
9ff4541ee3
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
...
Remove hack for missing inttypes.h header on VS2010
2017-11-12 10:59:19 -08:00
Nissim Hadar
f629357ded
Removed Keylight attenuation from .js (as well as .html).
2017-11-11 18:58:12 -08: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
a2ece7a3ad
Initial, placeholder JSDoc for Uuid
2017-11-12 12:02:58 +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
eb270f3473
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-11 09:21:32 -08:00
David Rowe
f5e155bf94
Expand Menu's JSDoc
2017-11-11 17:01:55 +13:00
David Rowe
c8734ccd63
Menu JSDoc improvements
2017-11-11 16:18:05 +13:00
David Back
163de649bf
prevent rendering HUD elements in secondary camera
2017-11-10 17:44:09 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
...
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
amantley
3f7a9e9703
all entity animation fixes including the animation play reset
2017-11-10 15:36:57 -08:00
amantley
1a06c6ef11
all entity animation fixes done except play animation
2017-11-10 15:23:17 -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
SamGondelman
cbf0543646
deadspot
2017-11-10 13:22:38 -08:00
samcake
6b1e2d0d5a
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-10 12:37:06 -08:00
samcake
cc7ddb5e55
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-10 12:36:37 -08:00
Brad Davis
92a3c209aa
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-10 11:44:29 -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
David Rowe
c77a12f5fa
Update Clipboard and Menu JSDoc to use JavaScript type names
2017-11-11 07:55:57 +13:00
Anthony J. Thibault
ba4c0f189e
code review feedback
...
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
samcake
8d75e5e96a
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-10 10:24:56 -08:00
beholder
5fcde1186a
hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard
2017-11-10 21:20:00 +03:00
beholder
db3ed81513
adjust to changed requirements:
...
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf
4684 Add collapse button on the virtual keyboard
2017-11-10 21:20:00 +03:00
Anthony J. Thibault
4169e11e77
Merge branch 'master' into bug-fix/div-by-zero
2017-11-10 10:15:26 -08:00
Olivier Prat
103e036b70
Shadow maps rendered in cascades
2017-11-10 18:30:37 +01:00
Olivier Prat
08b06281f4
Min / Max cascade distance computation
2017-11-10 16:17:09 +01:00
Olivier Prat
8f84e5fbed
Added sampler array in shader to support future cascades
2017-11-10 15:39:26 +01:00
Olivier Prat
e0b36b800f
Added Cascade subclass in LightStage Shadow
2017-11-10 14:55:49 +01:00
Olivier Prat
7fd03bed7e
Added cascades in schema buffer but still only first used
2017-11-10 14:28:35 +01:00
Sam Gateau
608093eee5
reverting the change in light direction /oritenation
2017-11-10 02:55:22 -08:00
Olivier Prat
cbd2877524
Optimized shadow shader evaluation by computing concatenated shadow reprojection matrix on CPU
2017-11-10 11:26:20 +01:00
Olivier Prat
6cd4da877e
Fixed dithered PCF filter in shadow
2017-11-10 11:11:04 +01:00
Olivier Prat
cf5a7531df
Fixed dithered PCF filter in shadow
2017-11-10 11:10:31 +01:00
Olivier Prat
8b6a2eeb24
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-10 10:19:32 +01:00
David Rowe
036ac8de6d
Update JSDoc for Menu JavaScript API
2017-11-10 21:55:42 +13:00
ZappoMan
c6947dd165
some side by side plumbing for NLPackets and NLPacketLists
2017-11-09 18:20:06 -08:00
Anthony Thibault
de9eeff7d2
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
...
Fix for address sanitizer warning
2017-11-09 14:19:03 -08:00
David Rowe
2c542b73a0
Fix particles emitter rendering not updating when edit textures URL
2017-11-10 10:22:35 +13:00
SamGondelman
5a78c9ebfe
integrated stylus into pointer system, need to update controller module
2017-11-09 11:59:17 -08:00
Elisa Lupin-Jimenez
119c662899
fixed null file path in file dialog call
2017-11-09 11:46:19 -08:00
Anthony J. Thibault
9724a5e5b8
Fix for address sanitizer warning
...
This fixes a potential null pointer dereference.
2017-11-09 10:53:36 -08:00
amantley
3ce65ece87
Merge remote-tracking branch 'upstream/master' into character_entity_fixes
...
this is just to synch this branch with the upstream master
2017-11-09 10:38:34 -08:00
Anthony J. Thibault
5507bcea3c
Remove hack for missing inttypes.h header on VS2010
2017-11-09 10:34:01 -08:00
amantley
af0304fd6b
preliminary changes for the property fixes
2017-11-09 10:04:12 -08:00
Olivier Prat
4f7ed38e98
Fixed potential link errors on Mac
2017-11-09 11:26:08 +01:00
Olivier Prat
bccd6df57c
Fixed warning on Mac and Ubuntu
2017-11-09 11:19:28 +01:00
luiscuenca
1791ed01ca
add width param to vertex shader
2017-11-08 18:35:26 -07:00
samcake
aecfefe72a
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-08 15:49:05 -08:00
Brad Hefta-Gaub
d608d6ebf4
Merge pull request #11763 from Atlante45/new-master
...
Merge stable back into master
2017-11-08 15:10:06 -08:00
Nissim Hadar
3c5fd73ca8
Removed unused argument.
2017-11-08 14:56:21 -08:00
Seth Alves
34500fdf18
Merge pull request #11773 from vladest/fix_avatar_new_attachment
...
Remove checking of empty model url and add sanity for checking modelU…
2017-11-08 14:15:17 -08:00
Nissim Hadar
cc58f6ac2a
Merge branch 'master' into hazeOnTransparent
2017-11-08 14:11:41 -08:00
Nissim Hadar
4433e79c9c
Seems to work.
2017-11-08 14:08:37 -08:00
Ryan Huffman
3a9c364837
Fix domain server label not handling spaces correctly
2017-11-08 13:09:42 -08:00
vladest
6685b74c2a
Remove checking of empty model url and add sanity for checking modelUrl field existing
2017-11-08 21:23:50 +01:00
Brad Davis
1a58aee385
Fix scripting URL injection, I hope
2017-11-08 12:00:29 -08:00
samcake
af1180255e
fixes from code review
2017-11-08 11:45:40 -08:00
samcake
75ce61c3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-08 11:30:53 -08:00
Nissim Hadar
a8a118582d
WIP - passing uniform into model translucency shader.
2017-11-08 09:37:58 -08:00
Nissim Hadar
3d2c8186e7
Added Haze model as input to transparency shader.
2017-11-08 08:01:19 -08:00
Nissim Hadar
83ff20b599
Renamed getHazeParametersBuffer to getParametersBuffer
2017-11-08 08:00:31 -08:00
Olivier Prat
bbcb0b2d9b
Fixed highlight in stereo mode, including HMD (testing on simulator)
2017-11-08 13:49:18 +01:00
Olivier Prat
f996435ac8
Merge branch 'master' of git://github.com/highfidelity/hifi into highlight
2017-11-08 11:41:21 +01:00
Olivier Prat
39604363ea
Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes
2017-11-08 11:38:20 +01:00
Olivier Prat
91d8435a99
Merge branch 'master' of git://github.com/highfidelity/hifi into bloom
2017-11-08 08:17:55 +01:00
samcake
f5e1add694
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-07 17:41:36 -08:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix
...
Haze mask fix
2017-11-07 17:37:24 -08:00
samcake
0718763ed1
Adjust syntax
2017-11-07 17:31:15 -08:00
luiscuenca
ee3900be4f
Corrections
2017-11-07 18:26:41 -07:00
Nissim Hadar
ee6a8510c6
Refactored haze computation.
2017-11-07 17:22:57 -08:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587
2017-11-07 17:19:39 -07:00
luiscuenca
332cb48a41
Lasers and teleport scale with avatar
2017-11-07 16:57:55 -07:00
Nissim Hadar
87aee7242a
Moved linearDepthMap into Haze.slf
...
Refactored computation of keylight attenuation - now function in Haze.slh
2017-11-07 15:25:42 -08:00
Atlante45
8a903c8b12
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-11-07 14:26:25 -08:00
samcake
6481e0f713
Address cauterized cluster matrices issue
2017-11-07 12:52:23 -08:00
Nissim Hadar
803e5d143d
Moved Haze pass to be before transparency pass.
2017-11-07 11:48:46 -08:00
samcake
5ca3113709
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-07 10:42:28 -08:00
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580
...
Fix serverScripts not being able to see entities in parent/child tree
2017-11-07 10:36:20 -08:00
Seth Alves
7c6b5081d6
Merge pull request #11725 from luiscuenca/case8270
...
8270 Changing avatars while sitting - restore animations
2017-11-07 09:55:06 -08:00
Olivier Prat
0bbd1edc0a
Fixed fluttering highlight bug by attaching only stencil when drawing outline
2017-11-07 18:26:15 +01:00
Olivier Prat
ffa46b487a
Only non empty selections are now linked to highlight passes
2017-11-07 17:07:37 +01:00
Olivier Prat
9817cb4c44
Added highlight configuration in HighlightStageSetup job
2017-11-07 15:35:43 +01:00
Olivier Prat
3cc445ff02
Renamed outline to highlight
2017-11-07 11:07:25 +01:00
Olivier Prat
84be026e0b
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-11-07 09:48:45 +01:00
Sam Gateau
3b5feac738
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-06 21:42:46 -08:00
amantley
e13a74213c
this is holder spot to put avatar entity animation code
2017-11-06 17:29:19 -08:00
samcake
f665bf384b
merge with upstream, and clean code
2017-11-06 17:02:10 -08:00
SamGondelman
f970eb2302
merge with pointers branch
2017-11-06 14:49:50 -08:00
samcake
eaed02b144
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-06 13:52:05 -08:00
