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
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
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
ZappoMan
e438ac54d5
make adds go over NLPacketList as reliable
2017-11-16 13:16:23 -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
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
SamGondelman
3274c41aeb
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-15 17:45:45 -08: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
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
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
Andrew Meadows
d538a9aaa8
fix typo making cylinders collide as sphere
2017-11-15 09:04:04 -08: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
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
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
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
SamGondelman
2c0272f304
(mostly?) fix touch events
2017-11-13 12:58:31 -08:00
samcake
ad9bdc884e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-13 11:52:32 -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
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
Olivier Prat
dd6b7b04c2
Merged with master
2017-11-13 14:33:59 +01: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
Sam Gateau
eb270f3473
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-11 09:21:32 -08: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
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
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
ba4c0f189e
code review feedback
...
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -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
Sam Gateau
608093eee5
reverting the change in light direction /oritenation
2017-11-10 02:55:22 -08:00
Olivier Prat
8b6a2eeb24
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-10 10:19:32 +01: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
Anthony J. Thibault
5507bcea3c
Remove hack for missing inttypes.h header on VS2010
2017-11-09 10:34:01 -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
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
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
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
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
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
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
